Skip to content

Commit

Permalink
Merge branch 'main' into MAIN-B-22267
Browse files Browse the repository at this point in the history
  • Loading branch information
danieljordan-caci authored Mar 6, 2025
2 parents 2c4cb34 + 5ac04ce commit 9f58be8
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
ALTER TABLE moves
ADD COLUMN IF NOT EXISTS too_destination_assigned_id uuid
CONSTRAINT moves_too_destination_assigned_id_fkey
REFERENCES office_users;

COMMENT ON COLUMN moves.too_destination_assigned_id IS 'A foreign key that points to the ID of the Task Ordering Officer on the office_users table';
1 change: 1 addition & 0 deletions migrations/app/ddl_tables_manifest.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
# If a migration is not recorded here, then it will error.
# Naming convention: tbl_some_table.up.sql running <generate-ddl-migration some_table tables> will create this file.
20250221195354_tbl_alter_entitlements_B-22651.up.sql
20250224162949_B-22706_tbl_update_moves.up.sql
20250224200700_tbl_ppm_shipments.up.sql
20250227211221_tbl_re_country_prn_divisions.up.sql
2 changes: 2 additions & 0 deletions pkg/models/move.go
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ type Move struct {
TOOAssignedUser *OfficeUser `json:"too_assigned" belongs_to:"office_users" fk_id:"too_assigned_id"`
TIOAssignedID *uuid.UUID `json:"tio_assigned_id" db:"tio_assigned_id"`
TIOAssignedUser *OfficeUser `belongs_to:"office_users" fk_id:"tio_assigned_id"`
TOODestinationAssignedID *uuid.UUID `json:"too_destination_assigned_id" db:"too_destination_assigned_id"`
TOODestinationAssignedUser *OfficeUser `json:"too_destination_assigned" belongs_to:"office_users" fk_id:"too_destination_assigned_id"`
CounselingOfficeID *uuid.UUID `json:"counseling_transportation_office_id" db:"counseling_transportation_office_id"`
CounselingOffice *TransportationOffice `json:"counseling_transportation_office" belongs_to:"transportation_offices" fk_id:"counseling_transportation_office_id"`
}
Expand Down

0 comments on commit 9f58be8

Please sign in to comment.