Resolve merge conflict

Comfy-Org · Jan 3, 2025 · 082c4b0 · 082c4b0
1 parent 7063521
commit 082c4b0
Show file tree

Hide file tree

Showing 5 changed files with 207 additions and 160 deletions.
diff --git a/drip/api.gen.go b/drip/api.gen.go
diff --git a/integration-tests/registry_integration_test.go b/integration-tests/registry_integration_test.go
@@ -979,6 +979,17 @@ func TestRegistryComfyNode(t *testing.T) {
 		}
 	})
 
+	t.Run("Conflict", func(t *testing.T) {
+		body := drip.CreateComfyNodesJSONRequestBody(comfyNodes)
+		res, err := withMiddleware(authz, impl.CreateComfyNodes)(ctx, drip.CreateComfyNodesRequestObject{
+			NodeId:  *node.Id,
+			Version: *nodeVersion.Version,
+			Body:    &body,
+		})
+		require.NoError(t, err)
+		require.IsType(t, drip.CreateComfyNodes409JSONResponse{}, res)
+	})
+
 	t.Run("GetNodeVersion", func(t *testing.T) {
 		res, err := withMiddleware(authz, impl.GetNodeVersion)(ctx, drip.GetNodeVersionRequestObject{
 			NodeId:    *node.Id,

diff --git a/openapi.yml b/openapi.yml
@@ -1803,6 +1803,12 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/ErrorResponse'
+        '409':
+          description: Existing Comfy Nodes exists
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
         '500':
           description: Internal server error
           content: