fix: unable to add hunting/fishing license categories (closes #1816)

SnailyCAD · Oct 3, 2023 · 4821f05 · 4821f05
1 parent 83631d4
commit 4821f05
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/apps/api/src/lib/citizen/licenses/update-citizen-license-categories.ts b/apps/api/src/lib/citizen/licenses/update-citizen-license-categories.ts
@@ -11,6 +11,8 @@ type LicenseSchema = Pick<
   | "pilotLicenseCategory"
   | "waterLicenseCategory"
   | "firearmLicenseCategory"
+  | "huntingLicenseCategory"
+  | "fishingLicenseCategory"
 >;
 
 export async function updateCitizenLicenseCategories(
@@ -34,6 +36,14 @@ export async function updateCitizenLicenseCategories(
       data.firearmLicenseCategory ?? [],
       suspendedLicenses?.firearmsLicense,
     ),
+    ...returnNonSuspendedCategory(
+      data.huntingLicenseCategory ?? [],
+      suspendedLicenses?.huntingLicense,
+    ),
+    ...returnNonSuspendedCategory(
+      data.fishingLicenseCategory ?? [],
+      suspendedLicenses?.fishingLicense,
+    ),
   ];
   const disconnectConnectArr = manyToManyHelper(
     citizen.dlCategory?.map((v) => v.id) ?? [],

diff --git a/apps/client/src/components/citizen/licenses/ManageLicensesFormFields.tsx b/apps/client/src/components/citizen/licenses/ManageLicensesFormFields.tsx
@@ -330,7 +330,7 @@ export function ManageLicensesFormFields({ isLeo, allowRemoval }: Props) {
             isClearable={allowRemoval}
             onSelectionChange={(keys) => setFieldValue("fishingLicenseCategory", keys)}
             options={driverslicenseCategory.values
-              .filter((v) => v.type === DriversLicenseCategoryType.WATER)
+              .filter((v) => v.type === DriversLicenseCategoryType.FISHING)
               .map((value) => ({
                 label: value.value.value,
                 value: value.id,
@@ -398,7 +398,7 @@ export function ManageLicensesFormFields({ isLeo, allowRemoval }: Props) {
             isClearable={allowRemoval}
             onSelectionChange={(keys) => setFieldValue("huntingLicenseCategory", keys)}
             options={driverslicenseCategory.values
-              .filter((v) => v.type === DriversLicenseCategoryType.WATER)
+              .filter((v) => v.type === DriversLicenseCategoryType.HUNTING)
               .map((value) => ({
                 label: value.value.value,
                 value: value.id,

diff --git a/packages/schemas/src/admin/values/import.ts b/packages/schemas/src/admin/values/import.ts
@@ -58,7 +58,7 @@ export const BUSINESS_ROLE_ARR = z.array(BUSINESS_ROLE_SCHEMA).min(1);
 /**
  * driverslicense_category
  */
-const DLC_TYPE_REGEX = /AUTOMOTIVE|AVIATION|WATER|FIREARM/;
+const DLC_TYPE_REGEX = /AUTOMOTIVE|AVIATION|WATER|FIREARM|HUNTING|FISHING/;
 
 export const DLC_SCHEMA = BASE_VALUE_SCHEMA.extend({
   type: z.string().regex(DLC_TYPE_REGEX).max(255),