Merge branch 'main' into b21526-MAIN-add_db_swagger_support_for_actua…

…l_expense_reimbursement
transcom · Oct 22, 2024 · 299a461 · 299a461
2 parents 42f2090 + bad2b72
commit 299a461
Show file tree

Hide file tree

Showing 34 changed files with 3,185 additions and 345 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/cmd/generate-payment-request-edi/main.go b/cmd/generate-payment-request-edi/main.go
@@ -137,4 +137,8 @@ func main() {
 	}
 
 	fmt.Print(edi858String)
+	err = models.CreatePaymentRequestEdiFile(appCtx.DB(), "858."+paymentRequest.PaymentRequestNumber, edi858String, paymentRequestNumber)
+	if err != nil {
+		logger.Fatal(err.Error())
+	}
 }
diff --git a/migrations/app/migrations_manifest.txt b/migrations/app/migrations_manifest.txt
@@ -1004,4 +1004,5 @@
 20241001174400_add_is_oconus_column.up.sql
 20241001193619_market-code-enum.up.sql
 20241002151527_add_transportation_offices_AK_HI.up.sql
+20241007162933_addPaymentRequestEdiFiles.up.sql
 20241011201326_changes_for_actual_expense_reimbursement_field.up.sql
diff --git a/migrations/app/schema/20241007162933_addPaymentRequestEdiFiles.up.sql b/migrations/app/schema/20241007162933_addPaymentRequestEdiFiles.up.sql
@@ -0,0 +1,8 @@
+CREATE TABLE payment_request_edi_files (
+    id UUID PRIMARY KEY,
+    payment_request_number TEXT NOT NULL,
+    edi_string TEXT NOT NULL,
+    file_name TEXT NOT NULL,
+    created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    updated_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP
+);
diff --git a/pkg/gen/adminapi/adminoperations/mymove_api.go b/pkg/gen/adminapi/adminoperations/mymove_api.go
diff --git a/...gen/adminapi/adminoperations/payment_request_syncada_file/payment_request_syncada_file.go b/...gen/adminapi/adminoperations/payment_request_syncada_file/payment_request_syncada_file.go