fix: conflicted trigger should return error on POST

clov3r-cc · Oct 4, 2023 · 1338dcc · 1338dcc
1 parent a6fd2bb
commit 1338dcc
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 4 deletions.
diff --git a/apps/auto-run-ac-api/src/api/defaultTriggersApi.ts b/apps/auto-run-ac-api/src/api/defaultTriggersApi.ts
@@ -55,6 +55,9 @@ export const defaultTriggersApi = app
             },
           },
         },
+        409: {
+          description: 'The trigger has already been created',
+        },
       },
       method: 'post',
       path: '/',
@@ -63,7 +66,7 @@ export const defaultTriggersApi = app
       const contents = c.req.valid('json');
 
       const id = nanoid();
-      await c
+      const createdTriggers = await c
         .get('db')
         .insert(table)
         .values({
@@ -73,7 +76,13 @@ export const defaultTriggersApi = app
           settingsTemp: contents.ac.temp,
           operationMode: contents.ac.mode,
         })
-        .onConflictDoNothing();
+        .onConflictDoNothing()
+        .returning({ createdId: table.id });
+
+      if (createdTriggers.length === 0) {
+        return emptyJsonT(c, 409);
+      }
+
       const trigger = { ...contents, id };
 
       return c.jsonT({ trigger }, 201, { Location: `${getUrl(c.req)}/${id}` });

diff --git a/apps/auto-run-ac-api/src/api/triggersApi.ts b/apps/auto-run-ac-api/src/api/triggersApi.ts
@@ -55,6 +55,9 @@ export const triggersApi = app
             },
           },
         },
+        409: {
+          description: 'The trigger has already been created',
+        },
       },
       method: 'post',
       path: '/',
@@ -63,7 +66,7 @@ export const triggersApi = app
       const contents = c.req.valid('json');
 
       const id = nanoid();
-      await c
+      const createdTrigger = await c
         .get('db')
         .insert(table)
         .values({
@@ -73,7 +76,13 @@ export const triggersApi = app
           settingsTemp: contents.ac.temp,
           operationMode: contents.ac.mode,
         })
-        .onConflictDoNothing();
+        .onConflictDoNothing()
+        .returning({ createdId: table.id });
+
+      if (createdTrigger.length === 0) {
+        return emptyJsonT(c, 409);
+      }
+
       const trigger = { ...contents, id };
 
       return c.jsonT({ trigger }, 201, { Location: `${getUrl(c.req)}/${id}` });