Manual corrections

.eslintrc

@@ -1,5 +1,8 @@
 {
   "extends": "@medic",
+  "env": {
+    "node": true
+  },
   "parserOptions": {
     "ecmaVersion": 6
   },
@@ -19,7 +22,6 @@
     "dot-location": ["error", "property"],
     "dot-notation": ["error", { "allowKeywords": true }],
     "func-call-spacing": ["error", "never"],
-    "func-style": ["error", "expression"],
     "function-call-argument-newline": ["error", "consistent"],
     "function-paren-newline": ["error", "consistent"],
     "implicit-arrow-linebreak": ["error", "beside"],
@@ -37,6 +39,7 @@
     "no-useless-rename": "error",
     "no-whitespace-before-property": "error",
     "node/no-exports-assign": "error",
+    "max-len": ["error", { "code": 150 }],
     "rest-spread-spacing": ["error", "never"],
     "semi-spacing": ["error", { "before": false, "after": true }],
     "semi-style": ["error", "last"],

src/lib/cht-api.ts

@@ -156,9 +156,18 @@ export class ChtApi {
   };
 
   getParentAndSibling = async (parentId: string, contactType: ContactType): Promise<{ parent: any; sibling: any }> => {
-    const url = `${this.protocolAndHost}/medic/_design/medic/_view/contacts_by_depth?keys=[[%22${parentId}%22,0],[%22${parentId}%22,1]]&include_docs=true`;
+    const url = `${this.protocolAndHost}/medic/_design/medic/_view/contacts_by_depth`;
     console.log('axios.get', url);
-    const resp = await axios.get(url, this.authorizationOptions());
+    const resp = await axios.get(url, {
+      ...this.authorizationOptions(),
+      params: {
+        keys: JSON.stringify([
+          [parentId, 0],
+          [parentId, 1]
+        ]),
+        include_docs: true,
+      },
+    });
     const docs = resp.data?.rows?.map((row: any) => row.doc) || [];
     const parentType = Config.getParentProperty(contactType).contact_type;
     const parent = docs.find((d: any) => d.contact_type === parentType);

src/lib/move.ts

@@ -1,5 +1,3 @@
-import _ from 'lodash';
-
 import { ContactType } from '../config';
 import SessionCache from '../services/session-cache';
 import { ChtApi } from '../lib/cht-api';

src/lib/remote-place-resolver.ts

@@ -179,7 +179,13 @@ function pickFromMapOptimistic(map: RemotePlaceMap, placeName: string, fuzzFunct
   return optimisticResult || result || fuzzyResult;
 }
 
-function findLocalPlaces(name: string, type: string, sessionCache: SessionCache, options: PlaceResolverOptions | undefined, fuzzFunction: (key: string) => string): RemotePlace | undefined {
+function findLocalPlaces(
+  name: string,
+  type: string,
+  sessionCache: SessionCache,
+  options: PlaceResolverOptions | undefined,
+  fuzzFunction: (key: string) => string
+): RemotePlace | undefined {
   let places = sessionCache.getPlaces({ type, nameExact: name });
 
   if (options?.fuzz && !places.length) {

src/lib/search.ts

@@ -7,8 +7,14 @@ import { Config, ContactType, HierarchyConstraint } from '../config';
 import Place from '../services/place';
 
 export default class SearchLib {
-  public static search = async (contactType: ContactType, formData: any, dataPrefix: string, hierarchyLevel: HierarchyConstraint, chtApi: ChtApi, sessionCache: SessionCache | undefined)
-    : Promise<RemotePlace[]> => {
+  public static search = async (
+    contactType: ContactType,
+    formData: any,
+    dataPrefix: string,
+    hierarchyLevel: HierarchyConstraint,
+    chtApi: ChtApi,
+    sessionCache: SessionCache | undefined
+  ) : Promise<RemotePlace[]> => {
     const searchString: string = formData[`${dataPrefix}${hierarchyLevel?.property_name}`]?.toLowerCase();
 
     const localResults: Place[] = sessionCache ? await getLocalResults(hierarchyLevel, sessionCache, searchString) : [];
@@ -29,7 +35,7 @@ export default class SearchLib {
 
 async function getLocalResults(hierarchyLevel: HierarchyConstraint, sessionCache: SessionCache, searchString: string)
   : Promise<Place[]> {
-  if (hierarchyLevel.level == 0) {
+  if (hierarchyLevel.level === 0) {
     return [];
   }
 
@@ -42,8 +48,14 @@ async function getLocalResults(hierarchyLevel: HierarchyConstraint, sessionCache
   return _.sortBy(result, 'name');
 }
 
-async function getRemoteResults(searchString: string, hierarchyLevel: HierarchyConstraint, contactType: ContactType, formData: any, chtApi: ChtApi, dataPrefix: string)
-  : Promise<RemotePlace[]> {
+async function getRemoteResults(
+  searchString: string,
+  hierarchyLevel: HierarchyConstraint,
+  contactType: ContactType,
+  formData: any,
+  chtApi: ChtApi,
+  dataPrefix: string
+) : Promise<RemotePlace[]> {
   const topDownHierarchy = Config.getHierarchyWithReplacement(contactType, 'desc');
   const allResults = await RemotePlaceCache.getPlacesWithType(chtApi, hierarchyLevel.contact_type);
   let remoteResults = allResults.filter(place => place.name.includes(searchString));

src/lib/validation.ts

@@ -1,5 +1,3 @@
-import _ from 'lodash';
-
 import { Config, ContactProperty } from '../config';
 
 import ValidatorString from './validator-string';
@@ -100,7 +98,12 @@ export class Validation {
     return result;
   }
 
-  private static validateProperties(obj : any, properties : ContactProperty[], requiredProperties: ContactProperty[], prefix: string) : ValidationError[] {
+  private static validateProperties(
+    obj : any,
+    properties : ContactProperty[],
+    requiredProperties: ContactProperty[],
+    prefix: string
+  ) : ValidationError[] {
     const invalid: ValidationError[] = [];
 
     for (const property of properties) {
@@ -150,7 +153,12 @@ export class Validation {
     return validator;
   }
 
-  private static describeInvalidRemotePlace(remotePlace: RemotePlace | undefined, friendlyType: string, searchStr?: string, requiredParent?: string): string {
+  private static describeInvalidRemotePlace(
+    remotePlace: RemotePlace | undefined,
+    friendlyType: string,
+    searchStr?: string,
+    requiredParent?: string
+  ): string {
     if (!searchStr) {
       return `Cannot find ${friendlyType} because the search string is empty`;
     }

src/lib/validator-skip.ts

@@ -1,7 +1,7 @@
 import { IValidator } from './validation';
 
 export default class ValidatorSkip implements IValidator {
-  isValid(input: string) : boolean | string {
+  isValid() : boolean | string {
     return true;
   }
 

src/routes/add-place.ts

@@ -4,7 +4,6 @@ import { Config } from '../config';
 import { ChtApi } from '../lib/cht-api';
 import PlaceFactory from '../services/place-factory';
 import SessionCache from '../services/session-cache';
-import { PlaceUploadState } from '../services/place';
 import RemotePlaceResolver from '../lib/remote-place-resolver';
 import { UploadManager } from '../services/upload-manager';
 import RemotePlaceCache from '../lib/remote-place-cache';
@@ -109,7 +108,7 @@ export default async function addPlace(fastify: FastifyInstance) {
     resp.header('HX-Redirect', `/`);
   });
 
-  fastify.post('/place/refresh/:id', async (req, resp) => {
+  fastify.post('/place/refresh/:id', async (req) => {
     const { id } = req.params as any;
     const sessionCache: SessionCache = req.sessionCache;
     const place = sessionCache.getPlace(id);
@@ -122,10 +121,10 @@ export default async function addPlace(fastify: FastifyInstance) {
     await RemotePlaceResolver.resolveOne(place, sessionCache, chtApi, { fuzz: true });
     place.validate();
 
-    fastify.uploadManager.refresh(req.sessionCache, PlaceUploadState.PENDING);
+    fastify.uploadManager.refresh(req.sessionCache);
   });
 
-  fastify.post('/place/upload/:id', async (req, resp) => {
+  fastify.post('/place/upload/:id', async (req) => {
     const { id } = req.params as any;
     const sessionCache: SessionCache = req.sessionCache;
     const place = sessionCache.getPlace(id);
@@ -136,13 +135,13 @@ export default async function addPlace(fastify: FastifyInstance) {
     const chtApi = new ChtApi(req.chtSession);
     const uploadManager: UploadManager = fastify.uploadManager;
     await uploadManager.doUpload([place], chtApi);
-    fastify.uploadManager.refresh(req.sessionCache, PlaceUploadState.PENDING);
+    fastify.uploadManager.refresh(req.sessionCache);
   });
 
-  fastify.post('/place/remove/:id', async (req, resp) => {
+  fastify.post('/place/remove/:id', async (req) => {
     const { id } = req.params as any;
     const sessionCache: SessionCache = req.sessionCache;
     sessionCache.removePlace(id);
-    fastify.uploadManager.refresh(req.sessionCache, PlaceUploadState.PENDING);
+    fastify.uploadManager.refresh(req.sessionCache);
   });
 }

src/routes/app.ts

@@ -44,13 +44,13 @@ export default async function sessionCache(fastify: FastifyInstance) {
     return resp.view('src/public/app/view.html', tmplData);
   });
 
-  fastify.post('/app/remove-all', async (req, resp) => {
+  fastify.post('/app/remove-all', async (req) => {
     const sessionCache: SessionCache = req.sessionCache;
     sessionCache.removeAll();
-    fastify.uploadManager.refresh(req.sessionCache, PlaceUploadState.PENDING);
+    fastify.uploadManager.refresh(req.sessionCache);
   });
 
-  fastify.post('/app/refresh-all', async (req, resp) => {
+  fastify.post('/app/refresh-all', async (req) => {
     const sessionCache: SessionCache = req.sessionCache;
     const chtApi = new ChtApi(req.chtSession);
 

src/routes/authentication.ts

@@ -33,9 +33,6 @@ export default async function authentication(fastify: FastifyInstance) {
     let session;
     try {
       session = await ChtApi.createSession(authInfo, username, password);
-      if (!session.sessionToken) {
-        throw 'login fail'; ``; 
-      }
     } catch (e: any) {
       return resp.view('src/public/auth/authentication_form.html', {
         domains: Config.getDomains,

src/routes/files.ts

@@ -6,7 +6,7 @@ import SessionCache from '../services/session-cache';
 import Place from '../services/place';
 
 export default async function files(fastify: FastifyInstance) {
-  fastify.get('/files/template/:placeType', async (req, resp) => {
+  fastify.get('/files/template/:placeType', async (req) => {
     const params: any = req.params;
     const placeType = params.placeType;
     const placeTypeConfig = Config.getContactType(placeType);
@@ -20,7 +20,7 @@ export default async function files(fastify: FastifyInstance) {
     return stringify([columns]);
   });
 
-  fastify.get('/files/credentials', async (req, resp) => {
+  fastify.get('/files/credentials', async (req) => {
     const sessionCache: SessionCache = req.sessionCache;
     const places = sessionCache.getPlaces();
     const refinedRecords = transform(places, (place: Place) => {

src/routes/search.ts

@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import { FastifyInstance } from 'fastify';
 
 import { Config } from '../config';
@@ -16,9 +15,9 @@ export default async function place(fastify: FastifyInstance) {
       op,
       place_id: placeId,
       type,
-      level,
       prefix: dataPrefix
     } = queryParams;
+    const level = parseInt(queryParams.level);
 
     const data: any = req.body;
 
@@ -30,7 +29,7 @@ export default async function place(fastify: FastifyInstance) {
     }
 
     const chtApi = new ChtApi(req.chtSession);
-    const hierarchyLevel = Config.getHierarchyWithReplacement(contactType).find(hierarchy => hierarchy.level == level);
+    const hierarchyLevel = Config.getHierarchyWithReplacement(contactType).find(hierarchy => hierarchy.level === level);
     if (!hierarchyLevel) {
       throw Error(`not hierarchy constraint at ${level}`);
     }
@@ -48,14 +47,14 @@ export default async function place(fastify: FastifyInstance) {
   // when we select a place from search results
   fastify.post('/search/select', async (req, resp) => {
     const data: any = req.body;
-    const params: any = req.query;
+    const queryParams: any = req.query;
     const {
       op = 'new',
       place_id: placeId,
       result_name: resultName,
-      level,
       prefix: dataPrefix,
-    } = params;
+    } = queryParams;
+    const level = parseInt(queryParams.level);
 
     const sessionCache: SessionCache = req.sessionCache;
     const place = sessionCache.getPlace(placeId);
@@ -65,7 +64,7 @@ export default async function place(fastify: FastifyInstance) {
 
     const contactType = Config.getContactType(data.place_type);
     const moveModel = moveViewModel(contactType);
-    const hierarchyLevel =  Config.getHierarchyWithReplacement(contactType).find(hierarchy => hierarchy.level == level);
+    const hierarchyLevel =  Config.getHierarchyWithReplacement(contactType).find(hierarchy => hierarchy.level === level);
     if (!hierarchyLevel) {
       throw Error(`not hierarchy constraint at ${level}`);
     }

src/services/place-factory.ts

@@ -1,5 +1,3 @@
-import _ from 'lodash';
-import { once } from 'events';
 import { parse } from 'csv';
 
 import { ChtApi } from '../lib/cht-api';

src/services/session-cache.ts

@@ -1,5 +1,3 @@
-import _ from 'lodash';
-
 import Place, { PlaceUploadState } from './place';
 import { ChtSession } from '../lib/cht-api';
 

src/services/upload.new.ts

@@ -9,7 +9,7 @@ export class UploadNewPlace implements Uploader {
     this.chtApi = chtApi;
   }
 
-  handleContact = async function (payload: PlacePayload): Promise<string | undefined> {
+  handleContact = async function (): Promise<string | undefined> {
     return;
   };
 

src/types/fastify/index.d.ts

@@ -1,6 +1,6 @@
-import { FastifyInstance } from 'fastify';
 import { ChtSession } from '../../lib/cht-api';
 import SessionCache from '../../services/session-cache';
+import { UploadManager } from '../../services/upload-manager';
 
 declare module 'fastify' {
   interface FastifyInstance {

test/lib/search.spec.ts

@@ -1,10 +1,10 @@
 import { expect } from 'chai';
 import sinon from 'sinon';
 
-import { ChtApi, RemotePlace } from '../../src/lib/cht-api';
+import { RemotePlace } from '../../src/lib/cht-api';
 import RemotePlaceCache from '../../src/lib/remote-place-cache';
 import SearchLib from '../../src/lib/search';
-import { mockPlace, mockSimpleContactType, mockValidContactType } from '../mocks';
+import { mockValidContactType } from '../mocks';
 import SessionCache from '../../src/services/session-cache';
 import { Config } from '../../src/config';
 

test/lib/validation.spec.ts

@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 
 import { Validation } from '../../src/lib/validation';
-import { mockSimpleContactType, mockPlace, expectInvalidProperties } from '../mocks';
+import { mockSimpleContactType, mockPlace } from '../mocks';
 
 type Scenario = {
   type: string;

test/mocks.ts

@@ -34,7 +34,11 @@ export const mockChtApi: ChtApi = (first: RemotePlace[] = [], second: RemotePlac
   getPlacesWithType: Sinon.stub().resolves(first).onSecondCall().resolves(second),
 });
 
-export const mockSimpleContactType = (propertyType = 'string', propertyValidator: string | string[] | undefined, errorDescription?: string) : ContactType => {
+export const mockSimpleContactType = (
+  propertyType,
+  propertyValidator: string | string[] | undefined,
+  errorDescription?: string
+) : ContactType => {
   const mockedProperty = mockProperty(propertyType, propertyValidator);
   mockedProperty.errorDescription = errorDescription;
   return {
@@ -59,7 +63,7 @@ export const mockSimpleContactType = (propertyType = 'string', propertyValidator
   };
 };
 
-export const mockValidContactType = (propertyType = 'string', propertyValidator: string | string[] | undefined) : ContactType => ({
+export const mockValidContactType = (propertyType, propertyValidator: string | string[] | undefined) : ContactType => ({
   name: 'contacttype-name',
   friendly: 'friendly',
   contact_type: 'contact-type',
@@ -94,7 +98,7 @@ export const mockParentPlace = (parentPlaceType: ContactType, parentName: string
   return place;
 };
 
-export const mockProperty = (type = 'string', parameter: string | string[] | undefined, property_name: string = 'prop'): ContactProperty => ({
+export const mockProperty = (type, parameter: string | string[] | undefined, property_name: string = 'prop'): ContactProperty => ({
   friendly_name: 'csv',
   property_name,
   type,
@@ -112,7 +116,11 @@ export const mockChtSession = () : ChtSession => ({
   username: 'username',
 });
 
-export function expectInvalidProperties(validationErrors: { [key: string]: string } | undefined, expectedProperties: string[], expectedError?: string): void {
+export function expectInvalidProperties(
+  validationErrors: { [key: string]: string } | undefined,
+  expectedProperties: string[],
+  expectedError?: string
+): void {
   expect(Object.keys(validationErrors as any)).to.deep.eq(expectedProperties);
 
   if (expectedError) {