uui7 migration

94679c7 · gmorell · 2026-05-09 02:32

67 files +719 -131

Files changed

modified Cargo.toml
+1 −1
@@ -4,7 +4,7 @@ members = [".", "migration"]
4 4 [workspace.dependencies]
5 5 sea-orm = { version = "1.1.1", features = ["sqlx-postgres", "runtime-tokio-rustls", "macros", "with-chrono", "with-uuid"] }
6 6 chrono = { version = "0.4.38", features = ["serde"] }
7 −uuid = { version = "1.11.0", features = ["v4", "serde"] }
7 +uuid = { version = "1.11.0", features = ["v4", "v7", "serde"] }
8 8 serde = { version = "1.0", features = ["derive"] }
9 9
10 10 [package]
modified android/app/src/main/java/org/neiam/dms/app/MainActivity.kt
+2 −2
@@ -103,9 +103,9 @@ fun DmsApp(
103 103 }
104 104 composable(
105 105 "detail/{id}",
106 − arguments = listOf(navArgument("id") { type = NavType.LongType }),
106 + arguments = listOf(navArgument("id") { type = NavType.StringType }),
107 107 ) { backStack ->
108 − val id = backStack.arguments?.getLong("id") ?: 0L
108 + val id = backStack.arguments?.getString("id") ?: ""
109 109 DetailScreen(
110 110 tokens = tokens,
111 111 uploadId = id,
modified android/app/src/main/java/org/neiam/dms/app/data/DmsClient.kt
+2 −2
@@ -29,7 +29,7 @@ interface DmsApi {
29 29 ): UploadsListResponse
30 30
31 31 @GET("api/uploads/{id}")
32 − suspend fun uploadDetail(@Path("id") id: Long): UploadDetail
32 + suspend fun uploadDetail(@Path("id") id: String): UploadDetail
33 33
34 34 /**
35 35 * Mirrors the web /search endpoint. The `f=1` marker tells the server to
@@ -52,7 +52,7 @@ interface DmsApi {
52 52
53 53 @POST("api/uploads/{id}/tags")
54 54 suspend fun addTags(
55 − @Path("id") id: Long,
55 + @Path("id") id: String,
56 56 @retrofit2.http.Body body: AddTagsBody,
57 57 ): UploadDetail
58 58
modified android/app/src/main/java/org/neiam/dms/app/data/Models.kt
+5 −5
@@ -8,7 +8,7 @@ data class ProfileResponse(val user: User)
8 8
9 9 @Serializable
10 10 data class User(
11 − val id: Long,
11 + val id: String,
12 12 val username: String,
13 13 val email: String,
14 14 @SerialName("is_active") val isActive: Boolean,
@@ -16,7 +16,7 @@ data class User(
16 16
17 17 @Serializable
18 18 data class UploadSummary(
19 − val id: Long,
19 + val id: String,
20 20 @SerialName("file_name_original") val fileNameOriginal: String,
21 21 @SerialName("item_path") val itemPath: String,
22 22 @SerialName("processing_status") val processingStatus: String,
@@ -47,14 +47,14 @@ data class SearchSources(
47 47 }
48 48
49 49 @Serializable
50 −data class UploadCreatedResponse(val id: Long)
50 +data class UploadCreatedResponse(val id: String)
51 51
52 52 @Serializable
53 53 data class AddTagsBody(val tags: String)
54 54
55 55 @Serializable
56 56 data class Tag(
57 − val id: Long,
57 + val id: String,
58 58 val namespace: String? = null,
59 59 @SerialName("tag_value") val tagValue: String,
60 60 ) {
@@ -63,7 +63,7 @@ data class Tag(
63 63
64 64 @Serializable
65 65 data class UploadDetail(
66 − val id: Long,
66 + val id: String,
67 67 @SerialName("file_name_original") val fileNameOriginal: String,
68 68 @SerialName("item_path") val itemPath: String,
69 69 @SerialName("item_name") val itemName: String? = null,
modified android/app/src/main/java/org/neiam/dms/app/ui/DetailScreen.kt
+1 −1
@@ -38,7 +38,7 @@ import org.neiam.dms.app.data.prepareShareIntent
38 38 @Composable
39 39 fun DetailScreen(
40 40 tokens: TokenStore,
41 − uploadId: Long,
41 + uploadId: String,
42 42 onBack: () -> Unit,
43 43 onTagClick: (String) -> Unit,
44 44 ) {
modified android/app/src/main/java/org/neiam/dms/app/ui/HomeScreen.kt
+1 −1

Click to load diff…

modified android/app/src/main/java/org/neiam/dms/app/ui/SearchScreen.kt
+1 −1

Click to load diff…

modified android/app/src/main/java/org/neiam/dms/app/ui/UploadGrid.kt
+1 −1

Click to load diff…

modified migration/src/lib.rs
+2 −0

Click to load diff…

added migration/src/m20260509_000005_uuid_primary_keys.rs
+240 −0

Click to load diff…

modified src/auth/api_tokens.rs
+5 −5

Click to load diff…

modified src/auth/tokens.rs
+9 −7

Click to load diff…

modified src/auth/users.rs
+6 −5

Click to load diff…

modified src/bin/registration-token.rs
+3 −3

Click to load diff…

modified src/bin/webservice.rs
+5 −0

Click to load diff…

modified src/entities/ai_descriptions.rs
+3 −3

Click to load diff…

modified src/entities/api_tokens.rs
+3 −3

Click to load diff…

modified src/entities/ocr_results.rs
+3 −3

Click to load diff…

modified src/entities/registration_tokens.rs
+4 −4

Click to load diff…

modified src/entities/similar_uploads.rs
+4 −4

Click to load diff…

modified src/entities/tags.rs
+2 −2

Click to load diff…

modified src/entities/upload_jobs.rs
+3 −3

Click to load diff…

modified src/entities/upload_tags.rs
+4 −4

Click to load diff…

modified src/entities/uploads.rs
+3 −3

Click to load diff…

modified src/entities/user_sessions.rs
+3 −3

Click to load diff…

modified src/entities/users.rs
+2 −2

Click to load diff…

modified src/handlers/api_tokens.rs
+1 −1

Click to load diff…

added src/handlers/failed.rs
+212 −0

Click to load diff…

modified src/handlers/mod.rs
+5 −0

Click to load diff…

modified src/handlers/uploads.rs
+30 −26

Click to load diff…

modified src/jobs/mod.rs
+17 −8

Click to load diff…

modified src/middleware/auth.rs
+1 −1

Click to load diff…

modified src/queue/messages.rs
+5 −4

Click to load diff…

modified src/tags/mod.rs
+7 −4

Click to load diff…

modified src/workers/describe.rs
+5 −4

Click to load diff…

modified src/workers/extract_tags.rs
+2 −2

Click to load diff…

modified src/workers/ocr.rs
+8 −5

Click to load diff…

modified src/workers/thumbnail.rs
+4 −4

Click to load diff…

added templates/failed.html
+71 −0

Click to load diff…

modified templates/root.html
+6 −0

Click to load diff…

modified tools/rknn-describe-server/server.py
+27 −4

Click to load diff…

Parents: 9540102