Merge pull request #41 from haniffalab/patch/data-import

update collection and team to support the data-import plugin

Author: davehorsfall

src/api/collection/content-types/collection/lifecycles.js

@@ -0,0 +1,29 @@
+module.exports = {
+  async beforeCreate(event) {
+    event.params.data.uid = await strapi.service('plugin::content-manager.uid')
+      .generateUIDField({
+        contentTypeUID: 'api::collection.collection',
+        field: 'uid',
+        data: event.params.data
+      });
+  },
+  async beforeUpdate(event) {
+    const { data, where } = event.params;
+
+    const isPublishAction = 'publishedAt' in data;
+
+    if (!isPublishAction){
+      const entry = await strapi.entityService.findOne('api::collection.collection', where.id);
+
+      if ('name' in data && data.name !== entry.name){
+        event.params.data.uid = await strapi.service('plugin::content-manager.uid')
+          .generateUIDField({
+            contentTypeUID: 'api::collection.collection',
+            field: 'uid',
+            data: data
+          });
+      }
+    }
+  },
+
+};

src/api/collection/content-types/collection/schema.json

@@ -28,6 +28,11 @@
     "name": {
       "type": "string",
       "unique": true
+    },
+    "uid": {
+      "type": "uid",
+      "targetField": "name",
+      "required": true
     }
   }
 }

src/api/collection/services/collection.js

@@ -6,4 +6,24 @@
 
 const { createCoreService } = require('@strapi/strapi').factories;
 
-module.exports = createCoreService('api::collection.collection');
+module.exports = createCoreService('api::collection.collection', ({strapi}) => ({
+  async findByUid(ctx){
+    const ctUid = 'api::collection.collection';
+    const attrs = strapi.contentTypes[ctUid].__schema__.attributes;
+    const uidTarget =attrs['uid'].targetField;
+    const { [uidTarget]: uidTargetValue } = ctx.params;
+    
+    const populateParams = strapi.config.functions.getPopulateParams(attrs);
+    
+    let entity = await strapi.db.query(ctUid).findOne({
+      where: { [uidTarget]: uidTargetValue },
+      populate: populateParams
+    });
+
+    if (entity){
+      entity = strapi.config.functions.reduceComponentData(attrs, entity);
+    }
+
+    return entity;
+  }
+}));

src/api/team/content-types/team/lifecycles.js

@@ -0,0 +1,28 @@
+module.exports = {
+  async beforeCreate(event) {
+    event.params.data.uid = await strapi.service('plugin::content-manager.uid')
+      .generateUIDField({
+        contentTypeUID: 'api::team.team',
+        field: 'uid',
+        data: event.params.data
+      });
+  },
+  async beforeUpdate(event) {
+    const { data, where } = event.params;
+
+    const isPublishAction = 'publishedAt' in data;
+
+    if (!isPublishAction){
+      const entry = await strapi.entityService.findOne('api::team.team', where.id);
+    
+      if ('name' in data && data.name !== entry.name){
+        event.params.data.uid = await strapi.service('plugin::content-manager.uid')
+          .generateUIDField({
+            contentTypeUID: 'api::team.team',
+            field: 'uid',
+            data: data
+          });
+      }
+    }
+  },
+};

src/api/team/content-types/team/schema.json

@@ -42,6 +42,11 @@
     },
     "email": {
       "type": "email"
+    },
+    "uid": {
+      "type": "uid",
+      "targetField": "name",
+      "required": true
     }
   }
 }

src/api/team/services/team.js

@@ -6,4 +6,24 @@
 
 const { createCoreService } = require('@strapi/strapi').factories;
 
-module.exports = createCoreService('api::team.team');
+module.exports = createCoreService('api::team.team', ({strapi}) => ({
+  async findByUid(ctx){
+    const ctUid = 'api::team.team';
+    const attrs = strapi.contentTypes[ctUid].__schema__.attributes;
+    const uidTarget =attrs['uid'].targetField;
+    const { [uidTarget]: uidTargetValue } = ctx.params;
+    
+    const populateParams = strapi.config.functions.getPopulateParams(attrs);
+    
+    let entity = await strapi.db.query(ctUid).findOne({
+      where: { [uidTarget]: uidTargetValue },
+      populate: populateParams
+    });
+
+    if (entity){
+      entity = strapi.config.functions.reduceComponentData(attrs, entity);
+    }
+
+    return entity;
+  }
+}));

src/plugins/data-import/server/content-types/datafile/import.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const { ApplicationError } = require('@strapi/utils').errors;
 const array = require('lodash/array');
 const collection = require('lodash/collection');
 const object = require('lodash/object');
@@ -22,10 +23,10 @@ const getEbiFieldData = async (data, ontology) => {
   ({options} = res);
 
   if (error) {
-    throw new Error(error);
+    throw new ApplicationError(error);
   }
   else if (!options || !options.length){
-    throw new Error(`Provided data ${q} does not match to any ontology`);
+    throw new ApplicationError(`Provided data ${q} does not match to any ontology`);
   }
 
   if (label){
@@ -34,7 +35,7 @@ const getEbiFieldData = async (data, ontology) => {
     );
   }
   if (options.length > 1){
-    throw new Error(`Provided data ${q} does not match to a single ontology`);
+    throw new ApplicationError(`Provided data ${q} does not match to a single ontology`);
   }
 
   return options[0];