Merge pull request #2445 from adaptlearning/issue/2439

Find or create assets tags on import, fixes #2439

Author: tomgreenfield

plugins/filestorage/localfs/index.js

@@ -232,7 +232,7 @@ LocalFileStorage.prototype.processFileUpload = function (file, newPath, options,
           if (options.createMetadata) {
             return self.inspectFile(newPath, file.type, function (err, withMeta) {
               if (withMeta) {
-                data = _.extend(data, withMeta);
+                Object.assign(data, withMeta);
               }
               nextFunc();
             });

plugins/output/adapt/helpers.js

@@ -167,11 +167,6 @@ function importAsset(fileMetadata, metadata, assetImported) {
           }
 
           var asset = _.extend(fileMetadata, storedFile);
-          _.each(asset.tags, function iterator(tag, index) {
-            if (metadata.idMap[tag]) {
-              asset.tags[index] = metadata.idMap[tag];
-            }
-          });
 
           origin.assetmanager.createAsset(asset, function onAssetCreated(createError, assetRec) {
             if (createError) {

plugins/output/adapt/importsource.js

@@ -169,14 +169,26 @@ function ImportSource(req, done) {
           var fileStat = fs.statSync(assetPath);
           var assetTitle = assetName;
           var assetDescription = assetName;
-          var tags = formTags.slice();
+          var assetJson = assetsJson[assetName];
+          var tags = [];
 
-          if (assetsJson[assetName]) {
-            assetTitle = assetsJson[assetName].title;
-            assetDescription = assetsJson[assetName].description;
+          if (assetJson) {
+            assetTitle = assetJson.title;
+            assetDescription = assetJson.description;
 
-            assetsJson[assetName].tags.forEach(function(tag) {
-              tags.push(tag._id);
+            assetJson.tags.forEach(function(tag) {
+              const tagTitle = tag.title;
+              const warn = (error) => logger.log('warn', `Failed to create asset tag '${tagTitle}' ${error}`);
+
+              if(!tagTitle) return warn(new Error('Tag has no title'));
+
+              app.contentmanager.getContentPlugin('tag', function(error, plugin) {
+                if(error) return warn(error);
+                plugin.create({ title: tagTitle }, function(error, record) { // @note retrieves if tag already exists
+                  if(error) return warn(error);
+                  tags.push(record._id);
+                });
+              });
             });
           }
           var fileMeta = {