Re-enable departmentId rewrite

Author: CarsonF

dbschema/migrations/00048.edgeql

@@ -0,0 +1,26 @@
+CREATE MIGRATION m1tn7o5vizqaygjvghqysxzw6ruf4xohudb2usgfg4z622ens24mba
+    ONTO m1ah6i4a5c6enkrmypo7k3y6f3flr26mqlqtkw2t6437evoxqqzpna
+{
+  ALTER TYPE default::Project {
+      ALTER PROPERTY departmentId {
+          CREATE REWRITE
+              UPDATE 
+              USING ((IF ((NOT (EXISTS (.departmentId)) AND (.status <= Project::Status.Active)) AND (.step >= Project::Step.PendingFinanceConfirmation)) THEN (WITH
+                  fa := 
+                      std::assert_exists(__subject__.primaryLocation.fundingAccount, message := 'Project must have a primary location')
+                  ,
+                  existing := 
+                      (SELECT
+                          (DETACHED default::Project).departmentId
+                      FILTER
+                          (default::Project.primaryLocation.fundingAccount = fa)
+                      )
+                  ,
+                  available := 
+                      (std::range_unpack(std::range(((fa.accountNumber * 10000) + 11), ((fa.accountNumber * 10000) + 9999))) EXCEPT existing)
+              SELECT
+                  std::min(available)
+              ) ELSE .departmentId));
+      };
+  };
+};

dbschema/project.esdl

@@ -13,28 +13,27 @@ module default {
     departmentId: int32 {
       constraint exclusive;
       constraint expression on (__subject__ >= 10000 and __subject__ <= 99999);
-# Temporarily disabled. Upstream fix in progress.
-#       rewrite update using (
-#         if (
-#           not exists .departmentId and
-#           .status <= Project::Status.Active and
-#           .step >= Project::Step.PendingFinanceConfirmation
-#         ) then ((
-#           with
-#             fa := assert_exists(
-#               __subject__.primaryLocation.fundingAccount,
-#               message := "Project must have a primary location"
-#             ),
-#             existing := (
-#               select detached Project.departmentId filter Project.primaryLocation.fundingAccount = fa
-#             ),
-#             available := (
-#               range_unpack(range(fa.accountNumber * 10000 + 11, fa.accountNumber * 10000 + 9999))
-#               except existing
-#             )
-#           select min(available)
-#         )) else .departmentId
-#       );
+      rewrite update using (
+        if (
+          not exists .departmentId and
+          .status <= Project::Status.Active and
+          .step >= Project::Step.PendingFinanceConfirmation
+        ) then ((
+          with
+            fa := assert_exists(
+              __subject__.primaryLocation.fundingAccount,
+              message := "Project must have a primary location"
+            ),
+            existing := (
+              select detached Project.departmentId filter Project.primaryLocation.fundingAccount = fa
+            ),
+            available := (
+              range_unpack(range(fa.accountNumber * 10000 + 11, fa.accountNumber * 10000 + 9999))
+              except existing
+            )
+          select min(available)
+        )) else .departmentId
+      );
     };
 
     required step: Project::Step {