@itutoring/itutoring_application_js_api 1.6.4 → 1.6.6

package/apiController.js

@@ -1,4 +1,5 @@
 import CookiesManager from "./CookiesManager";
+import APICache from "./cache";
 import { R_KEYs } from "./objects/Enums";
 
 /**
@@ -8,7 +9,7 @@ class APIController
 {
     static #R_KEY = "-1";
     static #CLIENT_KEY = "-1";
-    
+
     static UserSource = null;
 
     static onErrorReceived = null
@@ -70,12 +71,12 @@ class APIController
     static ResolveResponse(request)
     {
         const json = JSON.parse(request.responseText);
-        if (json.code ===200)
+        if (json.code === 200)
         {
             // check for redirect
             if (json.data === "redirect" && json.url !== undefined)
             {
-                window.location.href =  json.url;
+                window.location.href = json.url;
             }
             return (json.data);
         }
@@ -109,8 +110,13 @@ class APIController
      * @param data "data must be as array - key, value pair. They'll be passed into the request"
      * @returns "Response from server"
      */
-    static async Get(module, method, data)
+    static async Get(module, method, data, useCache = false)
     {
+        if (useCache && APICache.IsCached(module + method))
+        {
+            return APICache.Retrive(module + method);
+        }
+
         await APIController.GetLocalRKey();
         await APIController.GetClientKey();
 
@@ -125,7 +131,13 @@ class APIController
             {
                 if (request.readyState === 4)
                 {
-                   resolve(APIController.ResolveResponse(request));
+                    var response = APIController.ResolveResponse(request);
+                    if (useCache)
+                    {
+                        APICache.Cache(module + method, response);
+                    }
+
+                    resolve(response);
                 }
             }
 
@@ -148,8 +160,13 @@ class APIController
      * @param file
      * @returns "Response from server"
      */
-    static async Post(module, method, data, file = null)
+    static async Post(module, method, data, file = null, useCache = false)
     {
+        if (useCache && APICache.IsCached(module + method))
+        {
+            return APICache.Retrive(module + method);
+        }
+
         await APIController.GetLocalRKey();
         await APIController.GetClientKey();
 
@@ -173,7 +190,12 @@ class APIController
             {
                 if (request.readyState === 4)
                 {
-                    resolve(APIController.ResolveResponse(request));
+                    var response = APIController.ResolveResponse(request);
+                    if (useCache)
+                    {
+                        APICache.Cache(module + method, response);
+                    }
+                    resolve(response);
                 }
             }
 
@@ -251,7 +273,7 @@ class APIController
                     APIController.#R_KEY = rKey;
                     localStorage.setItem("r_key", APIController.#R_KEY)
                     resolve(APIController.#R_KEY);
-                    
+
                 });
             }
         });

package/cache.js

@@ -1,18 +1,22 @@
 class APICache
 {
+    static CacheStorage = {}
+
     static Cache(key, data)
     {
-        localStorage.setItem(key, data);
+        this.CacheStorage[key] = data;
     }
 
     static Retrive(key)
     {
-        return localStorage.getItem(key);
+        if (!this.IsCached(key))
+            return null;
+        return this.CacheStorage[key];
     }
 
     static IsCached(key)
     {
-        return !(localStorage.getItem(key) === null);
+        return this.CacheStorage[key] !== undefined;
     }
 }
 

package/modules/FAQ.js

@@ -12,7 +12,7 @@ class FAQ
      */
     static async GetFAQ()
     {
-        const faq = await APIController.Get(this.#MODULE, this.#GET_FAQ, {});
+        const faq = await APIController.Get(this.#MODULE, this.#GET_FAQ, {}, true);
 
         return faq;
     }

package/modules/GoogleReviews.js

@@ -18,7 +18,7 @@ class GoogleReviews
     {
         var review = await APIController.Get(this.#MODULE, this.#GET_RANDOM_REVIEW, {
             "last_review": last_review_timestamp,
-        });
+        }, true);
 
         return JSON.parse(review);
     }

package/modules/Inventory.js

@@ -1,4 +1,5 @@
 import APIController from "../apiController";
+import APICache from "../cache";
 
 class Inventory
 {

package/modules/LectorDatabase.js

@@ -156,7 +156,7 @@ class LectorDatabase
             'offset': offset,
             'max': maxCount,
             'onlyWithProfilePictures': onlyWithProfilePictures,
-        });
+        }, true);
     }
 }
 

package/modules/Payments.js

@@ -13,6 +13,7 @@ class Payments
     static #GET_AVAILABLE_ITEMS = "GetAvailableItems";
 
     /**
+     * @deprecated
      * Purchase specific product. After calling you'll be redirected depending on the result to success or cancel (failed) url
      * @param {*} product product name as defined in php such as HOUR_LESSON
      * @param {*} type payment type (credits, card), use PaymentType enum
@@ -36,6 +37,7 @@ class Payments
     }
 
     /**
+     * @deprecated
      * Call on success page after purchase to mark the payment as successful.
      *  
      * Will return false if is already marked.
@@ -50,6 +52,10 @@ class Payments
     }
 
     // Array of avaialable item names. returned as parsed json.
+    /**
+     * @deprecated
+     * @returns 
+     */
     static async GetAvailableItems()
     {
         var res = await APIController.Get(this.#MODULE, this.#GET_AVAILABLE_ITEMS);

package/modules/Pricing.js

@@ -15,7 +15,7 @@ class Pricing
      */
     static async getPriceTable()
     {
-        var priceTable = await APIController.Get(this.#MODULE, this.#GET_PRICE_TABLE, {});
+        var priceTable = await APIController.Get(this.#MODULE, this.#GET_PRICE_TABLE, {}, true);
 
         return priceTable;
     }

package/modules/ReservationSystem.js

@@ -1,6 +1,5 @@
 import BillingInfo from "../objects/billingInfo";
 import APIController from "./../apiController";
-import Reservation from "./../objects/Reservation";
 
 class ReservationSystem
 {
@@ -34,7 +33,7 @@ class ReservationSystem
 
     static async getAvailableStates()
     {
-        var states = await APIController.Get(this.#MODULE, this.#GET_AVAILABLE_STATES);
+        var states = await APIController.Get(this.#MODULE, this.#GET_AVAILABLE_STATES, {}, true);
         return states;
     }
 

package/modules/Reviews.js

@@ -25,7 +25,7 @@ class Reviews
      */
     static async GetReviews()
     {
-        const reviews = await APIController.Get(this.#MODULE, this.#GET_REVIEWS, {});
+        const reviews = await APIController.Get(this.#MODULE, this.#GET_REVIEWS, {}, true);
 
         return reviews;
     }
@@ -36,7 +36,7 @@ class Reviews
      */
     static async GetRating()
     {
-        const rating = await APIController.Get(this.#MODULE, this.#GET_RATING, {});
+        const rating = await APIController.Get(this.#MODULE, this.#GET_RATING, {}, true);
 
         return rating;
     }

package/modules/SubjectManager.js

@@ -22,7 +22,7 @@ class SubjectManager
 
     static async getAllAvailableLocations()
     {
-        var data = await APIController.Get(this.#MODULE, this.#GET_ALL_AVAILABLE_LOCATIONS);
+        var data = await APIController.Get(this.#MODULE, this.#GET_ALL_AVAILABLE_LOCATIONS, {}, true);
         var arr = JSON.parse(data);
         return arr;
     }
@@ -31,21 +31,9 @@ class SubjectManager
      * 
      * @returns Array (Subject[id]) of all available subjects as array of Subject objects. Key is id of subject.
      */
-    static async GetAllAvailableSubjects(requestReload = false)
+    static async GetAllAvailableSubjects()
     {
-        var data;
-
-        /*if (APICache.IsCached(this.#SUBJECTS_CACHE_KEY) && !requestReload)
-        {
-            data = APICache.Retrive(this.#SUBJECTS_CACHE_KEY);
-        }
-        else
-        {
-            data = await APIController.Get(this.#MODULE, this.#GET_ALL_AVAILABLE_SUBJECTS);
-            APICache.Cache(this.#SUBJECTS_CACHE_KEY, data);
-        }*/
-
-        data = await APIController.Get(this.#MODULE, this.#GET_ALL_AVAILABLE_SUBJECTS);
+        var data = await APIController.Get(this.#MODULE, this.#GET_ALL_AVAILABLE_SUBJECTS, {}, true);
 
         var dataArray = JSON.parse(data);
 
@@ -72,6 +60,11 @@ class SubjectManager
         return availableSubjects;
     }
 
+    /**
+     * @deprecated
+     * @param {*} requestReload 
+     * @returns 
+     */
     static async GetAllAvailableCourses(requestReload = false)
     {
         var data;
@@ -120,7 +113,7 @@ class SubjectManager
 
     static async GetAllAvailablePlaces()
     {
-        var data = await APIController.Get(this.#MODULE, this.#GET_ALL_AVAILABLE_PLACES);
+        var data = await APIController.Get(this.#MODULE, this.#GET_ALL_AVAILABLE_PLACES, {}, true);
 
         var arr = JSON.parse(data);
 
@@ -129,7 +122,7 @@ class SubjectManager
 
     static async GetAllAvailableClasses()
     {
-        var data = await APIController.Get(this.#MODULE, this.#GET_ALL_AVAILABLE_CLASSES);
+        var data = await APIController.Get(this.#MODULE, this.#GET_ALL_AVAILABLE_CLASSES, {}, true);
         var arr = JSON.parse(JSON.parse(data));
         return arr;
     }

package/modules/TeacherProfiles.js

@@ -1,6 +1,9 @@
 import APIController from "./../apiController";
 import TeacherProfile from "./../objects/TeacherProfile";
 
+/**
+ * @deprecated
+ */
 class TeacherProfiles
 {
     static #MODULE = "TeacherProfiles";
@@ -9,6 +12,7 @@ class TeacherProfiles
 
 
     /**
+     * @deprecated
      * Retrive all public teacher profiles
      * 
      * @returns teachers public profiles as array

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itutoring/itutoring_application_js_api",
-  "version": "1.6.4",
+  "version": "1.6.6",
   "description": "Javascript API for iTutoring Application",
   "main": "index.js",
   "types": "index.d.ts",