Finished migration

backend/src/server/routes/index.ts

@@ -65,6 +65,7 @@ import { orgRoleDALFactory } from "@app/services/org/org-role-dal";
 import { orgRoleServiceFactory } from "@app/services/org/org-role-service";
 import { orgServiceFactory } from "@app/services/org/org-service";
 import { projectDALFactory } from "@app/services/project/project-dal";
+import { projectQueueFactory } from "@app/services/project/project-queue";
 import { projectServiceFactory } from "@app/services/project/project-service";
 import { projectBotDALFactory } from "@app/services/project-bot/project-bot-dal";
 import { projectBotServiceFactory } from "@app/services/project-bot/project-bot-service";
@@ -299,19 +300,33 @@ export const registerRoutes = async (
     projectKeyDAL,
     projectMembershipDAL
   });
+
+  const projectQueueService = projectQueueFactory({
+    queueService,
+    secretDAL,
+    folderDAL,
+    projectDAL,
+    orgDAL,
+    orgService,
+    projectEnvDAL,
+    userDAL,
+    secretVersionDAL,
+    projectKeyDAL,
+    projectBotDAL,
+    projectMembershipDAL,
+    secretApprovalRequestDAL,
+    secretApprovalSecretDAL: sarSecretDAL
+  });
+
   const projectService = projectServiceFactory({
     permissionService,
     projectDAL,
+    projectQueue: projectQueueService,
     secretBlindIndexDAL,
     identityProjectDAL,
     identityOrgMembershipDAL,
     projectBotDAL,
-    secretDAL,
-    orgDAL,
-    secretApprovalRequestDAL,
-    secretApprovalSecretDAL: sarSecretDAL,
     projectKeyDAL,
-    secretVersionDAL,
     userDAL,
     projectEnvDAL,
     orgService,

backend/src/server/routes/v2/project-router.ts

@@ -74,7 +74,7 @@ export const registerProjectRouter = async (server: FastifyZodProvider) => {
         userPrivateKey: z.string().trim()
       }),
       response: {
-        200: z.object({})
+        200: z.void()
       }
     },
     onRequest: verifyAuth([AuthMode.JWT, AuthMode.API_KEY]),
@@ -88,6 +88,31 @@ export const registerProjectRouter = async (server: FastifyZodProvider) => {
     }
   });
 
+  server.route({
+    url: "/:projectId/upgrade/status",
+    method: "GET",
+    schema: {
+      params: z.object({
+        projectId: z.string().trim()
+      }),
+      response: {
+        200: z.object({
+          status: z.string().nullable()
+        })
+      }
+    },
+    onRequest: verifyAuth([AuthMode.JWT, AuthMode.API_KEY]),
+    handler: async (req) => {
+      const status = await server.services.project.getProjectUpgradeStatus({
+        projectId: req.params.projectId,
+        actor: req.permission.type,
+        actorId: req.permission.id
+      });
+
+      return { status };
+    }
+  });
+
   /* Create new project */
   server.route({
     method: "POST",