add association

rest_server/src/models/item_category.js

@@ -11,15 +11,18 @@ class ItemCategory {
         defaultValue: DataTypes.UUIDV4,
         primaryKey: true,
       },
-      name: DataTypes.STRING,
+      name: {
+        type: DataTypes.STRING,
+        allowNull: false,
+      },
       description: DataTypes.STRING,
       extras: DataTypes.TEXT,
     });
   }
 
   associate(models) {
-    this.orm.belongsToMany(models.User.orm, {
-      through: 'StarRelation',
+    this.orm.belongsToMany(models.MarketplaceItem.orm, {
+      through: 'ItemCategoryRelation',
     });
     this.models = models;
   }

rest_server/src/models/item_tag.js

@@ -11,16 +11,19 @@ class ItemTag {
         defaultValue: DataTypes.UUIDV4,
         primaryKey: true,
       },
-      name: DataTypes.STRING,
+      name: {
+        type: DataTypes.STRING,
+        allowNull: false,
+      },
       color: DataTypes.STRING,
       description: DataTypes.STRING,
       extras: DataTypes.TEXT,
     });
   }
 
   associate(models) {
-    this.orm.belongsToMany(models.User.orm, {
-      through: 'StarRelation',
+    this.orm.belongsToMany(models.MarketplaceItem.orm, {
+      through: 'ItemTagRelation',
     });
     this.models = models;
   }

rest_server/src/models/marketplace_item.js

@@ -72,6 +72,12 @@ class MarketplaceItem {
     this.orm.belongsToMany(models.User.orm, {
       through: 'StarRelation',
     });
+    this.orm.belongsToMany(models.ItemTag.orm, {
+      through: 'ItemTagRelation',
+    });
+    this.orm.belongsToMany(models.ItemCategory.orm, {
+      through: 'ItemCategoryRelation',
+    });
     this.models = models;
   }
 

rest_server/src/models/model_init_handler.js

@@ -13,6 +13,9 @@ const descriptionDir = path.join(
 );
 
 const createTemplates = async models => {
+  const itemTags = [];
+  const itemCategories = [];
+
   await Promise.all(
     EXAMPLE_LIST.map(async item => {
       try {
@@ -46,12 +49,40 @@ const createTemplates = async models => {
               : [item.categories],
           },
         };
-        await models.MarketplaceItem.orm.create(newItem);
+        const marketplaceItem = await models.MarketplaceItem.orm.create(
+          newItem,
+        );
+        if (Array.isArray(item.categories)) {
+          for (const categoryName of item.categories) {
+            itemTags.push([categoryName, marketplaceItem.id]);
+          }
+        }
+        if (Array.isArray(item.tags)) {
+          for (const tagName of item.tags) {
+            itemCategories.push([tagName, marketplaceItem.id]);
+          }
+        }
       } catch (err) {
         console.log(err.message);
       }
     }),
   );
+  try {
+    for (const [categoryName, itemId] of itemCategories) {
+      const [category] = await models.ItemCategory.orm.findOrCreate({
+        where: { name: categoryName },
+      });
+      category.addMarketplaceItem(itemId);
+    }
+    for (const [tagName, itemId] of itemTags) {
+      const [tag] = await models.ItemTag.orm.findOrCreate({
+        where: { name: tagName },
+      });
+      tag.addMarketplaceItem(itemId);
+    }
+  } catch (err) {
+    console.log(err.message);
+  }
 };
 
 const createStorageBlobs = async models => {

rest_server/src/router.js

@@ -33,7 +33,7 @@ router
 
 router
   .route('/categories')
-  .get(token.checkAuthAndGetUserInfo, categoryController.get)
+  .get(token.checkAuthAndGetUserInfo, categoryController.list)
   .post(token.checkAuthAndGetTokenInfo, categoryController.create);
 
 router