Skip to content

Commit

Permalink
someInArray import fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Xziy committed May 4, 2024
1 parent 79cc3b9 commit 2492b44
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 27 deletions.
18 changes: 9 additions & 9 deletions adapters/promotion/default/configuredPromotion.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
const AbstractPromotion_1 = __importDefault(require("../AbstractPromotion"));
const findModelInstance_1 = __importDefault(require("../../../libs/findModelInstance"));
const decimal_js_1 = __importDefault(require("decimal.js"));
const someInArray_1 = require("../../../libs/someInArray");
const stringsInArray_1 = require("../../../libs/stringsInArray");
class ConfiguredPromotion extends AbstractPromotion_1.default {
constructor(promotion, config) {
super();
Expand All @@ -32,7 +32,7 @@ class ConfiguredPromotion extends AbstractPromotion_1.default {
}
condition(arg) {
if ((0, findModelInstance_1.default)(arg) === "Order" && (this.concept[0] === undefined || this.concept[0] === "")
? true : (0, someInArray_1.someInArray)(arg.concept, this.concept)) {
? true : (0, stringsInArray_1.someInArray)(arg.concept, this.concept)) {
let order = arg;
// TODO: if order.dishes type number[]
let orderDishes = order.dishes;
Expand All @@ -43,12 +43,12 @@ class ConfiguredPromotion extends AbstractPromotion_1.default {
return false;
}
if ((0, findModelInstance_1.default)(arg) === "Dish" && (this.concept[0] === undefined || this.concept[0] === "") ? true :
(0, someInArray_1.someInArray)(arg.concept, this.concept)) {
return (0, someInArray_1.someInArray)(arg.id, this.config.dishes);
(0, stringsInArray_1.someInArray)(arg.concept, this.concept)) {
return (0, stringsInArray_1.someInArray)(arg.id, this.config.dishes);
}
if ((0, findModelInstance_1.default)(arg) === "Group" && (this.concept[0] === undefined || this.concept[0] === "") ? true :
(0, someInArray_1.someInArray)(arg.concept, this.concept)) {
return (0, someInArray_1.someInArray)(arg.id, this.config.groups);
(0, stringsInArray_1.someInArray)(arg.concept, this.concept)) {
return (0, stringsInArray_1.someInArray)(arg.id, this.config.groups);
}
return false;
}
Expand Down Expand Up @@ -106,11 +106,11 @@ class ConfiguredPromotion extends AbstractPromotion_1.default {
continue;
}
if ((this.concept[0] === undefined || this.concept[0] === "") ?
false : !(0, someInArray_1.someInArray)(orderDish.dish.concept, this.concept)) {
false : !(0, stringsInArray_1.someInArray)(orderDish.dish.concept, this.concept)) {
continue;
}
let checkDishes = (0, someInArray_1.someInArray)(orderDish.dish.id, this.config.dishes);
let checkGroups = (0, someInArray_1.someInArray)(orderDish.dish.parentGroup, this.config.groups);
let checkDishes = (0, stringsInArray_1.someInArray)(orderDish.dish.id, this.config.dishes);
let checkGroups = (0, stringsInArray_1.someInArray)(orderDish.dish.parentGroup, this.config.groups);
if (!checkDishes || !checkGroups)
continue;
if (this.configDiscount.discountType === "flat") {
Expand Down
2 changes: 1 addition & 1 deletion adapters/promotion/default/configuredPromotion.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import Order, { PromotionState } from '../../../models/Order';
import User from '../../../models/User';
import findModelInstanceByAttributes from "../../../libs/findModelInstance";
import Decimal from "decimal.js";
import { someInArray, someInArray } from "../../../libs/someInArray";
import { someInArray } from "../../../libs/stringsInArray";

export default class ConfiguredPromotion extends AbstractPromotionHandler {
public badge: string = 'configured-promotion';
Expand Down
8 changes: 4 additions & 4 deletions models/Promotion.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
Object.defineProperty(exports, "__esModule", { value: true });
const hashCode_1 = __importDefault(require("../libs/hashCode"));
const adapters_1 = require("../adapters");
const someInArray_1 = require("../libs/someInArray");
const stringsInArray_1 = require("../libs/stringsInArray");
const uuid_1 = require("uuid");
// import Decimal from "decimal.js";
// sails.on("lifted", function () {
Expand Down Expand Up @@ -165,11 +165,11 @@ let Model = {
let activePromotionIds = promotionAdapter.getActivePromotionsIds();
if (concept[0] === "") {
let filteredRAM = promotionRAM.filter(promotion => (promotion.concept[0] === undefined || promotion.concept[0] === "")
&& (0, someInArray_1.someInArray)(promotion.id, activePromotionIds));
&& (0, stringsInArray_1.someInArray)(promotion.id, activePromotionIds));
return filteredRAM;
}
let filteredRAM = promotionRAM.filter(promotion => (0, someInArray_1.someInArray)(promotion.concept, concept) || (promotion.concept[0] === undefined || promotion.concept[0] === "")
&& (0, someInArray_1.someInArray)(promotion.id, activePromotionIds));
let filteredRAM = promotionRAM.filter(promotion => (0, stringsInArray_1.someInArray)(promotion.concept, concept) || (promotion.concept[0] === undefined || promotion.concept[0] === "")
&& (0, stringsInArray_1.someInArray)(promotion.id, activePromotionIds));
if (!filteredRAM)
throw "Promotion with concept: " + concept + " not found";
return filteredRAM;
Expand Down
2 changes: 1 addition & 1 deletion models/Promotion.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { OptionalAll, RequiredField } from "../interfaces/toolsTS";
import hashCode from "../libs/hashCode";
import { Adapter } from "../adapters";
import { IconfigDiscount } from "../interfaces/ConfigDiscount";
import { someInArray } from "../libs/someInArray";
import { someInArray } from "../libs/stringsInArray";
import PromotionCode from "../models/PromotionCode";
import { v4 as uuid } from "uuid";

Expand Down
12 changes: 6 additions & 6 deletions test/generators/discount.generator.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
const faker_1 = __importDefault(require("faker"));
const findModelInstance_1 = __importDefault(require("../../libs/findModelInstance"));
const configuredPromotion_1 = __importDefault(require("../../adapters/promotion/default/configuredPromotion"));
const someInArray_1 = require("../../libs/someInArray");
const stringsInArray_1 = require("../../libs/stringsInArray");
const decimal_js_1 = __importDefault(require("decimal.js"));
var autoincrement = 0;
function discountGenerator(config = {
Expand Down Expand Up @@ -48,7 +48,7 @@ function discountGenerator(config = {
},
// productCategoryDiscounts: undefined,
condition: function (arg) {
if ((0, findModelInstance_1.default)(arg) === "Order" && (0, someInArray_1.someInArray)(arg.concept, this.concept)) {
if ((0, findModelInstance_1.default)(arg) === "Order" && (0, stringsInArray_1.someInArray)(arg.concept, this.concept)) {
let order = arg;
// TODO: if order.dishes type number[]
let orderDishes = order.dishes;
Expand All @@ -58,14 +58,14 @@ function discountGenerator(config = {
return true;
return false;
}
if ((0, findModelInstance_1.default)(arg) === "Dish" && (0, someInArray_1.someInArray)(arg.concept, this.concept)) {
return (0, someInArray_1.someInArray)(arg.id, this.configDiscount.dishes);
if ((0, findModelInstance_1.default)(arg) === "Dish" && (0, stringsInArray_1.someInArray)(arg.concept, this.concept)) {
return (0, stringsInArray_1.someInArray)(arg.id, this.configDiscount.dishes);
// if(this.config.dishes.includes(arg.id)){
// return true;
// }
}
if ((0, findModelInstance_1.default)(arg) === "Group" && (0, someInArray_1.someInArray)(arg.concept, this.concept)) {
return (0, someInArray_1.someInArray)(arg.id, this.configDiscount.groups);
if ((0, findModelInstance_1.default)(arg) === "Group" && (0, stringsInArray_1.someInArray)(arg.concept, this.concept)) {
return (0, stringsInArray_1.someInArray)(arg.id, this.configDiscount.groups);
// if(this.config.groups.includes(arg.id)){
// return true;
// }
Expand Down
2 changes: 1 addition & 1 deletion test/generators/discount.generator.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { PromotionAdapter } from "../../adapters/promotion/default/promotionAdap
import findModelInstanceByAttributes from "../../libs/findModelInstance";
import AbstractPromotionHandler from "../../adapters/promotion/AbstractPromotion";
import ConfiguredPromotion from "../../adapters/promotion/default/configuredPromotion";
import { someInArray } from "../../libs/someInArray";
import { someInArray } from "../../libs/stringsInArray";
import Decimal from "decimal.js";

var autoincrement: number = 0;
Expand Down
8 changes: 4 additions & 4 deletions test/mocks/adapter/discount.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
exports.InMemoryDiscountAdapter = void 0;
const AbstractPromotion_1 = __importDefault(require("../../../adapters/promotion/AbstractPromotion"));
const findModelInstance_1 = __importDefault(require("../../../libs/findModelInstance"));
const someInArray_1 = require("../../../libs/someInArray");
const stringsInArray_1 = require("../../../libs/stringsInArray");
const configuredPromotion_1 = __importDefault(require("../../../adapters/promotion/default/configuredPromotion"));
const decimal_js_1 = __importDefault(require("decimal.js"));
class InMemoryDiscountAdapter extends AbstractPromotion_1.default {
Expand Down Expand Up @@ -34,19 +34,19 @@ class InMemoryDiscountAdapter extends AbstractPromotion_1.default {
// public worktime?: WorkTime[] = null;
condition(arg) {
// this.concept.includes(arg.concept)
if ((0, findModelInstance_1.default)(arg) === "Order" && (0, someInArray_1.someInArray)(arg.concept, this.concept)) {
if ((0, findModelInstance_1.default)(arg) === "Order" && (0, stringsInArray_1.someInArray)(arg.concept, this.concept)) {
// order not used for configuredPromotion
// Order.populate()
// TODO: check if includes groups and dishes
// where to get groups?
return true;
}
if ((0, findModelInstance_1.default)(arg) === "Dish" && (0, someInArray_1.someInArray)(arg.concept, this.concept)) {
if ((0, findModelInstance_1.default)(arg) === "Dish" && (0, stringsInArray_1.someInArray)(arg.concept, this.concept)) {
if (this.configDiscount.dishes.includes(arg.id)) {
return true;
}
}
if ((0, findModelInstance_1.default)(arg) === "Group" && (0, someInArray_1.someInArray)(arg.concept, this.concept)) {
if ((0, findModelInstance_1.default)(arg) === "Group" && (0, stringsInArray_1.someInArray)(arg.concept, this.concept)) {
if (this.configDiscount.groups.includes(arg.id)) {
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion test/mocks/adapter/discount.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { IconfigDiscount } from './../../../interfaces/ConfigDiscount';
import Group from './../../../models/Group';
import Dish from './../../../models/Dish';
import findModelInstanceByAttributes from "../../../libs/findModelInstance";
import { someInArray } from "../../../libs/someInArray";
import { someInArray } from "../../../libs/stringsInArray";
import configuredPromotion from "../../../adapters/promotion/default/configuredPromotion";
import ConfiguredPromotion from "../../../adapters/promotion/default/configuredPromotion";
import Decimal from "decimal.js";
Expand Down

0 comments on commit 2492b44

Please sign in to comment.