feat(server):validate duplicate modules

amplication · May 12, 2024 · 80b55e2 · 80b55e2
1 parent 9dc9ed2
commit 80b55e2
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 0 deletions.
diff --git a/packages/amplication-server/src/core/module/module.service.spec.ts b/packages/amplication-server/src/core/module/module.service.spec.ts
@@ -78,6 +78,7 @@ const EXAMPLE_MODULE: Module = {
   inputParameters: null,
   outputParameters: null,
   versionNumber: 0,
+  resourceId: EXAMPLE_RESOURCE_ID,
 };
 
 export const subscriptionServiceFindOneMock = jest.fn(() => {
@@ -107,6 +108,7 @@ const blockServiceCreateMock = jest.fn((args: CreateModuleArgs): Module => {
     description: data.description,
     inputParameters: null,
     outputParameters: null,
+    resourceId: EXAMPLE_RESOURCE_ID,
   };
 });
 
@@ -396,4 +398,31 @@ describe("ModuleService", () => {
       )
     );
   });
+
+  it("should throw an error when updating a module with a name that is already used", async () => {
+    blockServiceFindManyByBlockTypeMock.mockReturnValue([
+      {
+        ...EXAMPLE_MODULE,
+        id: "anotherModuleId",
+        name: EXAMPLE_MODULE_NAME,
+      },
+    ]);
+
+    const args: UpdateModuleArgs = {
+      where: {
+        id: EXAMPLE_MODULE_ID,
+      },
+      data: {
+        displayName: EXAMPLE_MODULE_DISPLAY_NAME,
+        name: EXAMPLE_MODULE_NAME,
+        enabled: true,
+      },
+    };
+
+    await expect(service.update(args, EXAMPLE_USER)).rejects.toThrow(
+      new AmplicationError(
+        `Module with name ${args.data.name} already exists in resource ${EXAMPLE_RESOURCE_ID}`
+      )
+    );
+  });
 });
diff --git a/packages/amplication-server/src/core/module/module.service.ts b/packages/amplication-server/src/core/module/module.service.ts
@@ -185,6 +185,20 @@ export class ModuleService extends BlockTypeService<
 
     this.validateModuleName(args.data.name);
 
+    const otherModule = await this.findModuleByName(
+      args.data.name,
+      existingModule.resourceId
+    );
+
+    if (
+      otherModule.length > 0 &&
+      otherModule.filter((module) => module.id !== args.where.id).length > 0
+    ) {
+      throw new AmplicationError(
+        `Module with name ${args.data.name} already exists in resource ${existingModule.resourceId}`
+      );
+    }
+
     const subscription = await this.billingService.getSubscription(
       user.workspace?.id
     );