🪲 Fix types broken by adding acronym to user groups.

icefoganalytics · Jun 10, 2024 · 4e2c016 · 4e2c016
1 parent 17f40c5
commit 4e2c016
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/api/src/models/user-groups.ts b/api/src/models/user-groups.ts
@@ -33,6 +33,7 @@ export enum UserGroupTypes {
 }
 
 export const UNASSIGNED_USER_GROUP_NAME = "Unassigned"
+export const UNASSIGNED_USER_GROUP_ACRONYM = "U"
 export const DEFAULT_ORDER = -1
 
 export class UserGroup extends BaseModel<

diff --git a/api/src/services/users/create-service.ts b/api/src/services/users/create-service.ts
@@ -1,7 +1,11 @@
 import { isEmpty, isNil } from "lodash"
 
 import db, { Role, User, UserGroup, UserGroupMembership } from "@/models"
-import { DEFAULT_ORDER, UNASSIGNED_USER_GROUP_NAME } from "@/models/user-groups"
+import {
+  DEFAULT_ORDER,
+  UNASSIGNED_USER_GROUP_ACRONYM,
+  UNASSIGNED_USER_GROUP_NAME,
+} from "@/models/user-groups"
 
 import { SyncService } from "@/services/users"
 import BaseService from "@/services/base-service"
@@ -122,6 +126,7 @@ export class CreateService extends BaseService {
       },
       defaults: {
         name: UNASSIGNED_USER_GROUP_NAME,
+        acronym: UNASSIGNED_USER_GROUP_ACRONYM,
         type: UserGroup.Types.DEPARTMENT,
         order: DEFAULT_ORDER,
       },

diff --git a/api/src/services/users/sync-service.ts b/api/src/services/users/sync-service.ts
@@ -1,5 +1,6 @@
 import { isNil } from "lodash"
 
+import acronymize from "@/utils/acronymize"
 import { User } from "@/models"
 
 import BaseService from "@/services/base-service"
@@ -34,10 +35,12 @@ export class SyncService extends BaseService {
       let userGroup2: UserGroup | null = null
       let userGroup3: UserGroup | null = null
       let userGroup4: UserGroup | null = null
+      const departmentAcronym = acronymize(department)
       const [userGroup1] = await UserGroup.findOrCreate({
         where: { name: department, type: UserGroupTypes.DEPARTMENT },
         defaults: {
           name: department,
+          acronym: departmentAcronym,
           type: UserGroupTypes.DEPARTMENT,
           order: DEFAULT_ORDER,
         },