Merge pull request #39 from Chronolens/db_fix

Chronolens · Nov 10, 2024 · f54a2f4 · f54a2f4
2 parents 9e509fc + 6163094
commit f54a2f4
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 13 deletions.
diff --git a/.github/workflows/api_publish.yaml b/.github/workflows/api_publish.yaml
@@ -15,7 +15,7 @@ env:
 
 # There is a single job in this workflow. It's configured to run on the latest available version of Ubuntu.
 jobs:
-  build-and-push-image:
+  build-and-push-api-image:
     runs-on: ubuntu-latest
     # Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job.
     permissions:

diff --git a/.github/workflows/libheif_publish.yaml b/.github/workflows/libheif_publish.yaml
@@ -16,7 +16,7 @@ env:
 
 # There is a single job in this workflow. It's configured to run on the latest available version of Ubuntu.
 jobs:
-  build-and-push-image:
+  build-and-push-libheif-image:
     runs-on: ubuntu-latest
     # Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job.
     permissions:

diff --git a/.github/workflows/preview_publish.yaml b/.github/workflows/preview_publish.yaml
@@ -15,7 +15,7 @@ env:
 
 # There is a single job in this workflow. It's configured to run on the latest available version of Ubuntu.
 jobs:
-  build-and-push-image:
+  build-and-push-preview-image:
     runs-on: ubuntu-latest
     # Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job.
     permissions:

diff --git a/.gitignore b/.gitignore
@@ -33,3 +33,4 @@ Cargo.lock
 
 .env
 .session.vim
+.secrets
diff --git a/api/src/routes/upload_image.rs b/api/src/routes/upload_image.rs
@@ -196,7 +196,7 @@ pub async fn upload_image(
                 }
             }
         }
-        return (StatusCode::OK,file_uuid.to_string()).into_response();
+        return (StatusCode::OK, file_uuid.to_string()).into_response();
     }
     (StatusCode::BAD_REQUEST).into_response()
 }
diff --git a/database/migration/src/lib.rs b/database/migration/src/lib.rs
@@ -4,8 +4,8 @@ mod m001_setup;
 mod m002_user;
 mod m003_media;
 mod m004_face;
-mod m005_media_face;
-mod m006_cluster;
+mod m005_cluster;
+mod m006_media_face;
 mod m007_log;
 
 pub struct Migrator;
@@ -18,8 +18,8 @@ impl MigratorTrait for Migrator {
             Box::new(m002_user::Migration),
             Box::new(m003_media::Migration),
             Box::new(m004_face::Migration),
-            Box::new(m005_media_face::Migration),
-            Box::new(m006_cluster::Migration),
+            Box::new(m005_cluster::Migration),
+            Box::new(m006_media_face::Migration),
             Box::new(m007_log::Migration),
         ]
     }

diff --git a/database/migration/src/m006_cluster.rs → database/migration/src/m005_cluster.rs b/database/migration/src/m006_cluster.rs → database/migration/src/m005_cluster.rs
@@ -36,5 +36,5 @@ impl MigrationTrait for Migration {
 pub enum Cluster {
     Table,
     Id,
-    FaceId
+    FaceId,
 }
diff --git a/database/migration/src/m005_media_face.rs → database/migration/src/m006_media_face.rs b/database/migration/src/m005_media_face.rs → database/migration/src/m006_media_face.rs
diff --git a/database/src/schema/media_face.rs b/database/src/schema/media_face.rs
@@ -10,7 +10,7 @@ pub struct Model {
     pub media_id: String,
     pub embedding: Vec<f32>,
     pub face_bounding_box: Vec<f32>,
-    pub cluster_id: i32
+    pub cluster_id: i32,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]

diff --git a/database/src/schema/mod.rs b/database/src/schema/mod.rs
@@ -2,9 +2,9 @@
 
 pub mod prelude;
 
-pub mod user;
-pub mod media;
-pub mod media_face;
 pub mod cluster;
 pub mod face;
 pub mod log;
+pub mod media;
+pub mod media_face;
+pub mod user;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -33,3 +33,4 @@ Cargo.lock

		.env
		.session.vim
		.secrets
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,5 +36,5 @@ impl MigrationTrait for Migration { @@
     pub enum Cluster {
         Table,
         Id,
-        FaceId
+        FaceId,
     }