@veritree/services 0.12.0 → 0.13.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@veritree/services",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "description": "A collection of javascript functions/services to talk to veritree API",
   "type": "module",
   "main": "index.js",

package/src/services/field-updates.js

@@ -1,5 +1,6 @@
 import Api from "../helpers/api";
 import { getSession } from "../helpers/session";
+import { createParamsStringFromArgs } from "../utils/args";
 
 export const createFieldUpdatesApiService = () => {
   const resource = `field-updates`;
@@ -10,16 +11,8 @@ export const createFieldUpdatesApiService = () => {
   }
 
   const get = {
-    async all(countryId, regionId, subsiteId, page = 1, orderBy = 'date_planted-desc', pageSize = 10) {
-      const params = `${_getParams(
-        countryId,
-        regionId,
-        subsiteId,
-        page,
-        orderBy,
-        pageSize
-      )}`;
-      const url = `${_getUrl()}?${params}`;
+    async all() {
+      const url = `${_getUrl()}?${_getParams(arguments)}`;
 
       return await Api.get(url);
     },
@@ -69,16 +62,10 @@ export const createFieldUpdatesApiService = () => {
     return `${Api.baseUrl}/${resource}`;
   };
 
-  const _getParams = (countryId, regionId, subsiteId, page, orderBy, pageSize) => {
-    const countryIdParam = countryId ? `&country_id=${countryId}` : "";
-    const regionIdParam = regionId ? `&region_id=${regionId}` : "";
-    const subsiteIdParam = subsiteId ? `&subsite_id=${subsiteId}` : "";
-    const pageParam = page ? `&page=${page}` : "";
-    const orderByParam = orderBy ? `&orderBy=${orderBy}` : "";
-    const pageSizeParam = pageSize ? `&page_size=${pageSize}` : "";
-    const params = `${countryIdParam}${regionIdParam}${subsiteIdParam}${pageParam}${pageSizeParam}${orderByParam}`;
+  const _getParams = (args) => {
+    const paramsString = createParamsStringFromArgs(args);
 
-    return `org_id=${orgId}&org_type=${orgType}${params}`;
+    return `org_id=${orgId}&org_type=${orgType}${paramsString}`;
   };
 
   return {

package/src/services/forest-types.js

@@ -1,4 +1,5 @@
 import Api from '../helpers/api';
+import { createParamsStringFromArgs } from '../utils/args';
 import { getSession } from "../helpers/session";
 
 export const createForestTypesApiService = () => {
@@ -11,10 +12,12 @@ export const createForestTypesApiService = () => {
 
   const get = {
     /**
+     * @param {object} arguments
      * @returns {object} envelope
      */
-     async all(page = 1, pageSize = 10) {
-      const url = `${_getUrl()}?${_getParams(page, pageSize)}`;
+     async all() {
+      const url = `${_getUrl()}?${_getParams(arguments)}`;
+
       return await Api.get(url);
     },
 
@@ -23,7 +26,8 @@ export const createForestTypesApiService = () => {
      * @returns {object} envelope
      */
     async specific(id) {
-      const url = `${_getUrl()}/${id}?${_getParams(page, pageSize)}`;
+      const url = `${_getUrl()}/${id}?${_getParams()}`;
+
       return await Api.get(url);
     },
   };
@@ -32,12 +36,10 @@ export const createForestTypesApiService = () => {
     return `${Api.baseUrl}/${resource}`;
   };
 
-  const _getParams = (page, pageSize) => {
-    const pageParam = page ? `&page=${page}` : '';
-    const pageSizeParam = pageSize ? `&page_size=${pageSize}` : '';
-    const params = `${pageParam}${pageSizeParam}`;
+  const _getParams = (args) => {
+    const paramsString = createParamsStringFromArgs(args);
 
-    return `org_id=${orgId}&org_type=${orgType}${params}`;
+    return `org_id=${orgId}&org_type=${orgType}${paramsString}`;
   };
 
   return {

package/src/services/form-submissions.js

@@ -1,5 +1,6 @@
 import Api from '../helpers/api';
 import { getSession } from "../helpers/session";
+import { createParamsStringFromArgs } from '../utils/args';
 
 export const createFormSubmissionsApiService = () => {
   const resource = 'form-submissions';
@@ -10,8 +11,8 @@ export const createFormSubmissionsApiService = () => {
   }
 
   const get = {
-    async all(page = 1, pageSize = 10) {
-      const url = `${_getUrl()}?${_getParams(page, pageSize)}`;
+    async all() {
+      const url = `${_getUrl()}?${_getParams(arguments)}`;
       return await Api.get(url);
     },
   };
@@ -20,12 +21,10 @@ export const createFormSubmissionsApiService = () => {
     return `${Api.baseUrl}/${resource}`;
   };
 
-  const _getParams = (page, pageSize) => {
-    const pageParam = page ? `&page=${page}` : '';
-    const pageSizeParam = pageSize ? `&page_size=${pageSize}` : '';
-    const params = `${pageParam}${pageSizeParam}`;
+  const _getParams = (args) => {
+    const paramsString = createParamsStringFromArgs(args);
 
-    return `org_id=${orgId}&org_type=${orgType}${params}`;
+    return `org_id=${orgId}&org_type=${orgType}${paramsString}`;
   };
 
   return {

package/src/services/images.js

@@ -1,31 +1,18 @@
 import Api from "../helpers/api";
 import { getSession } from "../helpers/session";
+import { createParamsStringFromArgs } from "../utils/args";
 
 export const createImagesApiService = () => {
   const resource = "images";
   const { orgId, orgType } = getSession();
 
   if (!orgId && !orgType) {
-    throw new Error('Organization id and type are required');
+    throw new Error("Organization id and type are required");
   }
 
   const get = {
-    async all(
-      purpose,
-      countryId,
-      regionId,
-      subsiteId,
-      page = 1,
-      pageSize = 10
-    ) {
-      const url = `${_getUrl()}?${_getParams(
-        purpose,
-        countryId,
-        regionId,
-        subsiteId,
-        page,
-        pageSize
-      )}`;
+    async all() {
+      const url = `${_getUrl()}?${_getParams(arguments)}`;
       return await Api.get(url);
     },
 
@@ -33,31 +20,17 @@ export const createImagesApiService = () => {
       const url = `${_getUrl()}/${id}?${_getParams()}`;
 
       return await Api.get(url);
-    }
+    },
   };
 
   const _getUrl = () => {
     return `${Api.baseUrl}/${resource}`;
   };
 
-  const _getParams = (
-    purpose,
-    countryId,
-    regionId,
-    subsiteId,
-    page,
-    pageSize
-  ) => {
-    const paramPageSize = pageSize ? `&page_size=${pageSize}` : "";
-    const paramPurpose = purpose ? `&purpose=${purpose}` : "";
-    const paramCountryId = countryId ? `&country_id=${countryId}` : "";
-    const paramRegionId = regionId ? `&region_id=${regionId}` : "";
-    const paramSubsiteId = subsiteId ? `&subsite_id=${subsiteId}` : "";
-    const paramPage = page ? `&page=${page}` : "";
-
-    const params = `${paramPurpose}${paramPageSize}${paramCountryId}${paramRegionId}${paramSubsiteId}${paramPage}`;
+  const _getParams = (args) => {
+    const paramsString = createParamsStringFromArgs(args);
 
-    return `org_id=${orgId}&org_type=${orgType}${params}`;
+    return `org_id=${orgId}&org_type=${orgType}${paramsString}`;
   };
 
   return {

package/src/services/regions.js

@@ -1,5 +1,6 @@
 import Api from "../helpers/api";
 import { getSession } from "../helpers/session";
+import { createParamsStringFromArgs } from "../utils/args";
 
 export const createRegionsApiService = () => {
   const resource = "regions";
@@ -10,43 +11,31 @@ export const createRegionsApiService = () => {
   }
 
   const get = {
-    /**
-     * Gets all regions of an organization
-     *
-     * @param {obj} pagination { page, pageSize }
-     * @param {obj} filters { countryId, regionId }
-     * @returns {obj} envelope
-     */
-     async all(
-      pagination = { page: 1, pageSize: 10}, 
-      filters = { countryId: null },
-      advancedQuery = { includes: [], excludes: [] },
-    ) {
-      let { page, pageSize } = pagination;
-      const { countryId } = filters;
-      const { includes, excludes } = advancedQuery;
-
-      const url = `${_getUrl()}?${_getParams(countryId, page, pageSize, includes, excludes)}`;
+    async all() {
+      const url = `${_getUrl()}?${_getParams(arguments)}`;
+
       return await Api.get(url);
     },
   };
 
+  const post = (data) => {
+    const url = `${_getUrl()}?${_getParams()}`;
+
+    return Api.post(url, data);
+  };
+
   const _getUrl = () => {
     return `${Api.baseUrl}/${resource}`;
   };
 
-  const _getParams = (countryId, page, pageSize, includes, excludes) => {
-    const countryIdParam = countryId ? `&country_id=${countryId}` : "";
-    const pageParam = page ? `&page=${page}` : "";
-    const pageSizeParam = pageSize ? `&page_size=${pageSize}` : "";
-    const includeParams = includes ? includes.map(item => `&include[]=${item}`).join('') : "";
-    const excludeParams = excludes ? excludes.map(item => `&exclude=${item}`).join('') : "";
-    const params = `${countryIdParam}${pageParam}${pageSizeParam}${includeParams}${excludeParams}`;
+  const _getParams = (args) => {
+    const paramsString = createParamsStringFromArgs(args)
 
-    return `org_id=${orgId}&org_type=${orgType}${params}`;
+    return `org_id=${orgId}&org_type=${orgType}${paramsString}`;
   };
 
   return {
     get,
+    post,
   };
 };

package/src/services/subsites.js

@@ -1,30 +1,21 @@
-import Api from '../helpers/api';
+import Api from "../helpers/api";
 import { getSession } from "../helpers/session";
+import { createParamsStringFromArgs } from "../utils/args";
 
 export const createSubsitesApiService = () => {
-  const resource = 'subsites';
+  const resource = "subsites";
   const { orgId, orgType } = getSession();
 
   if (!orgId && !orgType) {
-    throw new Error('Organization id and type are required');
+    throw new Error("Organization id and type are required");
   }
 
   const get = {
     /**
-     * Gets all subsites of an organization
-     *
-     * @param {obj} pagination { page, pageSize }
-     * @param {obj} filters { countryId, regionId }
      * @returns {obj} envelope
      */
-    async all(
-      pagination = { page: 1, pageSize: 10}, 
-      filters = { countryId: null, regionId: null }
-    ) {
-      let { page, pageSize } = pagination;
-      const { countryId, regionId } = filters;
-
-      const url = `${_getUrl()}?${_getUrlParams(countryId, regionId, page, pageSize)}`;
+    async all() {
+      const url = `${_getUrl()}?${_getUrlParams(arguments)}`;
 
       return await Api.get(url);
     },
@@ -36,8 +27,8 @@ export const createSubsitesApiService = () => {
      * @param {number/string} page
      * @returns {object} envelope
      */
-    async specific(id, page = 1, pageSize = 10) {
-      const url = `${_getUrl()}/${id}?${_getUrlParams(page, pageSize)}`;
+    async specific(id) {
+      const url = `${_getUrl()}/${id}?${_getUrlParams()}`;
 
       return await Api.get(url);
     },
@@ -47,14 +38,10 @@ export const createSubsitesApiService = () => {
     return `${Api.baseUrl}/${resource}`;
   };
 
-  const _getUrlParams = (countryId, regionId, page, pageSize) => {
-    const countryIdParam = countryId ? `&country_id=${countryId}` : "";
-    const regionIdParam = regionId ? `&region_id=${regionId}` : "";
-    const pageParam = page ? `&page=${page}` : "";
-    const pageSizeParam = pageSize ? `&page_size=${pageSize}` : "";
-    const params = `${countryIdParam}${regionIdParam}${pageParam}${pageSizeParam}`;
+  const _getUrlParams = () => {
+    const paramsString = createParamsStringFromArgs(arguments);
 
-    return `org_id=${orgId}&org_type=${orgType}${params}`;
+    return `org_id=${orgId}&org_type=${orgType}${paramsString}`;
   };
 
   return {

package/src/utils/args.js

@@ -0,0 +1,32 @@
+export const createParamsStringFromArgs = (args) => {
+  if(!args) return '';
+
+  const paramsString = [];
+  let arr = [];
+
+  for(const arg of args) {
+    if(typeof arg === 'object') {
+      for(const key in arg) {
+        if(arg[key] === null) return;
+
+        if(Array.isArray(arg[key])) {
+          arr = arg[key].map((item, index) => {
+            const param = `${key}[]=${item}`;
+
+            return index === 0 ? `${param}` : `&${param}`;
+          }).join('');
+
+          paramsString.push(arr);
+        } else {
+          if(arg[key] !== undefined) {
+            paramsString.push(`${key}=${arg[key]}`);
+          }
+        }
+      }
+    }
+  }
+
+  if(!paramsString.length) return '';
+
+  return `&${paramsString.join('&')}`;
+}

package/utils/args.js

@@ -1,33 +0,0 @@
-function getArgs() {
-  const argsString = [];
-  let arr = [];
-
-  for(arg of arguments) {
-    if(typeof arg === 'object') {
-      for(key in arg) {
-        if(arg[key] === null) return;
-
-        if(Array.isArray(arg[key])) {
-          arr = arg[key].map((item, index) => {
-            const param = `${key}[]=${item}`;
-
-            return index === 0 ? `${param}` : `&${param}`;
-          }).join('');
-
-          argsString.push(arr);
-        } else {
-          argsString.push(`${key}=${arg[key]}`);
-        }
-      }
-    }
-  }
-
-  console.log(argsString.join('&'));
-}
-
-const pagination = { page: 1, pageSize: 3}
-const filter = { countryId: 4, regionId: 5}
-const sort = { orderBy: 'date_planted-desc'}
-const advancedQuery = { include: ['a', 'b'], exclude: ['country']}
-
-getArgs(pagination, filter, sort, advancedQuery);