fixup csv and prefix upload

Author: ashimali

application/blueprints/main/views.py

@@ -178,9 +178,9 @@ def add_record(id):
 
         # set prefix to as it is not in form
         data["prefix"] = (
-            dataset.dataset
-            if dataset.dataset not in current_app.config.WIKIDATA_PREFIX_DATASETS
-            else "wikidata"
+            "wikidata"
+            if dataset.dataset in current_app.config["WIKIDATA_PREFIX_DATASETS"]
+            else dataset.dataset
         )
         data["entry-date"] = datetime.datetime.today().strftime("%Y-%m-%d")
 

application/blueprints/uploads/views.py

@@ -4,7 +4,16 @@
 from collections import OrderedDict
 from csv import DictReader
 
-from flask import Blueprint, abort, flash, redirect, render_template, request, url_for
+from flask import (
+    Blueprint,
+    abort,
+    current_app,
+    flash,
+    redirect,
+    render_template,
+    request,
+    url_for,
+)
 from werkzeug.utils import secure_filename
 
 from application.extensions import db
@@ -98,6 +107,7 @@ def upload_csv(dataset):
                                 original_record.get("entity"),
                                 ds.dataset,
                                 original_record,
+                                current_app.config,
                             )
                             ds.records.append(record)
                             db.session.add(ds)

application/models.py

@@ -215,7 +215,7 @@ def to_dict(self):
         return data
 
     @classmethod
-    def factory(cls, row_id, entity, dataset, data_dict):
+    def factory(cls, row_id, entity, dataset, data_dict, config):
         record = cls()
         for column in record.__table__.columns:
             if column.name != "data":
@@ -234,7 +234,9 @@ def factory(cls, row_id, entity, dataset, data_dict):
 
         record.row_id = row_id
         record.entity = int(entity)
-        record.prefix = dataset
+        record.prefix = (
+            "wikidata" if dataset in config["WIKIDATA_PREFIX_DATASETS"] else dataset
+        )
         record.data = data_dict
         record.dataset_id = dataset