@webresto/graphql 1.3.7 → 1.3.8

package/lib/defaults.ts

@@ -0,0 +1,55 @@
+import { RestoGraphQLConfig } from "../types/restoGraphQLConfig"
+let userConfig = {};
+
+if (process.env.USER_API != "NO" ) {
+  userConfig = {
+    ...userConfig,
+    user: ['query', 'subscription'],
+  }
+
+  if (process.env.BONUS_PROGRAM_API != "NO") {
+    userConfig = {
+      ...userConfig,
+      bonusprogram: ['query', 'subscription'],
+      userbonusprogram: ['query', 'subscription'],
+      userbonustransaction: ['query', 'subscription']
+    }
+  }
+  
+  if (process.env.USER_LOCATION_API != "NO") {
+    userConfig = {
+      ...userConfig,
+      userlocation: ['query', 'subscription'],
+    }
+  }
+
+  if (process.env.USER_ORDER_HISTORY_API != "NO") {
+    userConfig = {
+      ...userConfig,
+      userorderhistory: ['query', 'subscription']
+    }
+  }
+}
+
+module.exports.restographql = {
+  whiteListAutoGen: {
+    group: ['query', 'subscription'],
+    dish: ['query', 'subscription'],
+    ...userConfig
+  },
+  blackList: [
+    'Order.groupModifiers',
+    'Order.promotionCode',
+    'Order.isPromoting',
+    'Order.rmsOrderData',
+    'Order.promotionFlatDiscount',
+    'Order.promotionDelivery',
+    'Order.promotionCodeCheckValidTill',
+    'Dish.favorites',
+    'worktime',
+    'hash',
+    'isDeleted',
+    'createdAt',
+    'updatedAt'
+  ]
+} as unknown as RestoGraphQLConfig;

package/lib/eventHelper.d.ts

@@ -1,15 +1,23 @@
+import { Message, Action } from "../types/primitives";
 declare const _default: {
     sendMessage: typeof sendMessage;
     sendAction: typeof sendAction;
+    getRandom: typeof getRandom;
 };
 export default _default;
-export { sendMessage, sendAction };
-declare function sendMessage(orderId: String, message: any): void;
+export { sendMessage, sendAction, getRandom };
+interface MessageWithId extends Message {
+    id: string;
+}
+interface ActionWithId extends Action {
+    id: string;
+}
+declare function sendMessage(message: Message): Promise<MessageWithId>;
 /**
  *
  * @param orderId
- * @param action  - obj {type: String, data: Json}
- *
+ * @param action  - obj {type, data: Json}
+ * @returns Action with ID
  * @example
  * {
  *      type: "PaymentRedirect",
@@ -18,4 +26,5 @@ declare function sendMessage(orderId: String, message: any): void;
  *      }
  * }
  */
-declare function sendAction(orderId: String, action: any): void;
+declare function sendAction(action: Action): ActionWithId;
+declare function getRandom(length?: number): string;

package/lib/eventHelper.js

@@ -1,22 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendAction = exports.sendMessage = void 0;
+exports.getRandom = exports.sendAction = exports.sendMessage = void 0;
 const graphql_1 = require("../src/graphql");
-// import * as gql from '@webresto/graphql';
+const crypto = require("crypto");
 exports.default = {
     sendMessage,
-    sendAction
+    sendAction,
+    getRandom
 };
-function sendMessage(orderId, message) {
+//TODO: Add ID for all message and add returun
+//TODO rename to makeMessage 
+async function sendMessage(message) {
+    if (!message) {
+        sails.log.error(`API > sendMessage: Message is not defined`);
+        return;
+    }
+    if (!message.id) {
+        message.id = getRandom();
+    }
     const pubsub = graphql_1.default.getPubsub();
-    pubsub.publish("message", { orderId, message });
+    pubsub.publish("message", { deviceId: message.deviceId, message });
+    return message;
 }
 exports.sendMessage = sendMessage;
 /**
  *
  * @param orderId
- * @param action  - obj {type: String, data: Json}
- *
+ * @param action  - obj {type, data: Json}
+ * @returns Action with ID
  * @example
  * {
  *      type: "PaymentRedirect",
@@ -25,8 +36,16 @@ exports.sendMessage = sendMessage;
  *      }
  * }
  */
-function sendAction(orderId, action) {
+function sendAction(action) {
+    if (!action.id) {
+        action.id = getRandom();
+    }
     const pubsub = graphql_1.default.getPubsub();
-    pubsub.publish("action", { orderId, action });
+    pubsub.publish("action", { deviceId: action.deviceId, action });
+    return action;
 }
 exports.sendAction = sendAction;
+function getRandom(length = 16) {
+    return crypto.randomBytes(length).toString('base64').replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '');
+}
+exports.getRandom = getRandom;

package/lib/eventHelper.ts

@@ -1,25 +1,48 @@
 import graphql from '../src/graphql';
 // import * as gql from '@webresto/graphql';
+import { Message, Action } from "../types/primitives"
+import * as crypto from "crypto"
 
 export default {
     sendMessage,
-    sendAction
+    sendAction,
+    getRandom
 }
 export {
     sendMessage,
-    sendAction
+    sendAction,
+    getRandom
 }
 
-function sendMessage(orderId: String, message: any) {
+interface MessageWithId extends Message {
+    id: string
+}
+
+interface ActionWithId extends Action {
+    id: string
+}
+
+//TODO: Add ID for all message and add returun
+//TODO rename to makeMessage 
+async function sendMessage(message: Message): Promise<MessageWithId> {
+    if (!message){
+        sails.log.error(`API > sendMessage: Message is not defined`)
+        return
+    }
+    if(!message.id){
+        message.id = getRandom();
+    }
+
     const pubsub = graphql.getPubsub();
-    pubsub.publish("message", {orderId, message});
+    pubsub.publish("message", {deviceId:message.deviceId, message});
+    return message as MessageWithId
 }
 
 /**
  *
  * @param orderId
- * @param action  - obj {type: String, data: Json}
- *
+ * @param action  - obj {type, data: Json}
+ * @returns Action with ID
  * @example
  * {
  *      type: "PaymentRedirect",
@@ -29,7 +52,17 @@ function sendMessage(orderId: String, message: any) {
  * }
  */
 
-function sendAction(orderId: String, action: any) {
+function sendAction(action: Action): ActionWithId {
+    if(!action.id){
+        action.id = getRandom();
+    }
+
     const pubsub = graphql.getPubsub();
-    pubsub.publish("action", {orderId, action});
+    pubsub.publish("action", {deviceId: action.deviceId, action});
+    return action as ActionWithId
 }
+
+
+function getRandom(length:number = 16): string{
+    return crypto.randomBytes(length).toString('base64').replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '');
+}

package/lib/getRecomended.d.ts

@@ -0,0 +1 @@
+export declare function getRecomendElements(array: any, count: any): any[];

package/lib/getRecomended.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getRecomendElements = void 0;
+function getRecomendElements(array, count) {
+    if (!Array.isArray(array) || array.length === 0 || count <= 0) {
+        return [];
+    }
+    if (array.length <= count) {
+        return array;
+    }
+    const maxPrice = Math.max(...array.map(item => item.price));
+    const minPrice = maxPrice * 0.2; // 20% of the maximum price
+    const maxPriceRange = maxPrice * 0.8; // 80% of the maximum price
+    let filteredArray = array.filter(item => item.price >= minPrice && item.price <= maxPriceRange);
+    if (filteredArray.length === 0) {
+        filteredArray = array;
+    }
+    const randomElements = [];
+    const indices = new Set();
+    while (randomElements.length < count && indices.size < filteredArray.length) {
+        const index = Math.floor(Math.random() * filteredArray.length);
+        if (!indices.has(index)) {
+            indices.add(index);
+            randomElements.push(filteredArray[index]);
+        }
+    }
+    return randomElements.reverse();
+}
+exports.getRecomendElements = getRecomendElements;

package/lib/getRecomended.ts

@@ -0,0 +1,31 @@
+export function getRecomendElements(array, count) {
+    if (!Array.isArray(array) || array.length === 0 || count <= 0) {
+        return [];
+    }
+
+    if (array.length <= count) {
+        return array;
+    }
+
+    const maxPrice = Math.max(...array.map(item => item.price));
+    const minPrice = maxPrice * 0.2; // 20% of the maximum price
+    const maxPriceRange = maxPrice * 0.8; // 80% of the maximum price
+
+    let filteredArray = array.filter(item => item.price >= minPrice && item.price <= maxPriceRange);
+
+    if (filteredArray.length === 0) {
+        filteredArray = array;
+    }
+
+    const randomElements = [];
+    const indices = new Set();
+    while (randomElements.length < count && indices.size < filteredArray.length) {
+        const index = Math.floor(Math.random() * filteredArray.length);
+        if (!indices.has(index)) {
+            indices.add(index);
+            randomElements.push(filteredArray[index]);
+        }
+    }
+
+    return randomElements.reverse();
+}

package/lib/graphqlHelper.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="@webresto/core/libs/globalTypes" />
 /**
  * Добавляет модель в список моделей для создания типов схемы graphql
  *
@@ -7,13 +6,13 @@
  * @returns void
  */
 declare function addModel(modelName: string): void;
-declare function addType(typeString: String): void;
+declare function addType(type: string): void;
 /**
  * Мержит новый резолвер с объектом резолверов. Новый резолвер заменит старый при совпадении имен
  *
  * @param resolvers
  * resolverExample = {
- *      def: "user(id: String)",
+ *      def: "user(id: string)",
  *      fn: function (parent, args, context) {
  *          return User.find({id: args.id})
  *      }
@@ -36,7 +35,7 @@ declare function addAllSailsModels(): void;
 declare function addToBlackList(list: Array<string>): void;
 /**
  * Добавляет в указаную модель новое поле
- * Пример: addCustomField("Order", "customField: String")
+ * Пример: addCustomField("Order", "customField: string")
  *
  * @param model string
  * @param field string