Merge pull request #7 from philippebeck/dev

Release 0.1.5-alpha
philippebeck · Dec 6, 2023 · 47d138c · 47d138c
2 parents b6aff4f + 0658cfd
commit 47d138c
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 13 deletions.
diff --git a/controller/ProductCtrl.js b/controller/ProductCtrl.js
@@ -147,7 +147,12 @@ exports.setImage = (name, newFilename) => {
 exports.listProducts = (req, res) => {
   Product
     .findAll()
-    .then((products) => res.status(200).json(products))
+    .then((products) => {
+      for (const product of products) {
+        product.options = JSON.parse(product.options).join(",");
+      }
+      res.status(200).json(products);
+    })
     .catch(() => res.status(404).json({ message: process.env.PRODUCTS_NOT_FOUND }));
 };
 
@@ -163,7 +168,10 @@ exports.listProducts = (req, res) => {
 exports.readProduct = (req, res) => {
   Product
     .findByPk(parseInt(req.params.id))
-    .then((product) => res.status(200).json(product))
+    .then((product) => { 
+      product.options = JSON.parse(product.options).join(",");
+      res.status(200).json(product);
+    })
     .catch(() => res.status(404).json({ message: process.env.PRODUCT_NOT_FOUND }));
 }
 

diff --git a/model/ImageModel.js b/model/ImageModel.js
@@ -2,9 +2,6 @@
 
 const { Sequelize, DataTypes } = require("sequelize");
 
-const db = require("../model");
-const Gallery = db.gallery;
-
 /**
  * ? IMAGE MODEL
  * * Define the Image Model
@@ -37,7 +34,7 @@ module.exports = (Sequelize, DataTypes) => {
       type: DataTypes.SMALLINT.UNSIGNED,
       allowNull: false,
       references: {
-        model: Gallery,
+        model: "Gallery",
         key: "id",
       }
     }

diff --git a/model/OrderModel.js b/model/OrderModel.js
@@ -2,9 +2,6 @@
 
 const { Sequelize, DataTypes } = require("sequelize");
 
-const db = require("../model");
-const User = db.user;
-
 /**
  * ? ORDER MODEL
  * * Define the Order Model
@@ -47,7 +44,7 @@ module.exports = (Sequelize, DataTypes) => {
       type: DataTypes.SMALLINT.UNSIGNED,
       allowNull: false,
       references: {
-        model: User,
+        model: "User",
         key: "id",
       },
     },

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nens",
-  "version": "0.1.4-alpha",
+  "version": "0.1.5-alpha",
   "description": "API with Node, Express, NemJS & SQL",
   "keywords": [
     "api",