fix: upload would fail most of the time for tagbox / checkbox questions

Author: AntoineRelief

src/routes/gis/index.ts

@@ -189,7 +189,6 @@ const getFeatures = async (
  if (mapping.adminField) {
  adminPolygons = await getPolygons(mapping.adminField);
  }
- console.log('Items length is : ', items.length);
  items.forEach((item) => {
  try {
  if (mapping.adminField) {

src/routes/upload/index.ts

@@ -92,8 +92,8 @@ async function insertRecords(
  String(form.resource ? form.resource : form.id)
  ),
  form: form.id,
- createdAt: new Date(),
- modifiedAt: new Date(),
+ // createdAt: new Date(),
+ // modifiedAt: new Date(),
  data: dataSet.data,
  resource: form.resource ? form.resource : null,
  createdBy: {

src/utils/files/getUploadColumns.ts

@@ -11,7 +11,8 @@ export const getUploadColumns = (fields: any[], headers: any[]): any[] => {
  switch (field.type) {
  case 'checkbox':
  case 'tagbox': {
- if (field.choices) {
+ // One column per option, if question has choices & we don't find it in the list of the excel columns.
+ if (field.choices && !headers.find(field.name)) {
  for (const item of field.choices) {
  const name = `${field.name}.${item.value}`;
  const index = headers.indexOf(name);

src/utils/files/loadRow.ts

@@ -1,4 +1,4 @@
-import { isArray } from 'lodash';
+import { isArray, isNil } from 'lodash';
 import set from 'lodash/set';
 import { PositionAttribute } from '@models';
 
@@ -36,19 +36,18 @@ export const loadRow = (
  data[column.field] = false;
  }
  }
- case 'checkbox': {
- if (value === 1) {
- data[column.field] = (
- isArray(data[column.field]) ? data[column.field] : []
- ).concat(column.value);
- }
- break;
- }
+ case 'checkbox':
  case 'tagbox': {
- if (value === 1) {
- data[column.field] = (
- isArray(data[column.field]) ? data[column.field] : []
- ).concat(column.value);
+ // Column is linked to a specific value
+ if (!isNil(column.value)) {
+ if (value === 1) {
+ data[column.field] = (
+ isArray(data[column.field]) ? data[column.field] : []
+ ).concat(column.value);
+ }
+ } else {
+ // General column for the field, so we can directly save the values in the record
+ set(data, column.field, value);
  }
  break;
  }

src/utils/gis/getCountryPolygons.ts

@@ -61,7 +61,6 @@ export const getAdmin0Polygons = async (
  password: config.get('redis.password'),
  });
  client.on('error', (error) => {
- console.log('error is here');
  logger.error(`REDIS: ${error}`);
  });
  await client.connect();
@@ -94,7 +93,6 @@ export const getAdmin0Polygons = async (
  })
  .then(({ data }) => {
  if (client) {
- console.log('setting cache');
  client.set(cacheKey, JSON.stringify(data.data.countrys), {
  EX: 60 * 60 * 1, // set a cache of one hour
  });
@@ -106,9 +104,7 @@ export const getAdmin0Polygons = async (
  return [];
  });
  } else {
- console.log('there is cache');
  admin0s = JSON.parse(cacheData);
- console.log('And length is : ', admin0s.length);
  }
  for (const country of admin0s) {
  if (country.polygons && country[identifier]) {