add blacklist query to handler

Author: rdonigian

src/components/project/handlers/set-department-id.handler.ts

@@ -105,8 +105,16 @@ export class SetDepartmentId implements IEventHandler<SubscribedEvent> {
           .where({ 'deptIdNode.value': not(isNull()) })
           .return(collect('deptIdNode.value').as('used')),
       )
-      // Distill to available
-      .with('[id in enumerated where not id in used][0] as next')
+      // Get blacklisted IDs
+      .subQuery((sub) =>
+        sub
+          .match(node('blacklist', 'BlacklistDepartmentId'))
+          .return(collect('blacklist.departmentId').as('blacklisted')),
+      )
+      // Distill to available (excluding both used AND blacklisted)
+      .with(
+        '[id in enumerated where not id in used and not id in blacklisted][0] as next',
+      )
       // collapse cardinality to zero if none available
       .raw('unwind next as nextId')
 

src/components/project/migrations/create-used-dept-id-list.migration.ts

@@ -28,10 +28,7 @@ export class CreateUsedDeptIdListMigration extends BaseMigration {
 
     const intaactList: ExternalDepartmentId[] = intaactRows.flatMap((row) => {
       const [id, name] = row.split(',');
-      if (id) {
-        return { id, name };
-      }
-      return [];
+      return id ? { id, name } : [];
     });
 
     const prunedIntaactList = intaactList.flatMap((row) =>
@@ -41,15 +38,14 @@ export class CreateUsedDeptIdListMigration extends BaseMigration {
     await this.db
       .query()
       .unwind(prunedIntaactList, 'dept')
-      .create(node('blacklist', 'BlacklistDepartmentId'))
+      .create(node('external', 'ExternalDepartmentId'))
       .setValues({
-        'blacklist.id': variable(apoc.create.uuid()),
-        'blacklist.departmentId': variable('dept.id'),
-        'blacklist.departmentName': variable('dept.name'),
-        'blacklist.createdAt': Date.now(),
-        'blacklist.createdBy': 'bulk_import',
+        'external.id': variable(apoc.create.uuid()),
+        'external.departmentId': variable('dept.id'),
+        'external.name': variable('dept.name'),
+        'external.createdAt': variable('datetime()'),
       })
-      .return('count(blacklist) as created')
+      .return('count(external) as created')
       .executeAndLogStats();
   }
 }