Merge pull request #8551 from amplication/fix/8356

(Fix): server 8356=> BTM apply changes failed
amplication · May 27, 2024 · e9bfc0b · e9bfc0b
2 parents 6e6f719 + df0765a
commit e9bfc0b
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/packages/amplication-server/src/core/entity/entity.service.ts b/packages/amplication-server/src/core/entity/entity.service.ts
@@ -836,6 +836,13 @@ export class EntityService {
         );
       }
 
+      for (const relatedEntityField of relatedEntityFields) {
+        await this.deleteField(
+          { where: { id: relatedEntityField.id } },
+          user,
+          fieldStrategy
+        );
+      }
       try {
         await this.moduleService.deleteDefaultModuleForEntity(
           entity.resourceId,
@@ -856,15 +863,6 @@ export class EntityService {
           error
         );
       }
-
-      for (const relatedEntityField of relatedEntityFields) {
-        await this.deleteField(
-          { where: { id: relatedEntityField.id } },
-          user,
-          fieldStrategy
-        );
-      }
-
       return this.prisma.entity.update({
         where: args.where,
         data: {