delete map adapter

webresto · Aug 7, 2023 · d493494 · d493494
1 parent 233d299
commit d493494
Show file tree

Hide file tree

Showing 21 changed files with 80 additions and 88 deletions.
diff --git a/adapters/bonusprogram/BonusProgramAdapter.js b/adapters/bonusprogram/BonusProgramAdapter.js
@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 class BonusProgramAdapter {
+    id;
+    config = {};
     constructor(config) {
-        this.config = {};
         this.config = config;
     }
     /**

diff --git a/adapters/captcha/CaptchaAdapter.js b/adapters/captcha/CaptchaAdapter.js
@@ -4,6 +4,6 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 class CaptchaAdapter {
+    static taskStorage = {};
 }
-CaptchaAdapter.taskStorage = {};
 exports.default = CaptchaAdapter;
diff --git a/adapters/discount/AbstractDiscountAdapter.js b/adapters/discount/AbstractDiscountAdapter.js
@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 class AbstractDiscountHandlerINSTANCE {
+    static discounts;
 }
 exports.default = AbstractDiscountHandlerINSTANCE;
diff --git a/adapters/discount/default/configuredDiscount.js b/adapters/discount/default/configuredDiscount.js
@@ -25,6 +25,22 @@ class configuredDiscount extends AbstractDiscount_1.default {
         // this.displayGroupDiscount = discount.displayGroupDiscount;
         // this.displayGroupDish = discount.displayGroupDish;
     }
+    id;
+    isJoint;
+    name;
+    isPublic;
+    description;
+    concept;
+    configDiscount;
+    discount;
+    discountType;
+    actions;
+    enable;
+    isDeleted;
+    sortOrder;
+    productCategoryDiscounts;
+    hash;
+    worktime;
     condition(order) {
         throw new Error("Method not implemented.");
     }

diff --git a/adapters/discount/default/discountAdapter.js b/adapters/discount/default/discountAdapter.js
@@ -5,6 +5,13 @@ exports.DiscountAdapter = void 0;
 const configuredDiscount_1 = require("./configuredDiscount");
 const worktime_1 = require("@webresto/worktime");
 class DiscountAdapter {
+    // constructor all discounts isDeleted: true
+    // public readonly DiscountA: AbstractDiscount;
+    // protected constructor() {
+    //   // this.DiscountA = DiscountA;
+    //   Discount.setDelete();
+    // }
+    static discounts = {};
     static async apply(order) {
         // Order.concept : string
         // when apply => use only discounts from this.discounts
@@ -96,11 +103,4 @@ class DiscountAdapter {
         return DiscountAdapter.prototype;
     }
 }
-// constructor all discounts isDeleted: true
-// public readonly DiscountA: AbstractDiscount;
-// protected constructor() {
-//   // this.DiscountA = DiscountA;
-//   Discount.setDelete();
-// }
-DiscountAdapter.discounts = {};
 exports.DiscountAdapter = DiscountAdapter;
diff --git a/adapters/index.js b/adapters/index.js
@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Adapter = exports.OTP = exports.Captcha = exports.Map = void 0;
+exports.Adapter = exports.OTP = exports.Captcha = void 0;
 const RMSAdapter_1 = require("./rms/RMSAdapter");
 const pow_1 = require("./captcha/default/pow");
 const defaultOTP_1 = require("./otp/default/defaultOTP");
@@ -10,27 +10,6 @@ const fs = require("fs");
 const discountAdapter_1 = require("./discount/default/discountAdapter");
 // import DiscountAdapter from "./discount/AbstractDiscountAdapter";
 const WEBRESTO_MODULES_PATH = process.env.WEBRESTO_MODULES_PATH === undefined ? "@webresto" : process.env.WEBRESTO_MODULES_PATH;
-/**
- * retruns Map-adapter
- */
-class Map {
-    static async getAdapter(adapterName) {
-        if (!adapterName) {
-            adapterName = await Settings.get("DEFAULT_MAP_ADAPTER");
-        }
-        let adapterLocation = WEBRESTO_MODULES_PATH + "/" + adapterName.toLowerCase() + "-map-adapter";
-        adapterLocation = fs.existsSync(adapterLocation) ? adapterLocation : "@webresto/" + adapterName.toLowerCase() + "-map-adapter";
-        try {
-            const adapter = require(adapterLocation);
-            return adapter.MapAdapter.default;
-        }
-        catch (e) {
-            sails.log.error("CORE > getAdapter Map > error; ", e);
-            throw new Error("Module " + adapterLocation + " not found");
-        }
-    }
-}
-exports.Map = Map;
 /**
  * retruns Captcha-adapter
  */
@@ -83,6 +62,10 @@ class OTP {
 exports.OTP = OTP;
 /** TODO: move other Adapters to one class adapter */
 class Adapter {
+    // Singletons
+    static instanceRMS;
+    static instanceMF;
+    static WEBRESTO_MODULES_PATH = process.env.WEBRESTO_MODULES_PATH === undefined ? "@webresto" : process.env.WEBRESTO_MODULES_PATH;
     static async getDiscountAdapter(adapterName, initParams) {
         if (!adapterName) {
             adapterName = await Settings.get("DEFAULT_DISCOUNT_ADAPTER");
@@ -223,5 +206,4 @@ class Adapter {
         }
     }
 }
-Adapter.WEBRESTO_MODULES_PATH = process.env.WEBRESTO_MODULES_PATH === undefined ? "@webresto" : process.env.WEBRESTO_MODULES_PATH;
 exports.Adapter = Adapter;
diff --git a/adapters/map/MapAdapter.js b/adapters/map/MapAdapter.js
diff --git a/adapters/map/Point.js b/adapters/map/Point.js
diff --git a/adapters/map/Polygon.js b/adapters/map/Polygon.js
diff --git a/adapters/mediafile/MediaFileAdapter.js b/adapters/mediafile/MediaFileAdapter.js
@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const uuid_1 = require("uuid");
 ;
 class MediaFileAdapter {
+    config;
+    initializationPromise;
+    UUID_NAMESPACE;
     constructor(config) {
         this.config = config;
         this.initializationPromise = this.initialize();

diff --git a/adapters/mediafile/default/local.js b/adapters/mediafile/default/local.js
@@ -28,10 +28,11 @@ const path = require("path");
 //   }
 // },
 class LocalMediaFileAdapter extends MediaFileAdapter_1.default {
+    processing = false;
+    processingTimeout; // TODO: rewrite by proxy
+    loadMediaFilesProcessQueue = [];
     constructor(config) {
         super(config);
-        this.processing = false;
-        this.loadMediaFilesProcessQueue = [];
         this.loadMediaFiles();
     }
     getNameByUrl(url, ext, options, salt = false) {

diff --git a/adapters/payment/PaymentAdapter.js b/adapters/payment/PaymentAdapter.js
@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 class PaymentAdapter {
+    InitPaymentAdapter;
+    config;
     constructor(InitPaymentAdapter) {
         this.InitPaymentAdapter = InitPaymentAdapter;
         this.config = InitPaymentAdapter.config;

diff --git a/adapters/rms/RMSAdapter.js b/adapters/rms/RMSAdapter.js
@@ -5,8 +5,13 @@ const ObservablePromise_1 = require("../../libs/ObservablePromise");
  * An abstract RMS adapter class. Used to create new RMS adapters.
  */
 class RMSAdapter {
+    config = {};
+    static syncProductsInterval;
+    static syncOutOfStocksInterval;
+    initializationPromise;
+    syncProductsPromise;
+    syncOutOfStocksPromise;
     constructor(config) {
-        this.config = {};
         this.config = config;
         // Run async initialization
         this.initializationPromise = this.initialize();

diff --git a/libs/AwaitEmitter.js b/libs/AwaitEmitter.js
@@ -7,6 +7,9 @@ const sleep = require("util").promisify(setTimeout);
  * с ошибкой или время ожидания вышло).
  */
 class AwaitEmitter {
+    events;
+    name;
+    timeout;
     /**
      * @param name - название нового эмиттера
      * @param timeout - указывает сколько милисекунд ожидать функции, которые возвращают Promise.
@@ -139,6 +142,8 @@ exports.default = AwaitEmitter;
  * Объект собятия, хранит название события и его слушателей
  */
 class Event {
+    name;
+    fns;
     constructor(name) {
         this.name = name;
         this.fns = [];
@@ -149,6 +154,10 @@ class Event {
  * ошибку, которые вернула или вызвала функция
  */
 class Response {
+    label;
+    state;
+    result;
+    error;
     constructor(label, result, error, timeout) {
         this.label = label;
         this.result = result;

diff --git a/libs/NotificationManager.js b/libs/NotificationManager.js
@@ -5,6 +5,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NotificationManager = void 0;
 class NotificationManager {
+    static kitchenChannels;
+    static userChannels;
     constructor() {
     }
     isChannelExist(channel) {

diff --git a/libs/ObservablePromise.js b/libs/ObservablePromise.js
@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ObservablePromise = void 0;
 class ObservablePromise {
+    _status = 'pending';
+    _promise;
     constructor(promise) {
-        this._status = 'pending';
         this._promise = promise
             .then((value) => {
             this._status = 'fulfilled';

diff --git a/libs/hookTools.js b/libs/hookTools.js
@@ -8,6 +8,10 @@ const buildDictionary = require("sails-build-dictionary");
  * Provide tools for hooks. Has only static methods.
  */
 class HookTools {
+    /**
+     * Policies array is one for all project. It not assigned with sails policies
+     */
+    static policies;
     /**
      * Bind models from folder. Folder must be full path.
      * @param folder - path to models

diff --git a/models/Dish.js b/models/Dish.js
@@ -284,7 +284,7 @@ let Model = {
         }
         const dish = await Dish.findOne(criteria);
         if (!dish) {
-            return Dish.create({ hash, ...values }).fetch();
+            return await Dish.create({ hash, ...values }).fetch();
         }
         else {
             if (hash === dish.hash) {

diff --git a/models/Dish.ts b/models/Dish.ts
@@ -357,7 +357,7 @@ let Model = {
     const dish = await Dish.findOne(criteria);
 
     if (!dish) {
-      return Dish.create({ hash, ...values }).fetch();
+      return await Dish.create({ hash, ...values }).fetch();
     } else {
       if (hash === dish.hash) {
         return dish;

diff --git a/test/generators/lib/mockSet.js b/test/generators/lib/mockSet.js
@@ -8,6 +8,13 @@ const util_1 = require("util");
 const listFiles = (0, util_1.promisify)(fs_1.readdir);
 const isRecord = (o) => o != null && typeof o === "object" && !(o instanceof Array) && Object.keys(o).reduce((result, key) => result && typeof key === "string", true);
 class MockSet {
+    static instance;
+    declarationPaths;
+    fileNames;
+    fileData;
+    mocks;
+    extension;
+    interfaces;
     constructor() {
         this.declarationPaths = ["../../models/", "../../interfaces/", "../../adapters/", "../../config/", "../../libs/"];
         this.extension = ".d.ts";

diff --git a/test/mocks/adapter/bonusProgram.js b/test/mocks/adapter/bonusProgram.js
@@ -3,16 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.InMemoryBonusProgramAdapter = void 0;
 const BonusProgramAdapter_1 = require("../../../adapters/bonusprogram/BonusProgramAdapter");
 class InMemoryBonusProgramAdapter extends BonusProgramAdapter_1.default {
+    transactions = new Map();
+    users = new Map();
+    name = "test bonus adapter name";
+    adapter = "test";
+    exchangeRate = 10;
+    coveragePercentage = 0.5;
+    decimals = 1;
+    description = "In-memory BonusProgramAdapter";
     constructor(config) {
         super(config);
-        this.transactions = new Map();
-        this.users = new Map();
-        this.name = "test bonus adapter name";
-        this.adapter = "test";
-        this.exchangeRate = 10;
-        this.coveragePercentage = 0.5;
-        this.decimals = 1;
-        this.description = "In-memory BonusProgramAdapter";
     }
     async registration(user) {
         if (!this.users.has(user.id)) {