Merge pull request #367 from nexB/248-scan-errors

Collect scan errors on the flatFile model #248

assets/app/js/controllers/scanDataTable.js

@@ -825,6 +825,13 @@ ScanDataTable.FILE_COLUMNS =
         'name': 'is_script',
         'bar_chart_class': 'bar-chart-file-infos',
         'visible': false
+      },
+      {
+        'data': 'scan_errors',
+        'title': 'Scan Errors',
+        'name': 'scan_errors',
+        'bar_chart_class': 'bar-chart-file-infos',
+        'visible': true
       }
     ];
 

assets/app/js/models/database.js

@@ -25,6 +25,7 @@ const emailModel = require('./email');
 const urlModel = require('./url');
 const conclusionModel = require('./conclusion');
 const flatFileModel = require('./flatFile');
+const scanErrorModel = require('./scanError');
 
 module.exports = function(sequelize, DataTypes) {
   // Define the models
@@ -38,6 +39,7 @@ module.exports = function(sequelize, DataTypes) {
   this.Email = emailModel(sequelize, DataTypes);
   this.Url = urlModel(sequelize, DataTypes);
   this.Conclusion = conclusionModel(sequelize, DataTypes);
+  this.ScanError = scanErrorModel(sequelize, DataTypes);
 
   this.FlatFile = flatFileModel(sequelize, DataTypes);
 
@@ -50,6 +52,7 @@ module.exports = function(sequelize, DataTypes) {
   this.File.hasMany(this.Package);
   this.File.hasMany(this.Email);
   this.File.hasMany(this.Url);
+  this.File.hasMany(this.ScanError);
   this.File.hasOne(this.Conclusion);
 
   // Include Array for queries
@@ -61,6 +64,7 @@ module.exports = function(sequelize, DataTypes) {
     { model: this.Package, separate: true },
     { model: this.Email, separate: true },
     { model: this.Url, separate: true },
+    { model: this.ScanError, separate: true },
     { model: this.Conclusion }
   ];
 

assets/app/js/models/flatFile.js

@@ -68,6 +68,7 @@ module.exports = function(sequelize, DataTypes) {
       is_media: DataTypes.BOOLEAN,
       is_source: DataTypes.BOOLEAN,
       is_script: DataTypes.BOOLEAN,
+      scan_errors: jsonDataType('scan_errors'),
       packages_type: jsonDataType('packages_type'),
       packages_namespace: jsonDataType('packages_dataspace'),
       packages_name: jsonDataType('packages_name'),
@@ -173,6 +174,7 @@ module.exports = function(sequelize, DataTypes) {
       is_media: file.is_media,
       is_source: file.is_source,
       is_script: file.is_script,
+      scan_errors: file.scan_errors,
       packages_type: getValues(file.packages, 'type'),
       pacages_namespace: getValues(file.packages, 'namespace'),
       packages_name: getValues(file.packages, 'name'),

assets/app/js/models/scanError.js

@@ -0,0 +1,26 @@
+/*
+ #
+ # Copyright (c) 2018 nexB Inc. and others. All rights reserved.
+ # https://nexb.com and https://github.com/nexB/scancode-workbench/
+ # The ScanCode Workbench software is licensed under the Apache License version 2.0.
+ # ScanCode is a trademark of nexB Inc.
+ #
+ # You may not use this software except in compliance with the License.
+ # You may obtain a copy of the License at: http://apache.org/licenses/LICENSE-2.0
+ # Unless required by applicable law or agreed to in writing, software distributed
+ # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ # CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ # specific language governing permissions and limitations under the License.
+ #
+ */
+
+module.exports = function(sequelize, DataTypes) {
+  return sequelize.define(
+    'scan_errors',
+    {
+      scan_error: DataTypes.STRING
+    },
+    {
+      timestamps: false
+    });
+};

assets/app/js/workbenchDB.js

@@ -1,6 +1,6 @@
 /*
  #
- # Copyright (c) 2017 nexB Inc. and others. All rights reserved.
+ # Copyright (c) 2017 - 2019 nexB Inc. and others. All rights reserved.
  # https://nexb.com and https://github.com/nexB/scancode-workbench/
  # The ScanCode Workbench software is licensed under the Apache License version 2.0.
  # ScanCode is a trademark of nexB Inc.
@@ -397,6 +397,7 @@ class WorkbenchDB {
         .then(() => this.db.Package.bulkCreate(this._addExtraFields(files, 'packages'), options))
         .then(() => this.db.Email.bulkCreate(this._addExtraFields(files, 'emails'), options))
         .then(() => this.db.Url.bulkCreate(this._addExtraFields(files, 'urls'), options))
+        .then(() => this.db.ScanError.bulkCreate(this._addExtraFields(files, 'scan_errors'), options))
         .then(() => this.sequelize.Promise.each(files, (file) => {
           if (file.conclusion) {
             return this.db.Conclusion.create(file.conclusion, options);
@@ -418,6 +419,11 @@ class WorkbenchDB {
             license_expression: value,
             fileId: file.id
           };
+        } else if (attribute === 'scan_errors') {
+          return {
+            scan_error: value,
+            fileId: file.id
+          };
         }
         value.fileId = file.id;
         return value;