Feat: drizzle postgres freds changes (#927)

* adjust device model to frontend schema but keep sensebox v1 models

* enhance error handling and improve code consistency

* add unconfirmed_email field to user model and update email handling logic

* add additional `_id` to db query return (mongoDb default)

* update boxes `PUT` requests and tests

* small test and query adjustments

Author: freds-dev

packages/api/lib/controllers/usersController.js

@@ -1,41 +1,51 @@
-'use strict';
+"use strict";
 
-const restifyErrors = require('restify-errors');
+const restifyErrors = require("restify-errors");
 
-const restifyErrorNames = Object.keys(restifyErrors).filter(e => e.includes('Error') && e !== 'codeToHttpError');
+const restifyErrorNames = Object.keys(restifyErrors).filter(
+  (e) => e.includes("Error") && e !== "codeToHttpError"
+);
 
 const handleError = function (err) {
-  if (err.name === 'ModelError') {
-    if (err.data && err.data.type) {
-      return Promise.reject(new restifyErrors[err.data.type](err.message));
+  if (err.name === "ModelError") {
+    const status = err.status || 400; // Ensure a fallback status
+
+    // Map `status` to a Restify error type
+    switch (status) {
+      case 400:
+        return Promise.reject(new restifyErrors.BadRequestError(err.message));
+      case 401:
+        return Promise.reject(new restifyErrors.UnauthorizedError(err.message));
+      case 403:
+        return Promise.reject(new restifyErrors.ForbiddenError(err.message)); // ✅ Now properly handling 403
+      case 404:
+        return Promise.reject(new restifyErrors.NotFoundError(err.message));
+      case 422:
+        return Promise.reject(
+          new restifyErrors.UnprocessableEntityError(err.message)
+        );
+      case 500:
+      default:
+        return Promise.reject(
+          new restifyErrors.InternalServerError(err.message)
+        );
     }
-
-    return Promise.reject(new restifyErrors.BadRequestError(err.message));
   }
 
-  if (err.name === 'ValidationError') {
-    const msgs = [];
-    for (const field in err.errors) {
-      if (!err.errors[field].errors) {
-        msgs.push(err.errors[field].message);
-      }
-    }
+  if (err.name === "ValidationError") {
+    const msgs = Object.keys(err.errors)
+      .map((field) => err.errors[field].message)
+      .join(", ");
 
-    return Promise.reject(new restifyErrors.UnprocessableEntityError(`Validation failed: ${msgs.join(', ')}`));
+    return Promise.reject(
+      new restifyErrors.UnprocessableEntityError(`Validation failed: ${msgs}`)
+    );
   }
 
   if (restifyErrorNames.includes(err.name)) {
     return Promise.reject(err);
   }
 
-  if (err.errors) {
-    const msg = Object.keys(err.errors)
-      .map(f => `${err.errors[f].message}`)
-      .join(', ');
-
-    return Promise.reject(new restifyErrors.UnprocessableEntityError(msg));
-  }
-
   return Promise.reject(new restifyErrors.InternalServerError(err.message));
 };
 

packages/api/lib/helpers/errorHandler.js

@@ -9,7 +9,8 @@
     "Gerald Pape",
     "Norwin Roosen",
     "Umut Tas",
-    "Felix Erdmann"
+    "Felix Erdmann",
+    "Frederick Bruch"
   ],
   "dependencies": {
     "@paralleldrive/cuid2": "^2.2.2",

packages/api/package.json

@@ -0,0 +1,9 @@
+ALTER TYPE "model" ADD VALUE 'homeEthernet';--> statement-breakpoint
+ALTER TYPE "model" ADD VALUE 'homeWifi';--> statement-breakpoint
+ALTER TYPE "model" ADD VALUE 'homeLora';--> statement-breakpoint
+ALTER TYPE "model" ADD VALUE 'homeV2Lora';--> statement-breakpoint
+ALTER TYPE "model" ADD VALUE 'homeV2Ethernet';--> statement-breakpoint
+ALTER TYPE "model" ADD VALUE 'homeV2Wifi';--> statement-breakpoint
+ALTER TYPE "model" ADD VALUE 'senseBox:Edu';--> statement-breakpoint
+ALTER TYPE "model" ADD VALUE 'luftdaten.info';--> statement-breakpoint
+ALTER TYPE "model" ADD VALUE 'Custom';

packages/models/migrations/0016_greedy_speedball.sql

@@ -0,0 +1,2 @@
+ALTER TABLE "user" ADD COLUMN "unconfirmed_email" text;--> statement-breakpoint
+ALTER TABLE "user" ADD CONSTRAINT "user_unconfirmed_email_unique" UNIQUE("unconfirmed_email");