refactor(model): use join helper on exportables

CodeTanzania · Dec 7, 2019 · 3551e5a · 3551e5a
1 parent b86477e
commit 3551e5a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 34 deletions.
diff --git a/src/event.model.js b/src/event.model.js
@@ -1,5 +1,6 @@
-import { get, map, join, pick } from 'lodash';
-import { idOf } from '@lykmapipo/common';
+import { get, pick } from 'lodash';
+import { join, idOf } from '@lykmapipo/common';
+
 import {
   copyInstance,
   createSchema,
@@ -504,11 +505,7 @@ const EventSchema = createSchema(
       autopopulate: PREDEFINE_OPTION_AUTOPOPULATE,
       taggable: true,
       exportable: {
-        format: v =>
-          join(
-            map(v, area => get(area, 'strings.name.en')),
-            ', '
-          ),
+        format: v => join(v, ', ', 'strings.name.en'),
         default: 'NA',
       },
       aggregatable: { unwind: true },

diff --git a/src/schema/geos.schema.js b/src/schema/geos.schema.js
@@ -1,4 +1,4 @@
-import { get, join, map } from 'lodash';
+import { join } from '@lykmapipo/common';
 import { ObjectId } from '@lykmapipo/mongoose-common';
 import { Point } from 'mongoose-geojson-schemas';
 import { Predefine } from '@lykmapipo/predefine';
@@ -48,11 +48,7 @@ export const areas = {
   autopopulate: PREDEFINE_OPTION_AUTOPOPULATE,
   taggable: true,
   exportable: {
-    format: v =>
-      join(
-        map(v, area => get(area, 'strings.name.en')),
-        ', '
-      ),
+    format: v => join(v, ', ', 'strings.name.en'),
     default: 'NA',
   },
   aggregatable: { unwind: true },

diff --git a/src/schema/parties.schema.js b/src/schema/parties.schema.js
@@ -1,4 +1,5 @@
-import { get, join, map } from 'lodash';
+import { get } from 'lodash';
+import { join } from '@lykmapipo/common';
 import { ObjectId } from '@lykmapipo/mongoose-common';
 import { Predefine } from '@lykmapipo/predefine';
 import { Party } from '@codetanzania/emis-stakeholder';
@@ -142,11 +143,7 @@ export const groups = {
   autopopulate: PREDEFINE_OPTION_AUTOPOPULATE,
   taggable: true,
   exportable: {
-    format: v =>
-      join(
-        map(v, role => get(role, 'strings.name.en')),
-        ', '
-      ),
+    format: v => join(v, ', ', 'strings.name.en'),
     default: 'NA',
   },
   aggregatable: { unwind: true },
@@ -192,11 +189,7 @@ export const roles = {
   autopopulate: PREDEFINE_OPTION_AUTOPOPULATE,
   taggable: true,
   exportable: {
-    format: v =>
-      join(
-        map(v, role => get(role, 'strings.name.en')),
-        ', '
-      ),
+    format: v => join(v, ', ', 'strings.name.en'),
     default: 'NA',
   },
   aggregatable: { unwind: true },
@@ -245,11 +238,7 @@ export const agencies = {
   autopopulate: Party.OPTION_AUTOPOPULATE,
   taggable: true,
   exportable: {
-    format: v =>
-      join(
-        map(v, party => get(party, 'name')),
-        ', '
-      ),
+    format: v => join(v, ', ', 'name'),
     default: 'NA',
   },
   aggregatable: { unwind: true },
@@ -297,11 +286,7 @@ export const focals = {
   autopopulate: Party.OPTION_AUTOPOPULATE,
   taggable: true,
   exportable: {
-    format: v =>
-      join(
-        map(v, party => get(party, 'name')),
-        ', '
-      ),
+    format: v => join(v, ', ', 'name'),
     default: 'NA',
   },
   aggregatable: { unwind: true },