@things-factory/integration-base 6.1.155 → 6.1.156

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-base",
-  "version": "6.1.155",
+  "version": "6.1.156",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -26,12 +26,12 @@
   },
   "dependencies": {
     "@apollo/client": "^3.6.9",
-    "@things-factory/api": "^6.1.154",
-    "@things-factory/auth-base": "^6.1.154",
+    "@things-factory/api": "^6.1.156",
+    "@things-factory/auth-base": "^6.1.156",
     "@things-factory/env": "^6.1.154",
-    "@things-factory/oauth2-client": "^6.1.154",
-    "@things-factory/scheduler-client": "^6.1.154",
-    "@things-factory/shell": "^6.1.154",
+    "@things-factory/oauth2-client": "^6.1.156",
+    "@things-factory/scheduler-client": "^6.1.156",
+    "@things-factory/shell": "^6.1.156",
     "async-mqtt": "^2.5.0",
     "chance": "^1.1.11",
     "cross-fetch": "^3.0.4",
@@ -46,5 +46,5 @@
   "devDependencies": {
     "@types/cron": "^2.0.1"
   },
-  "gitHead": "b08fff48f768f10f90d11bb31f413396affdfc33"
+  "gitHead": "5a0f1cd16edee089468c231b3bb97bd0c03c8727"
 }

package/server/service/connection/connection-mutation.ts

@@ -166,12 +166,41 @@ export class ConnectionMutation {
   ): Promise<boolean> {
     const { tx, domain, user } = context.state
 
+    const repository = tx.getRepository(Connection)
+
     await Promise.all(
       connections.map(async (connection: Connection) => {
-        await tx.getRepository(Connection).save({
+        const { id, name } = connection
+
+        if (id) {
+          const sameId = await repository.findOneBy({ id })
+
+          if (sameId) {
+            if (sameId.domainId != domain.id) {
+              throw `Connection with id '${id}:${name}' is already taken by another domain`
+            }
+
+            const sameName = await repository.findOneBy({ domain: { id: domain.id }, name })
+            if (sameName && sameName.id != id) {
+              throw `Connection with name '${name}' is already taken by another connection`
+            }
+
+            await repository.save({
+              ...sameId,
+              ...connection,
+              domain,
+              updater: user
+            })
+
+            return
+          }
+        }
+
+        await repository.save({
           ...connection,
           domain,
-          updater: user
+          updater: user,
+          creator: user
         })
       })
     )

package/server/service/scenario/scenario-mutation.ts

@@ -147,27 +147,62 @@ export class ScenarioMutation {
     @Arg('scenarios', type => [ScenarioPatch]) scenarios: Scenario[],
     @Ctx() context: ResolverContext
   ): Promise<boolean> {
-    const { domain, user, tx } = context.state
+    const { tx, domain, user } = context.state
+
+    const repository = tx.getRepository(Scenario)
 
     await Promise.all(
       scenarios.map(async (scenario: Scenario) => {
-        const savedScenario: Scenario = await tx.getRepository(Scenario).save({
-          domain,
-          ...scenario,
-          updater: user
-        })
-        if (scenario.steps?.length) {
-          await tx.getRepository(Step).save(
-            scenario.steps.map((step: Step) => {
-              return {
-                ...step,
-                domain,
-                scenario: savedScenario,
-                updater: user
-              }
+        const { id, name } = scenario
+        var savedScenario
+
+        if (id) {
+          const sameId = await repository.findOneBy({ id })
+
+          if (sameId) {
+            if (sameId.domainId != domain.id) {
+              throw `Scenario with id '${id}:${name}' is already taken by another domain`
+            }
+
+            const sameName = await repository.findOneBy({ domain: { id: domain.id }, name })
+            if (sameName && sameName.id != id) {
+              throw `Scenario Name '${name}' is already taken by another scenario`
+            }
+
+            savedScenario = await repository.save({
+              ...sameId,
+              ...scenario,
+              domain,
+              updater: user
+            })
+          } else {
+            savedScenario = await repository.save({
+              ...scenario,
+              domain,
+              updater: user,
+              creator: user
             })
-          )
+          }
+        } else {
+          savedScenario = await repository.save({
+            ...scenario,
+            domain,
+            updater: user,
+            creator: user
+          })
         }
+
+        await tx.getRepository(Step).delete({ domain: { id: domain.id }, scenario: { id: savedScenario.id } })
+        await tx.getRepository(Step).save(
+          scenario.steps.map((step: Step) => {
+            return {
+              ...step,
+              domain,
+              scenario: savedScenario,
+              updater: user
+            }
+          })
+        )
       })
     )