Merge branch 'dev' into update-packages

app/src/server/actions.ts

@@ -163,12 +163,13 @@ export const addUserModels: AddUserModels<AddUserModelsPayload, any> = async (ar
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify({ ...args }),
     });
-    const json: any = (await response.json()) as { detail?: string }; // Parse JSON once
 
+    const json: any = (await response.json()) as { detail?: string }; // Parse JSON once
     if (!response.ok) {
-      const errorMsg = json.detail || `HTTP error with status code ${response.status}`;
-      console.error('Server Error:', errorMsg);
-      throw new Error(errorMsg);
+      throw new HttpError(
+        response.status,
+        JSON.stringify(json.detail) || `HTTP error with status code ${response.status}`
+      );
     }
 
     return json;
@@ -208,9 +209,10 @@ export const updateUserModels: UpdateUserModels<UpdateUserModelsPayload, void> =
     const json: any = (await response.json()) as { detail?: string }; // Parse JSON once
 
     if (!response.ok) {
-      const errorMsg = json.detail || `HTTP error with status code ${response.status}`;
-      console.error('Server Error:', errorMsg);
-      throw new Error(errorMsg);
+      throw new HttpError(
+        response.status,
+        JSON.stringify(json.detail) || `HTTP error with status code ${response.status}`
+      );
     }
   } catch (error: any) {
     throw new HttpError(500, error.message);

migrations/20240910115224_make_json_str_name_unique_per_user/migration.sql

@@ -0,0 +1,21 @@
+-- Update records with duplicate names for the same user
+UPDATE "Model"
+SET json_str = jsonb_set(
+    json_str::jsonb,
+    '{name}',
+    -- Append a random 5-digit suffix to the name
+    to_jsonb(json_str->>'name' || '_' || LPAD(FLOOR(RANDOM() * 100000)::text, 5, '0'))
+)
+-- Select records with duplicate names
+WHERE (user_uuid, json_str->>'name') IN (
+    SELECT user_uuid, json_str->>'name'
+    FROM "Model"
+    GROUP BY user_uuid, json_str->>'name'
+    HAVING COUNT(*) > 1
+)
+-- Exclude the first occurrence of each duplicate set
+AND uuid NOT IN (
+    SELECT DISTINCT ON (user_uuid, json_str->>'name') uuid
+    FROM "Model"
+    ORDER BY user_uuid, json_str->>'name', created_at
+);