From 5a6d0328f21f4dba06f863a6e19d76a5c2f83ca2 Mon Sep 17 00:00:00 2001 From: Barrett Falk Date: Tue, 20 Aug 2024 09:31:23 -0700 Subject: [PATCH] feat: Release/giant pacific octopus (#78) Co-authored-by: Om Mishra <32200996+mishraomp@users.noreply.github.com> Co-authored-by: dmitri-korin-bcps <108112696+dmitri-korin-bcps@users.noreply.github.com> --- .github/workflows/scheduled.yml | 4 ++-- backend/src/age_code/age_code.resolver.ts | 2 +- .../conflict_history_code.resolver.ts | 2 +- backend/src/drug_code/drug_code.resolver.ts | 2 +- .../src/drug_method_code/drug_method_code.resolver.ts | 2 +- .../drug_remaining_outcome_code.resolver.ts | 2 +- backend/src/ear_code/ear_code.resolver.ts | 2 +- backend/src/enum/role.enum.ts | 1 + backend/src/equipment_code/equipment_code.resolver.ts | 2 +- .../hwcr_assessment_action.resolver.ts | 11 +++++------ .../hwcr_outcome_code/hwcr_outcome_code.resolver.ts | 2 +- .../hwcr_prevention_action.resolver.ts | 8 ++++---- .../inaction_justification_type.resolver.ts | 2 +- backend/src/sex_code/sex_code.resolver.ts | 2 +- .../threat_level_code/threat_level_code.resolver.ts | 2 +- 15 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index e419ce02..ccb52cc4 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -76,7 +76,7 @@ jobs: FLYWAY_USER: postgres FLYWAY_PASSWORD: default FLYWAY_LOCATIONS: filesystem:./migrations - FLYWAY_DEFAULT_SCHEMA: "public" + FLYWAY_DEFAULT_SCHEMA: "case_management" with: args: info migrate info @@ -85,7 +85,7 @@ jobs: mkdir output chmod a+rwx -R output - name: Run Schemaspy - run: docker run --network host -v "$PWD/output:/output" schemaspy/schemaspy:6.2.4 -t pgsql11 -db default -host 127.0.0.1 -port 5432 -u postgres -p default -schemas public + run: docker run --network host -v "$PWD/output:/output" schemaspy/schemaspy:6.2.4 -t pgsql11 -db default -host 127.0.0.1 -port 5432 -u postgres -p default -schemas case_management - name: Deploy to Pages uses: JamesIves/github-pages-deploy-action@v4 with: diff --git a/backend/src/age_code/age_code.resolver.ts b/backend/src/age_code/age_code.resolver.ts index 9cc418b3..23010686 100644 --- a/backend/src/age_code/age_code.resolver.ts +++ b/backend/src/age_code/age_code.resolver.ts @@ -11,7 +11,7 @@ export class AgeCodeResolver { constructor(private readonly ageCodeService: AgeCodeService) {} @Query("ageCodes") - @Roles(Role.COS_OFFICER) + @Roles(Role.COS_OFFICER, Role.CEEB) findAll() { return this.ageCodeService.findAll(); } diff --git a/backend/src/conflict_history_code/conflict_history_code.resolver.ts b/backend/src/conflict_history_code/conflict_history_code.resolver.ts index beb08ad4..4ce8d27d 100644 --- a/backend/src/conflict_history_code/conflict_history_code.resolver.ts +++ b/backend/src/conflict_history_code/conflict_history_code.resolver.ts @@ -11,7 +11,7 @@ export class ConflictHistoryCodeResolver { constructor(private readonly conflictHistoryCodeService: ConflictHistoryCodeService) {} @Query("conflictHistoryCodes") - @Roles(Role.COS_OFFICER) + @Roles(Role.COS_OFFICER, Role.CEEB) findAll() { return this.conflictHistoryCodeService.findAll(); } diff --git a/backend/src/drug_code/drug_code.resolver.ts b/backend/src/drug_code/drug_code.resolver.ts index 2f532612..1533a1a5 100644 --- a/backend/src/drug_code/drug_code.resolver.ts +++ b/backend/src/drug_code/drug_code.resolver.ts @@ -11,7 +11,7 @@ export class DrugCodeResolver { constructor(private readonly drugCodeService: DrugCodeService) {} @Query("drugCodes") - @Roles(Role.COS_OFFICER) + @Roles(Role.COS_OFFICER, Role.CEEB) findAll() { return this.drugCodeService.findAll(); } diff --git a/backend/src/drug_method_code/drug_method_code.resolver.ts b/backend/src/drug_method_code/drug_method_code.resolver.ts index 4a891424..06fda137 100644 --- a/backend/src/drug_method_code/drug_method_code.resolver.ts +++ b/backend/src/drug_method_code/drug_method_code.resolver.ts @@ -11,7 +11,7 @@ export class DrugMethodCodeResolver { constructor(private readonly drugMethodCodeService: DrugMethodCodeService) {} @Query("drugMethodCodes") - @Roles(Role.COS_OFFICER) + @Roles(Role.COS_OFFICER, Role.CEEB) findAll() { return this.drugMethodCodeService.findAll(); } diff --git a/backend/src/drug_remaining_outcome_code/drug_remaining_outcome_code.resolver.ts b/backend/src/drug_remaining_outcome_code/drug_remaining_outcome_code.resolver.ts index 8441aa68..039b6eb2 100644 --- a/backend/src/drug_remaining_outcome_code/drug_remaining_outcome_code.resolver.ts +++ b/backend/src/drug_remaining_outcome_code/drug_remaining_outcome_code.resolver.ts @@ -11,7 +11,7 @@ export class DrugRemainingOutcomeCodeResolver { constructor(private readonly drugRemainingOutcomeCodeService: DrugRemainingOutcomeCodeService) {} @Query("drugRemainingOutcomeCodes") - @Roles(Role.COS_OFFICER) + @Roles(Role.COS_OFFICER, Role.CEEB) findAll() { return this.drugRemainingOutcomeCodeService.findAll(); } diff --git a/backend/src/ear_code/ear_code.resolver.ts b/backend/src/ear_code/ear_code.resolver.ts index 7f0edc2f..1f81c4e0 100644 --- a/backend/src/ear_code/ear_code.resolver.ts +++ b/backend/src/ear_code/ear_code.resolver.ts @@ -11,7 +11,7 @@ export class EarCodeResolver { constructor(private readonly earCodeService: EarCodeService) {} @Query("earCodes") - @Roles(Role.COS_OFFICER) + @Roles(Role.COS_OFFICER, Role.CEEB) findAll() { return this.earCodeService.findAll(); } diff --git a/backend/src/enum/role.enum.ts b/backend/src/enum/role.enum.ts index 45888d5c..344ec3a1 100644 --- a/backend/src/enum/role.enum.ts +++ b/backend/src/enum/role.enum.ts @@ -1,4 +1,5 @@ export enum Role { COS_OFFICER = "COS Officer", COS_ADMIN = "COS Admin", + CEEB = "CEEB", } diff --git a/backend/src/equipment_code/equipment_code.resolver.ts b/backend/src/equipment_code/equipment_code.resolver.ts index 9e80fd8f..eeeadce8 100644 --- a/backend/src/equipment_code/equipment_code.resolver.ts +++ b/backend/src/equipment_code/equipment_code.resolver.ts @@ -12,7 +12,7 @@ export class EquipmentCodeResolver { constructor(private readonly equipmentCodeService: EquipmentCodeService) {} @Query("equipmentCodes") - @Roles(Role.COS_OFFICER) + @Roles(Role.COS_OFFICER, Role.CEEB) findAll() { return this.equipmentCodeService.findAll(); } diff --git a/backend/src/hwcr_assessment_action/hwcr_assessment_action.resolver.ts b/backend/src/hwcr_assessment_action/hwcr_assessment_action.resolver.ts index a7e96dbc..41a646e5 100644 --- a/backend/src/hwcr_assessment_action/hwcr_assessment_action.resolver.ts +++ b/backend/src/hwcr_assessment_action/hwcr_assessment_action.resolver.ts @@ -1,19 +1,18 @@ - -import { Resolver, Query, Args } from '@nestjs/graphql'; +import { Resolver, Query, Args } from "@nestjs/graphql"; import { JwtRoleGuard } from "../auth/jwtrole.guard"; import { UseGuards } from "@nestjs/common"; import { Role } from "../enum/role.enum"; import { Roles } from "../auth/decorators/roles.decorator"; -import { ActionCodeService } from '../action_code/action_code.service'; -import { ACTION_TYPE_CODES } from '../common/action_type_codes'; +import { ActionCodeService } from "../action_code/action_code.service"; +import { ACTION_TYPE_CODES } from "../common/action_type_codes"; @UseGuards(JwtRoleGuard) @Resolver("HWCRAssessmentAction") export class HWCRAssessmentActionResolver { - constructor(private readonly actionCodeService: ActionCodeService) { } + constructor(private readonly actionCodeService: ActionCodeService) {} @Query("HWCRAssessmentActions") - @Roles(Role.COS_OFFICER) + @Roles(Role.COS_OFFICER, Role.CEEB) find() { return this.actionCodeService.findAllCodesByType(ACTION_TYPE_CODES.COMPASSESS); } diff --git a/backend/src/hwcr_outcome_code/hwcr_outcome_code.resolver.ts b/backend/src/hwcr_outcome_code/hwcr_outcome_code.resolver.ts index 697b39a9..6c24a5d5 100644 --- a/backend/src/hwcr_outcome_code/hwcr_outcome_code.resolver.ts +++ b/backend/src/hwcr_outcome_code/hwcr_outcome_code.resolver.ts @@ -11,7 +11,7 @@ export class HwcrOutcomeCodeResolver { constructor(private readonly hwcrOutcomeCodeService: HwcrOutcomeCodeService) {} @Query("hwcrOutcomeCodes") - @Roles(Role.COS_OFFICER) + @Roles(Role.COS_OFFICER, Role.CEEB) findAll() { return this.hwcrOutcomeCodeService.findAll(); } diff --git a/backend/src/hwcr_prevention_action/hwcr_prevention_action.resolver.ts b/backend/src/hwcr_prevention_action/hwcr_prevention_action.resolver.ts index 52a721fb..83f1494b 100644 --- a/backend/src/hwcr_prevention_action/hwcr_prevention_action.resolver.ts +++ b/backend/src/hwcr_prevention_action/hwcr_prevention_action.resolver.ts @@ -3,16 +3,16 @@ import { JwtRoleGuard } from "../auth/jwtrole.guard"; import { UseGuards } from "@nestjs/common"; import { Role } from "../enum/role.enum"; import { Roles } from "../auth/decorators/roles.decorator"; -import { ActionCodeService } from '../action_code/action_code.service'; -import { ACTION_TYPE_CODES } from '../common/action_type_codes'; +import { ActionCodeService } from "../action_code/action_code.service"; +import { ACTION_TYPE_CODES } from "../common/action_type_codes"; @UseGuards(JwtRoleGuard) @Resolver("HWCRPreventionAction") export class HWCRPreventionActionResolver { - constructor(private readonly actionCodeService: ActionCodeService) { } + constructor(private readonly actionCodeService: ActionCodeService) {} @Query("HWCRPreventionActions") - @Roles(Role.COS_OFFICER) + @Roles(Role.COS_OFFICER, Role.CEEB) find() { return this.actionCodeService.findAllCodesByType(ACTION_TYPE_CODES.COSPRVANDEDU); } diff --git a/backend/src/inaction_justification_type/inaction_justification_type.resolver.ts b/backend/src/inaction_justification_type/inaction_justification_type.resolver.ts index 52d435fa..2d4b8969 100644 --- a/backend/src/inaction_justification_type/inaction_justification_type.resolver.ts +++ b/backend/src/inaction_justification_type/inaction_justification_type.resolver.ts @@ -11,7 +11,7 @@ export class InactionJustificationTypeResolver { constructor(private readonly inactionJustificationTypeService: InactionJustificationTypeService) {} @Query("inactionJustificationCodes") - @Roles(Role.COS_OFFICER) + @Roles(Role.COS_OFFICER, Role.CEEB) find(@Args("agencyCode") agencyCode?: string) { return this.inactionJustificationTypeService.find(agencyCode); } diff --git a/backend/src/sex_code/sex_code.resolver.ts b/backend/src/sex_code/sex_code.resolver.ts index bfcfd29d..968e4f8e 100644 --- a/backend/src/sex_code/sex_code.resolver.ts +++ b/backend/src/sex_code/sex_code.resolver.ts @@ -11,7 +11,7 @@ export class SexCodeResolver { constructor(private readonly sexCodeService: SexCodeService) {} @Query("sexCodes") - @Roles(Role.COS_OFFICER) + @Roles(Role.COS_OFFICER, Role.CEEB) findAll() { return this.sexCodeService.findAll(); } diff --git a/backend/src/threat_level_code/threat_level_code.resolver.ts b/backend/src/threat_level_code/threat_level_code.resolver.ts index d0e7ef84..885286f0 100644 --- a/backend/src/threat_level_code/threat_level_code.resolver.ts +++ b/backend/src/threat_level_code/threat_level_code.resolver.ts @@ -11,7 +11,7 @@ export class ThreatLevelCodeResolver { constructor(private readonly threatLevelCodeService: ThreatLevelCodeService) {} @Query("threatLevelCodes") - @Roles(Role.COS_OFFICER) + @Roles(Role.COS_OFFICER, Role.CEEB) findAll() { return this.threatLevelCodeService.findAll(); }