@veritree/services 0.11.0 → 0.11.1

package/package.json

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

package/src/services/form-submissions.js

@@ -1,19 +1,19 @@
 import Api from '../helpers/api';
+import { getSession } from "../helpers/session";
 
-export const createFormSubmissionsApiService = (orgId, orgType) => {
-  if (!orgId) throw new Error('orgId and orgType are required');
+export const createFormSubmissionsApiService = () => {
   const resource = 'form-submissions';
+  const { orgId, orgType } = getSession();
+
+  if (!orgId && !orgType) {
+    throw new Error('Organization id and type are required');
+  }
 
   const get = {
     async all(page = 1, pageSize = 10) {
       const url = `${_getUrl()}?${_getParams(page, pageSize)}`;
       return await Api.get(url);
     },
-
-    // async specific(formId) {
-    //   const url = `${_getUrl()}/${orgId}/forms/${formId}?${_getParams()}`;
-    //   return await Api.get(url);
-    // },
   };
 
   const _getUrl = () => {

package/src/services/regions.js

@@ -1,17 +1,32 @@
-import Api from '../helpers/api';
+import Api from "../helpers/api";
 import { getSession } from "../helpers/session";
 
 export const createRegionsApiService = () => {
-  const resource = 'regions';
+  const resource = "regions";
   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(page = 1, pageSize = 10) {
-      const url = `${_getUrl()}?${_getParams(page, pageSize)}`;
+    /**
+     * 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)}`;
       return await Api.get(url);
     },
   };
@@ -20,11 +35,15 @@ export const createRegionsApiService = () => {
     return `${Api.baseUrl}/${resource}`;
   };
 
-  const _getParams = (page, pageSize) => {
-    const paramPage = page ? `&page=${page}` : '';
-    const paramPageSize = pageSize ? `&page_size=${pageSize}` : '';
+  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}`;
 
-    return `org_id=${orgId}&org_type=${orgType}${paramPage}${paramPageSize}`;
+    return `org_id=${orgId}&org_type=${orgType}${params}`;
   };
 
   return {

package/src/services/subsites.js

@@ -13,11 +13,19 @@ export const createSubsitesApiService = () => {
     /**
      * Gets all subsites of an organization
      *
-     * @param {number/string} page
-     * @returns {object} envelope
+     * @param {obj} pagination { page, pageSize }
+     * @param {obj} filters { countryId, regionId }
+     * @returns {obj} envelope
      */
-    async all(page = 1, pageSize = 10) {
-      const url = `${_getUrl()}?${_getUrlParams(page, pageSize)}`;
+    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)}`;
+
       return await Api.get(url);
     },
 
@@ -30,6 +38,7 @@ export const createSubsitesApiService = () => {
      */
     async specific(id, page = 1, pageSize = 10) {
       const url = `${_getUrl()}/${id}?${_getUrlParams(page, pageSize)}`;
+
       return await Api.get(url);
     },
   };
@@ -38,8 +47,14 @@ export const createSubsitesApiService = () => {
     return `${Api.baseUrl}/${resource}`;
   };
 
-  const _getUrlParams = (page, pageSize) => {
-    return `org_id=${orgId}&org_type=${orgType}&page=${page}&page_size=${pageSize}`;
+  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}`;
+
+    return `org_id=${orgId}&org_type=${orgType}${params}`;
   };
 
   return {

package/utils/args.js

@@ -0,0 +1,33 @@
+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);