-
Notifications
You must be signed in to change notification settings - Fork 35
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'integrationTesting' into INT-B-19902-move-gets-locked-w…
…hen-office-user-enters-and-ui-changes
- Loading branch information
Showing
17 changed files
with
239 additions
and
92 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
migrations/app/schema/20240502183613_add_support_for_standalone_payment_cap.up.sql
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
ALTER TABLE application_parameters | ||
ADD COLUMN IF NOT EXISTS parameter_name TEXT NOT NULL, | ||
ADD COLUMN IF NOT EXISTS parameter_value TEXT NOT NULL, | ||
ADD COLUMN IF NOT EXISTS parameter_name TEXT, | ||
ADD COLUMN IF NOT EXISTS parameter_value TEXT, | ||
ALTER COLUMN validation_code DROP NOT NULL; | ||
|
||
COMMENT ON COLUMN application_parameters.parameter_name IS 'The name of the parameter'; | ||
COMMENT ON COLUMN application_parameters.parameter_value IS 'The value of the parameter'; | ||
COMMENT ON COLUMN application_parameters.parameter_value IS 'The value of the parameter'; |
19 changes: 19 additions & 0 deletions
19
migrations/app/schema/20240506214039_add_submitted_columns_to_ppm_document_tables.up.sql
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
ALTER TABLE weight_tickets | ||
ADD COLUMN IF NOT EXISTS submitted_empty_weight INT4 DEFAULT NULL, | ||
ADD COLUMN IF NOT EXISTS submitted_full_weight INT4 DEFAULT NULL; | ||
|
||
COMMENT ON COLUMN weight_tickets.submitted_empty_weight IS 'Stores the customer submitted empty_weight.'; | ||
COMMENT ON COLUMN weight_tickets.submitted_full_weight IS 'Stores the customer submitted full_weight.'; | ||
|
||
ALTER TABLE progear_weight_tickets ADD COLUMN IF NOT EXISTS submitted_weight INT4 DEFAULT NULL; | ||
|
||
COMMENT ON COLUMN progear_weight_tickets.submitted_weight IS 'Stores the customer submitted weight.'; | ||
|
||
ALTER TABLE moving_expenses | ||
ADD COLUMN IF NOT EXISTS submitted_amount INT4 DEFAULT NULL, | ||
ADD COLUMN IF NOT EXISTS submitted_sit_start_date DATE DEFAULT NULL, | ||
ADD COLUMN IF NOT EXISTS submitted_sit_end_date DATE DEFAULT NULL; | ||
|
||
COMMENT ON COLUMN moving_expenses.submitted_amount IS 'Stores the customer submitted amount.'; | ||
COMMENT ON COLUMN moving_expenses.submitted_sit_start_date IS 'Stores the customer submitted sit_start_date.'; | ||
COMMENT ON COLUMN moving_expenses.submitted_sit_end_date IS 'Stores the customer submitted sit_end_date.'; |
16 changes: 16 additions & 0 deletions
16
migrations/app/schema/20240507133524_add_locked_moves_column_to_moves_table.up.sql
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
-- These column additions will handle locking a move | ||
-- when an office user is working on them | ||
-- Add columns if they don't exist | ||
ALTER TABLE moves | ||
ADD COLUMN IF NOT EXISTS locked_by UUID NULL, | ||
ADD COLUMN IF NOT EXISTS lock_expires_at TIMESTAMP WITH TIME ZONE NULL; | ||
|
||
-- Add foreign key constraint to office_users table | ||
ALTER TABLE moves | ||
ADD CONSTRAINT fk_locked_by | ||
FOREIGN KEY (locked_by) | ||
REFERENCES office_users(id); | ||
|
||
-- Add comments for the columns | ||
COMMENT ON COLUMN moves.locked_by IS 'The id of the office user that locked the move.'; | ||
COMMENT ON COLUMN moves.lock_expires_at IS 'The expiration time that a move is locked until, the default value of this will be 30 minutes from initial lock.'; |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.