Skip to content

Commit

Permalink
remove import models
Browse files Browse the repository at this point in the history
  • Loading branch information
Xziy committed Sep 13, 2024
1 parent 3d8dd2c commit 3b85e26
Show file tree
Hide file tree
Showing 144 changed files with 389 additions and 361 deletions.
3 changes: 0 additions & 3 deletions adapters/bonusprogram/BonusProgramAdapter.d.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
import UserBonusTransaction from "../../models/UserBonusTransaction";
import UserBonusProgram from "../../models/UserBonusProgram";
import User from "../../models/User";
import { RequiredField } from "../../interfaces/toolsTS";
export type ConfigBonusProgramAdapter = {
[key: string]: number | boolean | string;
Expand Down
6 changes: 3 additions & 3 deletions adapters/bonusprogram/BonusProgramAdapter.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import UserBonusTransaction from "../../models/UserBonusTransaction";
import UserBonusProgram from "../../models/UserBonusProgram";
import User from "../../models/User";
//MODEL TODO:UserBonusTransaction";
//MODEL TODO:UserBonusProgram";
//MODEL TODO:User";
import { RequiredField } from "../../interfaces/toolsTS";

export type ConfigBonusProgramAdapter = {
Expand Down
1 change: 0 additions & 1 deletion adapters/delivery/DeliveryAdapter.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import Order from "../../models/Order";
/**
* **Soft delivery calculation**
* This is done so that some deliveries can agree on the cost of delivery themselves.
Expand Down
1 change: 1 addition & 0 deletions adapters/delivery/DeliveryAdapter.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"use strict";
//MODEL TODO:Order";
Object.defineProperty(exports, "__esModule", { value: true });
class DeliveryAdapter {
/**
Expand Down
2 changes: 1 addition & 1 deletion adapters/delivery/DeliveryAdapter.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Order from "../../models/Order";
//MODEL TODO:Order";


/**
Expand Down
1 change: 0 additions & 1 deletion adapters/delivery/default/defaultDelivery.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import Order from "../../../models/Order";
import DeliveryAdapter, { Delivery } from "../DeliveryAdapter";
export declare class DefaultDeliveryAdapter extends DeliveryAdapter {
calculate(order: Order): Promise<Delivery>;
Expand Down
1 change: 1 addition & 0 deletions adapters/delivery/default/defaultDelivery.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
};
Object.defineProperty(exports, "__esModule", { value: true });
exports.DefaultDeliveryAdapter = void 0;
//MODEL TODO:Order";
const DeliveryAdapter_1 = __importDefault(require("../DeliveryAdapter"));
class DefaultDeliveryAdapter extends DeliveryAdapter_1.default {
async calculate(order) {
Expand Down
2 changes: 1 addition & 1 deletion adapters/delivery/default/defaultDelivery.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Order from "../../../models/Order";
//MODEL TODO:Order";
import DeliveryAdapter, { Delivery } from "../DeliveryAdapter";

export class DefaultDeliveryAdapter extends DeliveryAdapter {
Expand Down
1 change: 0 additions & 1 deletion adapters/mediafile/MediaFileAdapter.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { IMediaFile } from "../../models/MediaFile";
export type BaseConfigProperty = BaseConfig | BaseConfig[] | number | boolean | string | null | undefined;
export interface BaseConfig {
[key: string]: BaseConfigProperty;
Expand Down
2 changes: 1 addition & 1 deletion adapters/mediafile/MediaFileAdapter.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { v5 as uuidv5 } from "uuid";
import { IMediaFile } from "../../models/MediaFile";
//MODEL TODO:MediaFile";


export type BaseConfigProperty = BaseConfig | BaseConfig[] | number | boolean | string | null | undefined;
Expand Down
1 change: 0 additions & 1 deletion adapters/mediafile/default/local.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import MediaFileAdapter, { BaseConfig, MediaFileTypes } from "../MediaFileAdapter";
import { IMediaFile } from "../../../models/MediaFile";
export interface MediaFileConfig {
dish: MediaFileConfigInner;
group: MediaFileConfigInner;
Expand Down
2 changes: 1 addition & 1 deletion adapters/mediafile/default/local.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { v5 as uuidv5 } from "uuid";
import * as path from "path";
//@ts-ignore
import sharp from 'sharp';
import { IMediaFile } from "../../../models/MediaFile";
//MODEL TODO:MediaFile";


export interface MediaFileConfig {
Expand Down
1 change: 0 additions & 1 deletion adapters/otp/OneTimePasswordAdapter.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import OneTimePassword from "../../models/OneTimePassword";
export default abstract class OTPAdapter {
/** Send OTP to user by CORE_LOGIN_FIELD */
abstract get(login: string): Promise<OneTimePassword>;
Expand Down
1 change: 1 addition & 0 deletions adapters/otp/OneTimePasswordAdapter.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
//MODEL TODO:OneTimePassword"
class OTPAdapter {
}
exports.default = OTPAdapter;
2 changes: 1 addition & 1 deletion adapters/otp/OneTimePasswordAdapter.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import OneTimePassword from "../../models/OneTimePassword"
//MODEL TODO:OneTimePassword"
export default abstract class OTPAdapter {
/** Send OTP to user by CORE_LOGIN_FIELD */
public abstract get(login: string): Promise<OneTimePassword>;
Expand Down
1 change: 0 additions & 1 deletion adapters/otp/default/defaultOTP.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import OneTimePasswordAdapter from "../OneTimePasswordAdapter";
import OneTimePassword from "../../../models/OneTimePassword";
export declare class DefaultOTP extends OneTimePasswordAdapter {
/**
* Send and return OTP code
Expand Down
1 change: 1 addition & 0 deletions adapters/otp/default/defaultOTP.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
Object.defineProperty(exports, "__esModule", { value: true });
exports.DefaultOTP = void 0;
const OneTimePasswordAdapter_1 = __importDefault(require("../OneTimePasswordAdapter"));
//MODEL TODO:OneTimePassword"
class DefaultOTP extends OneTimePasswordAdapter_1.default {
/**
* Send and return OTP code
Expand Down
2 changes: 1 addition & 1 deletion adapters/otp/default/defaultOTP.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import OneTimePasswordAdapter from "../OneTimePasswordAdapter";
import OneTimePassword from "../../../models/OneTimePassword"
//MODEL TODO:OneTimePassword"
export class DefaultOTP extends OneTimePasswordAdapter {
/**
* Send and return OTP code
Expand Down
1 change: 0 additions & 1 deletion adapters/payment/PaymentAdapter.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { Payment, PaymentResponse } from "../../interfaces/Payment";
import PaymentDocument from "../../models/PaymentDocument";
import { PaymentMethodType } from "../../libs/enums/PaymentMethodTypes";
import { Config } from "../../interfaces/Config";
export interface InitPaymentAdapter {
Expand Down
2 changes: 1 addition & 1 deletion adapters/payment/PaymentAdapter.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Payment, PaymentResponse } from "../../interfaces/Payment";
import PaymentDocument from "../../models/PaymentDocument";
//MODEL TODO:PaymentDocument";
import { PaymentMethodType } from "../../libs/enums/PaymentMethodTypes";
import { Config } from "../../interfaces/Config";

Expand Down
4 changes: 0 additions & 4 deletions adapters/promotion/AbstractPromotion.d.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
import { IconfigDiscount } from "../../interfaces/ConfigDiscount";
import Order, { PromotionState } from "../../models/Order";
import User from "../../models/User";
import Group from "../../models/Group";
import Dish from "../../models/Dish";
export default abstract class AbstractPromotionHandler {
/** unique id */
abstract id: string;
Expand Down
5 changes: 5 additions & 0 deletions adapters/promotion/AbstractPromotion.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
//MODEL TODO:Order";
// import { WorkTime } from "@webresto/worktime";
//MODEL TODO:User";
//MODEL TODO:Group";
//MODEL TODO:Dish";
class AbstractPromotionHandler {
constructor() {
// TODO: remove
Expand Down
8 changes: 4 additions & 4 deletions adapters/promotion/AbstractPromotion.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { IconfigDiscount } from "../../interfaces/ConfigDiscount";
import Order, { PromotionState } from "../../models/Order";
//MODEL TODO:Order";
// import { WorkTime } from "@webresto/worktime";
import User from "../../models/User";
import Group from "../../models/Group";
import Dish from "../../models/Dish";
//MODEL TODO:User";
//MODEL TODO:Group";
//MODEL TODO:Dish";

export default abstract class AbstractPromotionHandler {
/** unique id */
Expand Down
3 changes: 0 additions & 3 deletions adapters/promotion/AbstractPromotionAdapter.d.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
import Order from "../../models/Order";
import AbstractPromotionHandler from "./AbstractPromotion";
import Group from './../../models/Group';
import Dish from './../../models/Dish';
export default abstract class AbstractPromotionAdapter {
abstract promotions: {
[key: string]: AbstractPromotionHandler;
Expand Down
3 changes: 3 additions & 0 deletions adapters/promotion/AbstractPromotionAdapter.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
//MODEL TODO:Group';
//MODEL TODO:Dish';
//MODEL TODO:OrderDish";
class AbstractPromotionAdapter {
/**
* Base realization clearOfPromotion
Expand Down
8 changes: 4 additions & 4 deletions adapters/promotion/AbstractPromotionAdapter.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import Order, { PromotionState } from "../../models/Order"
//MODEL TODO:Order"
import AbstractPromotionHandler from "./AbstractPromotion";
import Group from './../../models/Group';
import Dish from './../../models/Dish';
import OrderDish from "../../models/OrderDish";
//MODEL TODO:Group';
//MODEL TODO:Dish';
//MODEL TODO:OrderDish";
export default abstract class AbstractPromotionAdapter {
public abstract promotions: { [key: string]: AbstractPromotionHandler };

Expand Down
4 changes: 0 additions & 4 deletions adapters/promotion/default/configuredPromotion.d.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
import AbstractPromotionHandler from "../AbstractPromotion";
import { IconfigDiscount } from "../../../interfaces/ConfigDiscount";
import Group from '../../../models/Group';
import Dish from '../../../models/Dish';
import Order, { PromotionState } from '../../../models/Order';
import User from '../../../models/User';
export default class ConfiguredPromotion extends AbstractPromotionHandler {
badge: string;
constructor(promotion: Omit<AbstractPromotionHandler, "action" | "condition">, config?: IconfigDiscount);
Expand Down
5 changes: 5 additions & 0 deletions adapters/promotion/default/configuredPromotion.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
Object.defineProperty(exports, "__esModule", { value: true });
// import { WorkTime } from "@webresto/worktime";
const AbstractPromotion_1 = __importDefault(require("../AbstractPromotion"));
//MODEL TODO:Group';
//MODEL TODO:Dish';
//MODEL TODO:OrderDish';
//MODEL TODO:Order';
//MODEL TODO:User';
const findModelInstance_1 = __importDefault(require("../../../libs/findModelInstance"));
const decimal_js_1 = __importDefault(require("decimal.js"));
const stringsInArray_1 = require("../../../libs/stringsInArray");
Expand Down
10 changes: 5 additions & 5 deletions adapters/promotion/default/configuredPromotion.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// import { WorkTime } from "@webresto/worktime";
import AbstractPromotionHandler from "../AbstractPromotion";
import { IconfigDiscount } from "../../../interfaces/ConfigDiscount";
import Group from '../../../models/Group';
import Dish from '../../../models/Dish';
import OrderDish from '../../../models/OrderDish';
import Order, { PromotionState } from '../../../models/Order';
import User from '../../../models/User';
//MODEL TODO:Group';
//MODEL TODO:Dish';
//MODEL TODO:OrderDish';
//MODEL TODO:Order';
//MODEL TODO:User';
import findModelInstanceByAttributes from "../../../libs/findModelInstance";
import Decimal from "decimal.js";
import { someInArray } from "../../../libs/stringsInArray";
Expand Down
4 changes: 0 additions & 4 deletions adapters/promotion/default/promotionAdapter.d.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
import Order from "../../../models/Order";
import AbstractPromotionHandler from "../AbstractPromotion";
import AbstractPromotionAdapter from "../AbstractPromotionAdapter";
import Promotion from "../../../models/Promotion";
import Group from "../../../models/Group";
import Dish from "../../../models/Dish";
export declare class PromotionAdapter extends AbstractPromotionAdapter {
readonly promotions: {
[key: string]: AbstractPromotionHandler;
Expand Down
4 changes: 4 additions & 0 deletions adapters/promotion/default/promotionAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,12 @@ exports.PromotionAdapter = void 0;
const decimal_js_1 = __importDefault(require("decimal.js"));
const AbstractPromotionAdapter_1 = __importDefault(require("../AbstractPromotionAdapter"));
const worktime_1 = require("@webresto/worktime");
//MODEL TODO:Promotion";
//MODEL TODO:Group";
//MODEL TODO:Dish";
const configuredPromotion_1 = __importDefault(require("./configuredPromotion"));
const findModelInstance_1 = __importDefault(require("../../../libs/findModelInstance"));
//MODEL TODO:PromotionCode";
class PromotionAdapter extends AbstractPromotionAdapter_1.default {
constructor() {
super(...arguments);
Expand Down
10 changes: 5 additions & 5 deletions adapters/promotion/default/promotionAdapter.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import Decimal from "decimal.js";
import Order, { PromotionState } from "../../../models/Order";
//MODEL TODO:Order";
import AbstractPromotionHandler from "../AbstractPromotion";
import AbstractPromotionAdapter from "../AbstractPromotionAdapter";
import { WorkTimeValidator } from "@webresto/worktime";
import Promotion from "../../../models/Promotion";
import Group from "../../../models/Group";
import Dish from "../../../models/Dish";
//MODEL TODO:Promotion";
//MODEL TODO:Group";
//MODEL TODO:Dish";
import ConfiguredPromotion from "./configuredPromotion";
import findModelInstanceByAttributes from "../../../libs/findModelInstance";
import PromotionCode from "../../../models/PromotionCode";
//MODEL TODO:PromotionCode";

export class PromotionAdapter extends AbstractPromotionAdapter {

Expand Down
3 changes: 0 additions & 3 deletions adapters/rms/RMSAdapter.d.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
import Order from "../../models/Order";
import Dish from "../../models/Dish";
import Group from "../../models/Group";
export type ConfigRMSAdapter = {
[key: string]: ConfigRMSAdapter | number | boolean | string | null | undefined;
};
Expand Down
3 changes: 3 additions & 0 deletions adapters/rms/RMSAdapter.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
//MODEL TODO:Order";
//MODEL TODO:Dish";
//MODEL TODO:Group";
const ObservablePromise_1 = require("../../libs/ObservablePromise");
/**
* An abstract RMS adapter class. Used to create new RMS adapters.
Expand Down
6 changes: 3 additions & 3 deletions adapters/rms/RMSAdapter.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Order from "../../models/Order";
import Dish from "../../models/Dish";
import Group from "../../models/Group";
//MODEL TODO:Order";
//MODEL TODO:Dish";
//MODEL TODO:Group";
import { ObservablePromise } from "../../libs/ObservablePromise";
export type ConfigRMSAdapter = {
[key: string]: ConfigRMSAdapter | number | boolean | string | null | undefined;
Expand Down
7 changes: 2 additions & 5 deletions hook/bindAdminpanel.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
"use strict";
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });
exports.default = bindAdminpanel;
const bind_1 = __importDefault(require("../libs/adminpanel/models/bind"));
//MODEL TODO:bind"
const ProductCatalog_1 = require("../libs/adminpanel/ProductCatalog/ProductCatalog");
function bindAdminpanel() {
sails.on('Adminpanel:afterHook:loaded', async () => {
Expand All @@ -18,7 +15,7 @@ function bindAdminpanel() {
function processBindAdminpanel() {
if (sails.hooks?.adminpanel?.addModelConfig !== undefined) {
const addModelConfig = sails.hooks.adminpanel.addModelConfig;
addModelConfig(bind_1.default);
addModelConfig(models);
}
if (Array.isArray(sails.config.adminpanel?.sections)) {
let baseRoute = sails.config.adminpanel.routePrefix;
Expand Down
2 changes: 1 addition & 1 deletion hook/bindAdminpanel.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import models from "../libs/adminpanel/models/bind"
//MODEL TODO:bind"
import { ProductCatalog } from "../libs/adminpanel/ProductCatalog/ProductCatalog";

export default function bindAdminpanel () {
Expand Down
1 change: 0 additions & 1 deletion interfaces/Customer.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { Phone } from "../models/User";
/**
* Описывает данные о заказчике для доставки
*/
Expand Down
1 change: 1 addition & 0 deletions interfaces/Customer.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
"use strict";
//MODEL TODO:User";
Object.defineProperty(exports, "__esModule", { value: true });
2 changes: 1 addition & 1 deletion interfaces/Customer.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Phone } from "../models/User";
//MODEL TODO:User";

/**
* Описывает данные о заказчике для доставки
Expand Down
1 change: 0 additions & 1 deletion interfaces/DialogBox.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import Dish from "../models/Dish";
export type DialogBoxConfig = DialogBoxButton | DialogBoxProduct;
interface DialogBoxBase {
askId?: string;
Expand Down
2 changes: 1 addition & 1 deletion interfaces/DialogBox.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Dish from "../models/Dish";
//MODEL TODO:Dish";
export type DialogBoxConfig = DialogBoxButton | DialogBoxProduct;
interface DialogBoxBase {
askId?: string
Expand Down
2 changes: 0 additions & 2 deletions interfaces/Modifier.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import Group from "../models/Group";
import Dish from "../models/Dish";
interface BaseModifier {
/**
* restocore dishId
Expand Down
2 changes: 2 additions & 0 deletions interfaces/Modifier.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
"use strict";
//MODEL TODO:Group";
//MODEL TODO:Dish";
Object.defineProperty(exports, "__esModule", { value: true });
4 changes: 2 additions & 2 deletions interfaces/Modifier.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Group from "../models/Group";
import Dish from "../models/Dish";
//MODEL TODO:Group";
//MODEL TODO:Dish";

interface BaseModifier {
/**
Expand Down
9 changes: 0 additions & 9 deletions libs/AwaitEmitter.d.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
type func = (...args: any) => any | Promise<any>;
import Group, { GetGroupType } from "../models/Group";
import Dish from "../models/Dish";
import PaymentDocument from "../models/PaymentDocument";
import Order, { PaymentBack } from '../models/Order';
import Customer from "../interfaces/Customer";
import Address from "../interfaces/Address";
import Settings from "../models/Settings";
import User from "../models/User";
import { Payment } from "../interfaces/Payment";
import OrderDish from "../models/OrderDish";
import Maintenance from "../models/Maintenance";
import { DialogBox } from "./DialogBox";
import Promotion from "../models/Promotion";
import { InitCheckout } from "./helpers/OrderHelper";
/**
* Naming conventions can greatly enhance the readability and understanding of code, especially for those who may not be familiar with it. Using a structured approach like "module:action-before/after-read/write" can make it intuitive. Let's break down the example "core:add-dish-before-write":
Expand Down
Loading

0 comments on commit 3b85e26

Please sign in to comment.