@veritree/services 0.6.1 → 0.9.1

package/package.json

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

package/src/helpers/api.js

@@ -1,4 +1,4 @@
-import { getCookie } from './cookies';
+import { getCookie } from "./cookies";
 
 const Api = {
   baseUrl: `${process.env.API_VERITREE_URL}/api`,
@@ -9,11 +9,11 @@ const Api = {
   },
 
   async post(url, data) {
-    return await this.unWrap(url, 'post', data);
+    return await this.unWrap(url, "post", data);
   },
 
   async update(url, data) {
-    return await this.unWrap(url, 'put', data);
+    return await this.unWrap(url, "put", data);
   },
 
   /**
@@ -24,8 +24,8 @@ const Api = {
    * @param {object} data
    * @returns {object} envelope
    */
-  async unWrap(url, method = 'get', data) {
-    if (this.forceEnvelopeResponse) url = this.addEvenlopeArgToUrl(url); // TODO: remove when API is fully migrated to envelopes
+  async unWrap(url, method = "get", data) {
+    if (this.forceEnvelopeResponse) url = this.handleEnvelopParam(url, data); // TODO: remove when API is fully migrated to envelopes
     const config = this.getConfig(method, data);
 
     try {
@@ -46,15 +46,24 @@ const Api = {
    * @returns {object} data
    */
   getConfig(method, data) {
+    const isGet = method === "get";
+    const isFormData = this._isFormData(data);
+    const accessToken = `Bearer ${getCookie('access_token')}`;
+
     const config = {
       method,
       headers: {
-        'Content-Type': 'application/json',
-        Authorization: `Bearer ${getCookie('access_token')}`,
+        Authorization: accessToken,
       },
     };
 
-    if (method !== 'get') config.body = JSON.stringify(data);
+    if(!isFormData) {
+      config.headers['Content-Type'] = 'application/json';
+    }
+
+    if (!isGet) {
+      isFormData ? (config.body = data) : (config.body = JSON.stringify(data));
+    }
 
     return config;
   },
@@ -65,13 +74,18 @@ const Api = {
    * @param {string} url
    * @returns {string} url
    */
-  addEvenlopeArgToUrl(url) {
-    if (!url || url.includes('_result=1')) return;
-    const urlHasArgs = url.includes('?');
-    const urlEvenlopeArg = urlHasArgs ? '&_result=1' : '?_result=1';
+  handleEnvelopParam(url) {
+    if (!url || url.includes("_result=1")) return url;
+
+    const urlHasArgs = url.includes("?");
+    const urlEvenlopeArg = urlHasArgs ? "&_result=1" : "?_result=1";
 
     return `${url}${urlEvenlopeArg}`;
   },
+
+  _isFormData(data) {
+    return data instanceof FormData;
+  },
 };
 
 export default Api;

package/src/helpers/session.js

@@ -0,0 +1,7 @@
+export const getSessionOrgId = () => {
+  return getSession().orgId;
+};
+
+export const getSession = () => {
+  return JSON.parse(localStorage.getItem('session'));
+};

package/src/services/field-updates.js

@@ -1,15 +1,18 @@
-import Api from '../helpers/api';
+import Api from "../helpers/api";
+import { getSession } from "../helpers/session";
 
-export const createFieldUpdatesApiService = (orgId, orgType) => {
+export const createFieldUpdatesApiService = () => {
   const resource = `field-updates`;
+  const { orgId, orgType } = getSession();
 
   const get = {
-    async all(countryId, regionId, subsiteId, page = 1, pageSize = 10) {
+    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}`;
@@ -18,22 +21,36 @@ export const createFieldUpdatesApiService = (orgId, orgType) => {
     },
   };
 
+  /**
+   *
+   * @param {string} fieldUpdateId
+   * @param {object} data
+   * @returns
+   */
+  const update = (fieldUpdateId, data) => {
+    const url = `${_getUrl()}/${fieldUpdateId}?${_getParams()}`;
+
+    return Api.post(url, data);
+  };
+
   const _getUrl = () => {
     return `${Api.baseUrl}/${resource}`;
   };
 
-  const _getParams = (countryId, regionId, subsiteId, page, 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 pageSizeParam = pageSize ? `&page_size=${pageSize}` : '';
-    const params = `${countryIdParam}${regionIdParam}${subsiteIdParam}${pageParam}${pageSizeParam}`;
+  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}`;
 
     return `org_id=${orgId}&org_type=${orgType}${params}`;
   };
 
   return {
     get,
+    update,
   };
 };

package/src/services/forest-types.js

@@ -1,38 +1,38 @@
 import Api from '../helpers/api';
 
-// TODO: Add all possible parameters as in API
-export const createForestTypesApiService = () => {
+export const createForestTypesApiService = (orgId, orgType) => {
+  if (!orgId || !orgType) throw new Error('orgId and orgType are required');
+  const resource = 'forest-types';
+
   const get = {
     /**
-     * Gets all forest types of an organization
-     *
-     * @param {boolean} isPublic
      * @returns {object} envelope
      */
-    async all(isPublic = false) {
-      const url = `${_getUrl(isPublic)}`;
+     async all(page = 1, pageSize = 10) {
+      const url = `${_getUrl()}?${_getParams(page, pageSize)}`;
       return await Api.get(url);
     },
 
     /**
-     * Gets a speficific forest type of an organization
-     *
      * @param {number/string} id
-     * @param {boolean} isPublic
      * @returns {object} envelope
      */
-    async specific(id, isPublic = false) {
-      const url = `${_getUrl(isPublic)}/${id}`;
+    async specific(id) {
+      const url = `${_getUrl()}/${id}?${_getParams(page, pageSize)}`;
       return await Api.get(url);
     },
   };
 
-  const _getResource = (isPublic) => {
-    return isPublic ? 'forest-type-profiles' : `forest-types`;
+  const _getUrl = () => {
+    return `${Api.baseUrl}/${resource}`;
   };
 
-  const _getUrl = (isPublic) => {
-    return `${Api.baseUrl}/${_getResource(isPublic)}`
+  const _getParams = (page, pageSize) => {
+    const pageParam = page ? `&page=${page}` : '';
+    const pageSizeParam = pageSize ? `&page_size=${pageSize}` : '';
+    const params = `${pageParam}${pageSizeParam}`;
+
+    return `org_id=${orgId}&org_type=${orgType}${params}`;
   };
 
   return {