Skip to content

Commit

Permalink
All of the updates/fixes/enhancements
Browse files Browse the repository at this point in the history
  • Loading branch information
@NickPhura
NickPhura committed Jan 20, 2024
1 parent d544250 commit cead2fd
Show file tree
Hide file tree
Showing 33 changed files with 311 additions and 102 deletions.
3 changes: 2 additions & 1 deletion api/src/paths/administrative/security/categories.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ GET.apiDoc = {
revision_count: {
type: 'integer'
}
}
},
additionalProperties: false
}
}
}
Expand Down
8 changes: 7 additions & 1 deletion api/src/paths/administrative/security/rules.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ GET.apiDoc = {
'description',
'record_effective_date',
'record_end_date',
'security_category_id',
'category_name',
'category_description',
'category_record_effective_date',
Expand All @@ -68,6 +69,10 @@ GET.apiDoc = {
type: 'string',
nullable: true
},
security_category_id: {
type: 'integer',
minimum: 1
},
category_name: {
type: 'string'
},
Expand All @@ -81,7 +86,8 @@ GET.apiDoc = {
type: 'string',
nullable: true
}
}
},
additionalProperties: false
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion api/src/paths/administrative/security/submission/{submissionId}.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ GET.apiDoc = {
security_rule_id: {
type: 'integer'
}
}
},
additionalProperties: false
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions api/src/paths/administrative/submission/published.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ describe('getPublishedSubmissionsForAdmins', () => {
source_system: 'SIMS',
name: 'name',
description: 'description',
comment: 'comment',
create_date: '2023-12-12',
create_user: 1,
update_date: null,
Expand All @@ -78,6 +79,7 @@ describe('getPublishedSubmissionsForAdmins', () => {
publish_timestamp: '2023-12-12',
name: 'name',
description: 'description',
comment: 'comment',
create_date: '2023-12-12',
create_user: 1,
update_date: '2023-12-12',
Expand Down
30 changes: 27 additions & 3 deletions api/src/paths/administrative/submission/published.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ GET.apiDoc = {
'submission_id',
'uuid',
'security_review_timestamp',
'publish_timestamp',
'submitted_timestamp',
'system_user_id',
'source_system',
'name',
'description',
Expand All @@ -56,7 +58,8 @@ GET.apiDoc = {
'revision_count',
'security',
'root_feature_type_id',
'root_feature_type_name'
'root_feature_type_name',
'regions'
],
properties: {
submission_id: {
Expand All @@ -71,6 +74,17 @@ GET.apiDoc = {
type: 'string',
nullable: true
},
publish_timestamp: {
type: 'string',
nullable: true
},
submitted_timestamp: {
type: 'string'
},
system_user_id: {
type: 'integer',
minimum: 1
},
source_system: {
type: 'string'
},
Expand All @@ -82,6 +96,10 @@ GET.apiDoc = {
type: 'string',
maxLength: 3000
},
comment: {
type: 'string',
maxLength: 3000
},
create_date: {
type: 'string'
},
Expand All @@ -105,7 +123,6 @@ GET.apiDoc = {
security: {
type: 'string',
enum: [
SECURITY_APPLIED_STATUS.PENDING,
SECURITY_APPLIED_STATUS.UNSECURED,
SECURITY_APPLIED_STATUS.SECURED,
SECURITY_APPLIED_STATUS.PARTIALLY_SECURED
Expand All @@ -117,8 +134,15 @@ GET.apiDoc = {
},
root_feature_type_name: {
type: 'string'
},
regions: {
type: 'array',
items: {
type: 'string'
}
}
}
},
additionalProperties: false
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions api/src/paths/administrative/submission/reviewed.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ describe('getReviewedSubmissionsForAdmins', () => {
source_system: 'SIMS',
name: 'name',
description: 'description',
comment: 'comment',
create_date: '2023-12-12',
create_user: 1,
update_date: null,
Expand All @@ -78,6 +79,7 @@ describe('getReviewedSubmissionsForAdmins', () => {
publish_timestamp: '2023-12-12',
name: 'name',
description: 'description',
comment: 'comment',
create_date: '2023-12-12',
create_user: 1,
update_date: '2023-12-12',
Expand Down
31 changes: 28 additions & 3 deletions api/src/paths/administrative/submission/reviewed.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,22 @@ GET.apiDoc = {
'submission_id',
'uuid',
'security_review_timestamp',
'publish_timestamp',
'submitted_timestamp',
'system_user_id',
'source_system',
'name',
'description',
'comment',
'create_date',
'create_user',
'update_date',
'update_user',
'revision_count',
'security',
'root_feature_type_id',
'root_feature_type_name'
'root_feature_type_name',
'regions'
],
properties: {
submission_id: {
Expand All @@ -71,6 +75,17 @@ GET.apiDoc = {
type: 'string',
nullable: true
},
publish_timestamp: {
type: 'string',
nullable: true
},
submitted_timestamp: {
type: 'string'
},
system_user_id: {
type: 'integer',
minimum: 1
},
source_system: {
type: 'string'
},
Expand All @@ -82,6 +97,10 @@ GET.apiDoc = {
type: 'string',
maxLength: 3000
},
comment: {
type: 'string',
maxLength: 3000
},
create_date: {
type: 'string'
},
Expand All @@ -105,7 +124,6 @@ GET.apiDoc = {
security: {
type: 'string',
enum: [
SECURITY_APPLIED_STATUS.PENDING,
SECURITY_APPLIED_STATUS.UNSECURED,
SECURITY_APPLIED_STATUS.SECURED,
SECURITY_APPLIED_STATUS.PARTIALLY_SECURED
Expand All @@ -117,8 +135,15 @@ GET.apiDoc = {
},
root_feature_type_name: {
type: 'string'
},
regions: {
type: 'array',
items: {
type: 'string'
}
}
}
},
additionalProperties: false
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions api/src/paths/administrative/submission/unreviewed.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ describe('getUnreviewedSubmissionsForAdmins', () => {
source_system: 'SIMS',
name: 'name',
description: 'description',
comment: 'comment',
create_date: '2023-12-12',
create_user: 1,
update_date: null,
Expand All @@ -78,6 +79,7 @@ describe('getUnreviewedSubmissionsForAdmins', () => {
source_system: 'SIMS',
name: 'name',
description: 'description',
comment: 'comment',
create_date: '2023-12-12',
create_user: 1,
update_date: '2023-12-12',
Expand Down
18 changes: 17 additions & 1 deletion api/src/paths/administrative/submission/unreviewed.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,13 @@ GET.apiDoc = {
'submission_id',
'uuid',
'security_review_timestamp',
'publish_timestamp',
'submitted_timestamp',
'system_user_id',
'source_system',
'name',
'description',
'comment',
'create_date',
'create_user',
'update_date',
Expand All @@ -72,9 +75,17 @@ GET.apiDoc = {
type: 'string',
nullable: true
},
publish_timestamp: {
type: 'string',
nullable: true
},
submitted_timestamp: {
type: 'string'
},
system_user_id: {
type: 'integer',
minimum: 1
},
source_system: {
type: 'string'
},
Expand All @@ -86,6 +97,10 @@ GET.apiDoc = {
type: 'string',
maxLength: 3000
},
comment: {
type: 'string',
maxLength: 3000
},
create_date: {
type: 'string'
},
Expand Down Expand Up @@ -123,7 +138,8 @@ GET.apiDoc = {
type: 'string'
}
}
}
},
additionalProperties: false
}
}
}
Expand Down
1 change: 1 addition & 0 deletions api/src/paths/administrative/submission/{submissionId}/index.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ describe('patchSubmissionRecord', () => {
source_system: 'SIMS',
name: 'name',
description: 'description',
comment: 'comment',
create_date: '2023-12-12',
create_user: 1,
update_date: '2023-12-12',
Expand Down
3 changes: 2 additions & 1 deletion api/src/paths/administrative/submission/{submissionId}/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,8 @@ PATCH.apiDoc = {
type: 'integer',
minimum: 0
}
}
},
additionalProperties: false
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion api/src/paths/security/persecution-harm/list.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ GET.apiDoc = {
description: {
type: 'string'
}
}
},
additionalProperties: false
}
}
}
Expand Down
4 changes: 4 additions & 0 deletions api/src/paths/submission/intake.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ describe('intake', () => {
id: '564-987-789',
name: 'test submission',
description: 'a test submission',
comment: 'a comment',
content: feature1
};

Expand Down Expand Up @@ -127,6 +128,7 @@ describe('intake', () => {
source_system: 'SIMS',
name: 'name',
description: 'description',
comment: 'comment',
publish_timestamp: '2023-12-12',
create_date: '2023-12-12',
create_user: 1,
Expand Down Expand Up @@ -185,6 +187,7 @@ describe('intake', () => {
id: '564-987-789',
name: 'test submission',
description: 'a test submission',
comment: 'a comment',
content: feature1
};

Expand All @@ -195,6 +198,7 @@ describe('intake', () => {
'564-987-789',
'test submission',
'a test submission',
'a comment',
serviceClientSystemUser.system_user_id,
serviceClientSystemUser.user_identifier
);
Expand Down
Loading

0 comments on commit cead2fd

Please sign in to comment.