Merge pull request #5767 from msupply-foundation/5743-remove-site-id-column-from-contact-form

remove contact forms side id

Author: GeronimoJohn

.github/workflows/server-cargo-clean.yaml

@@ -0,0 +1,34 @@
+on: 
+  workflow_dispatch: 
+
+name: Manual Cargo Clean
+
+jobs: 
+  build_and_test: 
+    name: Run cargo clean against self-hosted
+    runs-on: self-hosted
+    timeout-minutes: 25
+    steps: 
+      - name: Update PATH
+        run: echo "$HOME/.cargo/bin:/opt/homebrew/bin" >> $GITHUB_PATH
+      - uses: actions/checkout@v4
+      - uses: actions-rs/toolchain@v1
+        with: 
+          toolchain: stable
+      - name: Clean SQLite Artifacts
+        env:
+          CARGO_TARGET_DIR: /tmp/target/sqlite
+        uses: actions-rs/cargo@v1
+        with: 
+          command: clean
+          args: --manifest-path server/Cargo.toml
+      - name: Clean PostgreSQL artifacts
+        env:
+          CARGO_TARGET_DIR: /tmp/target/postgres
+        uses: actions-rs/cargo@v1
+        with: 
+          command: clean
+          args: --manifest-path server/Cargo.toml
+
+
+      

.github/workflows/server-tests.yaml

@@ -26,7 +26,7 @@ jobs:
       - uses: actions-rs/cargo@v1
         with:
           command: clean
-          args: -p repository -p graphql_types -p graphql_plugin --manifest-path server/Cargo.toml
+          args: -p repository -p graphql_types -p graphql_plugin -p graphql_invoice --manifest-path server/Cargo.toml
       - uses: actions-rs/cargo@v1
         with:
           command: test
@@ -47,7 +47,7 @@ jobs:
       - uses: actions-rs/cargo@v1
         with:
           command: clean
-          args: -p repository -p graphql_types -p graphql_plugin --manifest-path server/Cargo.toml
+          args: -p repository -p graphql_types -p graphql_plugin -p graphql_invoice --manifest-path server/Cargo.toml
       - uses: actions-rs/cargo@v1
         with:
           command: test

server/graphql/contact_form/src/mutations/insert.rs

@@ -50,10 +50,6 @@ pub fn insert_contact_form(
     map_response(service_provider.contact_form_service.insert_contact_form(
         &service_context,
         &store_id,
-        // &service_provider
-        //     .site_info_service
-        //     .get_site_id(&service_context)?
-        "Todo: update type of site id in service layer and database table",
         input.to_domain(),
     ))
 }

server/repository/src/db_diesel/contact_form_row.rs

@@ -20,7 +20,6 @@ table! {
         created_datetime -> Timestamp,
         user_id -> Text,
         store_id -> Text,
-        site_id -> Text,
         contact_type -> crate::db_diesel::contact_form_row::ContactTypeMapping,
     }
 }
@@ -38,7 +37,6 @@ pub struct ContactFormRow {
     pub reply_email: String,
     pub body: String,
     pub created_datetime: NaiveDateTime,
-    pub site_id: String,
     pub store_id: String,
     pub user_id: String,
     pub contact_type: ContactType,

server/repository/src/migrations/v2_05_00/mod.rs

@@ -5,6 +5,7 @@ mod add_contact_form_table;
 mod add_emergency_orders;
 mod item_direction_create_table;
 mod new_store_preferences;
+mod remove_contact_form_site_id;
 mod remove_unique_description_on_tmp_breach;
 
 use crate::StorageConnection;
@@ -27,6 +28,7 @@ impl Migration for V2_05_00 {
             Box::new(remove_unique_description_on_tmp_breach::Migrate),
             Box::new(add_emergency_orders::Migrate),
             Box::new(abbreviation_create_table::Migrate),
+            Box::new(remove_contact_form_site_id::Migrate),
             Box::new(item_direction_create_table::Migrate),
         ]
     }

server/repository/src/migrations/v2_05_00/remove_contact_form_site_id.rs

@@ -0,0 +1,21 @@
+use crate::migrations::*;
+
+pub(crate) struct Migrate;
+
+impl MigrationFragment for Migrate {
+    fn identifier(&self) -> &'static str {
+        "remove_contact_form_site_id"
+    }
+
+    fn migrate(&self, connection: &StorageConnection) -> anyhow::Result<()> {
+        // Dropped as not needed
+        sql!(
+            connection,
+            r#"
+                ALTER TABLE contact_form DROP COLUMN site_id;
+            "#
+        )?;
+
+        Ok(())
+    }
+}

server/service/src/contact_form/insert/generate.rs

@@ -6,15 +6,13 @@ use super::InsertContactForm;
 pub struct GenerateInput {
     pub store_id: String,
     pub user_id: String,
-    pub site_id: String,
     pub insert_input: InsertContactForm,
 }
 
 pub fn generate(
     GenerateInput {
         store_id,
         user_id,
-        site_id,
         insert_input,
     }: GenerateInput,
 ) -> ContactFormRow {
@@ -33,7 +31,6 @@ pub fn generate(
         created_datetime: now,
         reply_email,
         body,
-        site_id,
         //harcoded contact type until optional types available in front end
         contact_type: ContactType::Feedback,
     }

server/service/src/contact_form/insert/mod.rs

@@ -30,7 +30,6 @@ pub struct InsertContactForm {
 pub fn insert_contact_form(
     ctx: &ServiceContext,
     store_id: &str,
-    site_id: &str,
     input: InsertContactForm,
 ) -> Result<ContactFormRow, InsertContactFormError> {
     let new_contact_form = ctx
@@ -43,7 +42,6 @@ pub fn insert_contact_form(
                 store_id: store_id.to_string(),
                 user_id: ctx.user_id.clone(),
                 insert_input: input.clone(),
-                site_id: site_id.to_string(),
             });
 
             //create the contact form

server/service/src/contact_form/insert/test.rs

@@ -32,7 +32,6 @@ mod insert {
             service.insert_contact_form(
                 &context,
                 store_id,
-                &user_id,
                 InsertContactForm {
                     id: "test_id".to_string(),
                     reply_email: "not_an_email".to_string(),
@@ -48,7 +47,6 @@ mod insert {
             service.insert_contact_form(
                 &context,
                 store_id,
-                &user_id,
                 InsertContactForm {
                     id: "test_id".to_string(),
                     reply_email: "not_an_email.com".to_string(),
@@ -64,7 +62,6 @@ mod insert {
             service.insert_contact_form(
                 &context,
                 store_id,
-                &user_id,
                 InsertContactForm {
                     id: "test_id".to_string(),
                     reply_email: "not_an_email@com".to_string(),
@@ -80,7 +77,6 @@ mod insert {
             service.insert_contact_form(
                 &context,
                 store_id,
-                &user_id,
                 InsertContactForm {
                     id: "test_id".to_string(),
                     reply_email: "".to_string(),
@@ -96,7 +92,6 @@ mod insert {
             service.insert_contact_form(
                 &context,
                 store_id,
-                &user_id,
                 InsertContactForm {
                     id: "test_id".to_string(),
                     reply_email: "[email protected]".to_string(),
@@ -109,11 +104,11 @@ mod insert {
 
         // Create contact form
         service
-            .insert_contact_form(&context, store_id, &user_id, input.clone())
+            .insert_contact_form(&context, store_id, input.clone())
             .unwrap();
 
         // try create a second time
-        let result = service.insert_contact_form(&context, store_id, &user_id, input);
+        let result = service.insert_contact_form(&context, store_id, input);
 
         let expected_result = Err(InsertContactFormError::ContactFormAlreadyExists);
 
@@ -140,7 +135,6 @@ mod insert {
             .insert_contact_form(
                 &context,
                 store_id,
-                &user_id,
                 InsertContactForm {
                     id: "test_id".to_string(),
                     reply_email: "[email protected]".to_string(),

server/service/src/contact_form/mod.rs

@@ -10,10 +10,9 @@ pub trait ContactFormServiceTrait: Sync + Send {
         &self,
         ctx: &ServiceContext,
         store_id: &str,
-        site_id: &str,
         input: InsertContactForm,
     ) -> Result<ContactFormRow, InsertContactFormError> {
-        insert::insert_contact_form(ctx, store_id, site_id, input)
+        insert::insert_contact_form(ctx, store_id, input)
     }
 }