@webresto/graphql 1.4.0 → 1.4.2
Sign up to get free protection for your applications and to get access to all the features.
- package/lib/afterHook.js +5 -2
- package/lib/bindTranslations.js +25 -2
- package/lib/eventHelper.js +28 -2
- package/lib/graphqlHelper.js +26 -3
- package/lib/initialize.js +5 -2
- package/lib/jwt.js +24 -1
- package/package.json +2 -2
- package/src/graphql.js +27 -3
- package/src/graphql.ts +2 -1
- package/src/resolvers/checkout.js +28 -2
- package/src/resolvers/order.d.ts +120 -10
- package/src/resolvers/order.js +5 -2
- package/src/resolvers/restrictions.js +4 -1
- package/src/resolvers/telemetry.js +4 -1
- package/src/resolvers/user.js +5 -2
- package/src/resolvers/user.ts +1 -1
- package/src/resolvers/userLocation.js +4 -1
- package/src/resolvers/userOTPrequest.js +4 -1
- package/test/e2e_helper.js +29 -3
- package/test/integration/subscriptions.test.js +24 -1
- package/tsconfig.json +1 -0
- package/types/global.d.ts +28 -2
- package/types/global.ts +32 -2
package/lib/afterHook.js
CHANGED
@@ -1,7 +1,10 @@
|
|
1
1
|
"use strict";
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
|
+
};
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
const graphql_1 = require("../src/graphql");
|
4
|
-
const bindTranslations_1 = require("./bindTranslations");
|
6
|
+
const graphql_1 = __importDefault(require("../src/graphql"));
|
7
|
+
const bindTranslations_1 = __importDefault(require("./bindTranslations"));
|
5
8
|
let cache = null;
|
6
9
|
const eventHelper_1 = require("./eventHelper");
|
7
10
|
async function default_1() {
|
package/lib/bindTranslations.js
CHANGED
@@ -1,7 +1,30 @@
|
|
1
1
|
"use strict";
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
3
|
+
if (k2 === undefined) k2 = k;
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
7
|
+
}
|
8
|
+
Object.defineProperty(o, k2, desc);
|
9
|
+
}) : (function(o, m, k, k2) {
|
10
|
+
if (k2 === undefined) k2 = k;
|
11
|
+
o[k2] = m[k];
|
12
|
+
}));
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
15
|
+
}) : function(o, v) {
|
16
|
+
o["default"] = v;
|
17
|
+
});
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
19
|
+
if (mod && mod.__esModule) return mod;
|
20
|
+
var result = {};
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
22
|
+
__setModuleDefault(result, mod);
|
23
|
+
return result;
|
24
|
+
};
|
2
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
const path = require("path");
|
4
|
-
const fs = require("fs");
|
26
|
+
const path = __importStar(require("path"));
|
27
|
+
const fs = __importStar(require("fs"));
|
5
28
|
function bindTranslations() {
|
6
29
|
// load adminpanel translations
|
7
30
|
const moduleTranslationPath = path.resolve(__dirname, `../translations`);
|
package/lib/eventHelper.js
CHANGED
@@ -1,8 +1,34 @@
|
|
1
1
|
"use strict";
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
3
|
+
if (k2 === undefined) k2 = k;
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
7
|
+
}
|
8
|
+
Object.defineProperty(o, k2, desc);
|
9
|
+
}) : (function(o, m, k, k2) {
|
10
|
+
if (k2 === undefined) k2 = k;
|
11
|
+
o[k2] = m[k];
|
12
|
+
}));
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
15
|
+
}) : function(o, v) {
|
16
|
+
o["default"] = v;
|
17
|
+
});
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
19
|
+
if (mod && mod.__esModule) return mod;
|
20
|
+
var result = {};
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
22
|
+
__setModuleDefault(result, mod);
|
23
|
+
return result;
|
24
|
+
};
|
25
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
26
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
27
|
+
};
|
2
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
29
|
exports.getRandom = exports.sendAction = exports.sendMessage = void 0;
|
4
|
-
const graphql_1 = require("../src/graphql");
|
5
|
-
const crypto = require("crypto");
|
30
|
+
const graphql_1 = __importDefault(require("../src/graphql"));
|
31
|
+
const crypto = __importStar(require("crypto"));
|
6
32
|
exports.default = {
|
7
33
|
sendMessage,
|
8
34
|
sendAction,
|
package/lib/graphqlHelper.js
CHANGED
@@ -1,12 +1,35 @@
|
|
1
1
|
"use strict";
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
3
|
+
if (k2 === undefined) k2 = k;
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
7
|
+
}
|
8
|
+
Object.defineProperty(o, k2, desc);
|
9
|
+
}) : (function(o, m, k, k2) {
|
10
|
+
if (k2 === undefined) k2 = k;
|
11
|
+
o[k2] = m[k];
|
12
|
+
}));
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
15
|
+
}) : function(o, v) {
|
16
|
+
o["default"] = v;
|
17
|
+
});
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
19
|
+
if (mod && mod.__esModule) return mod;
|
20
|
+
var result = {};
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
22
|
+
__setModuleDefault(result, mod);
|
23
|
+
return result;
|
24
|
+
};
|
2
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
26
|
exports.setWhiteList = exports.addModelResolver = exports.addDirResolvers = exports.addAllSailsModels = exports.addToReplaceList = exports.addCustomField = exports.addToBlackList = exports.getSchema = exports.addResolvers = exports.addType = exports.addModel = void 0;
|
4
27
|
const _ = require("lodash");
|
5
28
|
const worktime_1 = require("@webresto/worktime");
|
6
|
-
const WLCriteria = require("waterline-criteria");
|
29
|
+
const WLCriteria = __importStar(require("waterline-criteria"));
|
7
30
|
const jwt_1 = require("./jwt");
|
8
|
-
const fs = require("fs");
|
9
|
-
const path = require("path");
|
31
|
+
const fs = __importStar(require("fs"));
|
32
|
+
const path = __importStar(require("path"));
|
10
33
|
const scalarTypes = {
|
11
34
|
string: "String",
|
12
35
|
number: "Float",
|
package/lib/initialize.js
CHANGED
@@ -1,7 +1,10 @@
|
|
1
1
|
"use strict";
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
|
+
};
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
const hookTools_1 = require("@webresto/core/libs/hookTools");
|
4
|
-
const afterHook_1 = require("@webresto/graphql/lib/afterHook");
|
6
|
+
const hookTools_1 = __importDefault(require("@webresto/core/libs/hookTools"));
|
7
|
+
const afterHook_1 = __importDefault(require("@webresto/graphql/lib/afterHook"));
|
5
8
|
function ToInitialize() {
|
6
9
|
/**
|
7
10
|
* List of hooks that required
|
package/lib/jwt.js
CHANGED
@@ -1,7 +1,30 @@
|
|
1
1
|
"use strict";
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
3
|
+
if (k2 === undefined) k2 = k;
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
7
|
+
}
|
8
|
+
Object.defineProperty(o, k2, desc);
|
9
|
+
}) : (function(o, m, k, k2) {
|
10
|
+
if (k2 === undefined) k2 = k;
|
11
|
+
o[k2] = m[k];
|
12
|
+
}));
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
15
|
+
}) : function(o, v) {
|
16
|
+
o["default"] = v;
|
17
|
+
});
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
19
|
+
if (mod && mod.__esModule) return mod;
|
20
|
+
var result = {};
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
22
|
+
__setModuleDefault(result, mod);
|
23
|
+
return result;
|
24
|
+
};
|
2
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
26
|
exports.JWTAuth = void 0;
|
4
|
-
const jwt = require("jsonwebtoken");
|
27
|
+
const jwt = __importStar(require("jsonwebtoken"));
|
5
28
|
class JWTAuth {
|
6
29
|
static sign(authData) {
|
7
30
|
return jwt.sign({
|
package/package.json
CHANGED
@@ -36,7 +36,7 @@
|
|
36
36
|
"faker": "^4.1.0",
|
37
37
|
"mocha": "^8.1.1",
|
38
38
|
"ts-node": "^10.7.0",
|
39
|
-
"typescript": "^3.
|
39
|
+
"typescript": "^5.3.3",
|
40
40
|
"i18n-2": "^0.7.3"
|
41
41
|
},
|
42
42
|
"deprecated": false,
|
@@ -68,5 +68,5 @@
|
|
68
68
|
"test:js": "mocha test/bootstrap.js './test/{,!(fixture)/**}/*.test.js' --exit",
|
69
69
|
"test:init": "cd ./test/fixture && npm i --no-package-lock --prefix ./ && cd -"
|
70
70
|
},
|
71
|
-
"version": "1.4.
|
71
|
+
"version": "1.4.2"
|
72
72
|
}
|
package/src/graphql.js
CHANGED
@@ -1,9 +1,32 @@
|
|
1
1
|
"use strict";
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
3
|
+
if (k2 === undefined) k2 = k;
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
7
|
+
}
|
8
|
+
Object.defineProperty(o, k2, desc);
|
9
|
+
}) : (function(o, m, k, k2) {
|
10
|
+
if (k2 === undefined) k2 = k;
|
11
|
+
o[k2] = m[k];
|
12
|
+
}));
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
15
|
+
}) : function(o, v) {
|
16
|
+
o["default"] = v;
|
17
|
+
});
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
19
|
+
if (mod && mod.__esModule) return mod;
|
20
|
+
var result = {};
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
22
|
+
__setModuleDefault(result, mod);
|
23
|
+
return result;
|
24
|
+
};
|
2
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
const helper = require("../lib/graphqlHelper");
|
26
|
+
const helper = __importStar(require("../lib/graphqlHelper"));
|
4
27
|
const _ = require("lodash");
|
5
28
|
const additionalResolvers_1 = require("./additionalResolvers");
|
6
|
-
const langParser = require("accept-language-parser");
|
29
|
+
const langParser = __importStar(require("accept-language-parser"));
|
7
30
|
const apollo_server_express_1 = require("apollo-server-express");
|
8
31
|
const fs = require("fs");
|
9
32
|
const path = require("path");
|
@@ -181,7 +204,7 @@ exports.default = {
|
|
181
204
|
emitter.on("send-message", "graphql", function ({ orderId, message }) {
|
182
205
|
pubsub.publish("message", { orderId, message });
|
183
206
|
});
|
184
|
-
emitter.on("core
|
207
|
+
emitter.on("core:dish-after-update", "graphql", function (record) {
|
185
208
|
pubsub.publish("dish-changed", record);
|
186
209
|
});
|
187
210
|
emitter.on("core-maintenance-enabled", "graphql", function (record) {
|
@@ -235,6 +258,7 @@ exports.default = {
|
|
235
258
|
path: error.path
|
236
259
|
},
|
237
260
|
};
|
261
|
+
sails.log.error(`Grahql error:`, JSON.stringify(graphQLFormattedError));
|
238
262
|
return graphQLFormattedError;
|
239
263
|
},
|
240
264
|
context: ({ req, connection }) => {
|
package/src/graphql.ts
CHANGED
@@ -201,7 +201,7 @@ export default {
|
|
201
201
|
emitter.on("send-message", "graphql", function ({ orderId, message }) {
|
202
202
|
pubsub.publish("message", { orderId, message });
|
203
203
|
});
|
204
|
-
emitter.on("core
|
204
|
+
emitter.on("core:dish-after-update", "graphql", function (record) {
|
205
205
|
pubsub.publish("dish-changed", record);
|
206
206
|
});
|
207
207
|
emitter.on("core-maintenance-enabled", "graphql", function (record) {
|
@@ -263,6 +263,7 @@ export default {
|
|
263
263
|
path: error.path
|
264
264
|
},
|
265
265
|
}
|
266
|
+
sails.log.error(`Grahql error:`, JSON.stringify(graphQLFormattedError));
|
266
267
|
return graphQLFormattedError;
|
267
268
|
},
|
268
269
|
context: ({ req, connection }) => {
|
@@ -1,7 +1,33 @@
|
|
1
1
|
"use strict";
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
3
|
+
if (k2 === undefined) k2 = k;
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
7
|
+
}
|
8
|
+
Object.defineProperty(o, k2, desc);
|
9
|
+
}) : (function(o, m, k, k2) {
|
10
|
+
if (k2 === undefined) k2 = k;
|
11
|
+
o[k2] = m[k];
|
12
|
+
}));
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
15
|
+
}) : function(o, v) {
|
16
|
+
o["default"] = v;
|
17
|
+
});
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
19
|
+
if (mod && mod.__esModule) return mod;
|
20
|
+
var result = {};
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
22
|
+
__setModuleDefault(result, mod);
|
23
|
+
return result;
|
24
|
+
};
|
25
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
26
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
27
|
+
};
|
2
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
const eventHelper = require("../../lib/eventHelper");
|
4
|
-
const graphqlHelper_1 = require("../../lib/graphqlHelper");
|
29
|
+
const eventHelper = __importStar(require("../../lib/eventHelper"));
|
30
|
+
const graphqlHelper_1 = __importDefault(require("../../lib/graphqlHelper"));
|
5
31
|
const jwt_1 = require("../../lib/jwt");
|
6
32
|
graphqlHelper_1.default.addType(`#graphql
|
7
33
|
input InputOrderCheckout {
|
package/src/resolvers/order.d.ts
CHANGED
@@ -7,6 +7,7 @@ declare const _default: {
|
|
7
7
|
updatedAt?: Date;
|
8
8
|
id?: string;
|
9
9
|
shortId?: string;
|
10
|
+
state?: string;
|
10
11
|
concept?: string;
|
11
12
|
isMixedConcept?: boolean;
|
12
13
|
dishes?: number[] | import("@webresto/core/models/OrderDish").default[];
|
@@ -14,6 +15,15 @@ declare const _default: {
|
|
14
15
|
paymentMethodTitle?: string;
|
15
16
|
paid?: boolean;
|
16
17
|
isPaymentPromise?: boolean;
|
18
|
+
promotionState?: import("@webresto/core/models/Order").PromotionState[];
|
19
|
+
promotionCode?: string | import("@webresto/core/models/PromotionCode").default;
|
20
|
+
promotionCodeDescription?: string;
|
21
|
+
promotionCodeString?: string;
|
22
|
+
promotionFlatDiscount?: number;
|
23
|
+
promotionDelivery?: import("@webresto/core/adapters/delivery/DeliveryAdapter").Delivery;
|
24
|
+
promotionCodeCheckValidTill?: string;
|
25
|
+
promotionUnorderable?: boolean;
|
26
|
+
isPromoting?: boolean;
|
17
27
|
dishesCount?: number;
|
18
28
|
uniqueDishes?: number;
|
19
29
|
modifiers?: any;
|
@@ -32,7 +42,9 @@ declare const _default: {
|
|
32
42
|
rmsErrorCode?: string;
|
33
43
|
rmsStatusCode?: string;
|
34
44
|
deliveryStatus?: string;
|
45
|
+
pickupPoint?: string | import("@webresto/core/models/Place").default;
|
35
46
|
selfService?: boolean;
|
47
|
+
delivery?: import("@webresto/core/adapters/delivery/DeliveryAdapter").Delivery;
|
36
48
|
deliveryDescription?: string;
|
37
49
|
message?: string;
|
38
50
|
deliveryItem?: string | import("@webresto/core/models/Dish").default;
|
@@ -49,7 +61,6 @@ declare const _default: {
|
|
49
61
|
deviceId?: string;
|
50
62
|
user?: string | import("@webresto/core/models/User").default;
|
51
63
|
customData?: any;
|
52
|
-
state?: string;
|
53
64
|
}>;
|
54
65
|
};
|
55
66
|
};
|
@@ -61,6 +72,7 @@ declare const _default: {
|
|
61
72
|
updatedAt?: Date;
|
62
73
|
id?: string;
|
63
74
|
shortId?: string;
|
75
|
+
state?: string;
|
64
76
|
concept?: string;
|
65
77
|
isMixedConcept?: boolean;
|
66
78
|
dishes?: number[] | import("@webresto/core/models/OrderDish").default[];
|
@@ -68,6 +80,15 @@ declare const _default: {
|
|
68
80
|
paymentMethodTitle?: string;
|
69
81
|
paid?: boolean;
|
70
82
|
isPaymentPromise?: boolean;
|
83
|
+
promotionState?: import("@webresto/core/models/Order").PromotionState[];
|
84
|
+
promotionCode?: string | import("@webresto/core/models/PromotionCode").default;
|
85
|
+
promotionCodeDescription?: string;
|
86
|
+
promotionCodeString?: string;
|
87
|
+
promotionFlatDiscount?: number;
|
88
|
+
promotionDelivery?: import("@webresto/core/adapters/delivery/DeliveryAdapter").Delivery;
|
89
|
+
promotionCodeCheckValidTill?: string;
|
90
|
+
promotionUnorderable?: boolean;
|
91
|
+
isPromoting?: boolean;
|
71
92
|
dishesCount?: number;
|
72
93
|
uniqueDishes?: number;
|
73
94
|
modifiers?: any;
|
@@ -86,7 +107,9 @@ declare const _default: {
|
|
86
107
|
rmsErrorCode?: string;
|
87
108
|
rmsStatusCode?: string;
|
88
109
|
deliveryStatus?: string;
|
110
|
+
pickupPoint?: string | import("@webresto/core/models/Place").default;
|
89
111
|
selfService?: boolean;
|
112
|
+
delivery?: import("@webresto/core/adapters/delivery/DeliveryAdapter").Delivery;
|
90
113
|
deliveryDescription?: string;
|
91
114
|
message?: string;
|
92
115
|
deliveryItem?: string | import("@webresto/core/models/Dish").default;
|
@@ -103,7 +126,6 @@ declare const _default: {
|
|
103
126
|
deviceId?: string;
|
104
127
|
user?: string | import("@webresto/core/models/User").default;
|
105
128
|
customData?: any;
|
106
|
-
state?: string;
|
107
129
|
}>;
|
108
130
|
};
|
109
131
|
orderReplaceDish: {
|
@@ -113,6 +135,7 @@ declare const _default: {
|
|
113
135
|
updatedAt?: Date;
|
114
136
|
id?: string;
|
115
137
|
shortId?: string;
|
138
|
+
state?: string;
|
116
139
|
concept?: string;
|
117
140
|
isMixedConcept?: boolean;
|
118
141
|
dishes?: number[] | import("@webresto/core/models/OrderDish").default[];
|
@@ -120,6 +143,15 @@ declare const _default: {
|
|
120
143
|
paymentMethodTitle?: string;
|
121
144
|
paid?: boolean;
|
122
145
|
isPaymentPromise?: boolean;
|
146
|
+
promotionState?: import("@webresto/core/models/Order").PromotionState[];
|
147
|
+
promotionCode?: string | import("@webresto/core/models/PromotionCode").default;
|
148
|
+
promotionCodeDescription?: string;
|
149
|
+
promotionCodeString?: string;
|
150
|
+
promotionFlatDiscount?: number;
|
151
|
+
promotionDelivery?: import("@webresto/core/adapters/delivery/DeliveryAdapter").Delivery;
|
152
|
+
promotionCodeCheckValidTill?: string;
|
153
|
+
promotionUnorderable?: boolean;
|
154
|
+
isPromoting?: boolean;
|
123
155
|
dishesCount?: number;
|
124
156
|
uniqueDishes?: number;
|
125
157
|
modifiers?: any;
|
@@ -138,7 +170,9 @@ declare const _default: {
|
|
138
170
|
rmsErrorCode?: string;
|
139
171
|
rmsStatusCode?: string;
|
140
172
|
deliveryStatus?: string;
|
173
|
+
pickupPoint?: string | import("@webresto/core/models/Place").default;
|
141
174
|
selfService?: boolean;
|
175
|
+
delivery?: import("@webresto/core/adapters/delivery/DeliveryAdapter").Delivery;
|
142
176
|
deliveryDescription?: string;
|
143
177
|
message?: string;
|
144
178
|
deliveryItem?: string | import("@webresto/core/models/Dish").default;
|
@@ -155,7 +189,6 @@ declare const _default: {
|
|
155
189
|
deviceId?: string;
|
156
190
|
user?: string | import("@webresto/core/models/User").default;
|
157
191
|
customData?: any;
|
158
|
-
state?: string;
|
159
192
|
}>;
|
160
193
|
};
|
161
194
|
orderRemoveDish: {
|
@@ -165,6 +198,7 @@ declare const _default: {
|
|
165
198
|
updatedAt?: Date;
|
166
199
|
id?: string;
|
167
200
|
shortId?: string;
|
201
|
+
state?: string;
|
168
202
|
concept?: string;
|
169
203
|
isMixedConcept?: boolean;
|
170
204
|
dishes?: number[] | import("@webresto/core/models/OrderDish").default[];
|
@@ -172,6 +206,15 @@ declare const _default: {
|
|
172
206
|
paymentMethodTitle?: string;
|
173
207
|
paid?: boolean;
|
174
208
|
isPaymentPromise?: boolean;
|
209
|
+
promotionState?: import("@webresto/core/models/Order").PromotionState[];
|
210
|
+
promotionCode?: string | import("@webresto/core/models/PromotionCode").default;
|
211
|
+
promotionCodeDescription?: string;
|
212
|
+
promotionCodeString?: string;
|
213
|
+
promotionFlatDiscount?: number;
|
214
|
+
promotionDelivery?: import("@webresto/core/adapters/delivery/DeliveryAdapter").Delivery;
|
215
|
+
promotionCodeCheckValidTill?: string;
|
216
|
+
promotionUnorderable?: boolean;
|
217
|
+
isPromoting?: boolean;
|
175
218
|
dishesCount?: number;
|
176
219
|
uniqueDishes?: number;
|
177
220
|
modifiers?: any;
|
@@ -190,7 +233,9 @@ declare const _default: {
|
|
190
233
|
rmsErrorCode?: string;
|
191
234
|
rmsStatusCode?: string;
|
192
235
|
deliveryStatus?: string;
|
236
|
+
pickupPoint?: string | import("@webresto/core/models/Place").default;
|
193
237
|
selfService?: boolean;
|
238
|
+
delivery?: import("@webresto/core/adapters/delivery/DeliveryAdapter").Delivery;
|
194
239
|
deliveryDescription?: string;
|
195
240
|
message?: string;
|
196
241
|
deliveryItem?: string | import("@webresto/core/models/Dish").default;
|
@@ -207,7 +252,6 @@ declare const _default: {
|
|
207
252
|
deviceId?: string;
|
208
253
|
user?: string | import("@webresto/core/models/User").default;
|
209
254
|
customData?: any;
|
210
|
-
state?: string;
|
211
255
|
}>;
|
212
256
|
};
|
213
257
|
orderSetDishAmount: {
|
@@ -217,6 +261,7 @@ declare const _default: {
|
|
217
261
|
updatedAt?: Date;
|
218
262
|
id?: string;
|
219
263
|
shortId?: string;
|
264
|
+
state?: string;
|
220
265
|
concept?: string;
|
221
266
|
isMixedConcept?: boolean;
|
222
267
|
dishes?: number[] | import("@webresto/core/models/OrderDish").default[];
|
@@ -224,6 +269,15 @@ declare const _default: {
|
|
224
269
|
paymentMethodTitle?: string;
|
225
270
|
paid?: boolean;
|
226
271
|
isPaymentPromise?: boolean;
|
272
|
+
promotionState?: import("@webresto/core/models/Order").PromotionState[];
|
273
|
+
promotionCode?: string | import("@webresto/core/models/PromotionCode").default;
|
274
|
+
promotionCodeDescription?: string;
|
275
|
+
promotionCodeString?: string;
|
276
|
+
promotionFlatDiscount?: number;
|
277
|
+
promotionDelivery?: import("@webresto/core/adapters/delivery/DeliveryAdapter").Delivery;
|
278
|
+
promotionCodeCheckValidTill?: string;
|
279
|
+
promotionUnorderable?: boolean;
|
280
|
+
isPromoting?: boolean;
|
227
281
|
dishesCount?: number;
|
228
282
|
uniqueDishes?: number;
|
229
283
|
modifiers?: any;
|
@@ -242,7 +296,9 @@ declare const _default: {
|
|
242
296
|
rmsErrorCode?: string;
|
243
297
|
rmsStatusCode?: string;
|
244
298
|
deliveryStatus?: string;
|
299
|
+
pickupPoint?: string | import("@webresto/core/models/Place").default;
|
245
300
|
selfService?: boolean;
|
301
|
+
delivery?: import("@webresto/core/adapters/delivery/DeliveryAdapter").Delivery;
|
246
302
|
deliveryDescription?: string;
|
247
303
|
message?: string;
|
248
304
|
deliveryItem?: string | import("@webresto/core/models/Dish").default;
|
@@ -259,7 +315,6 @@ declare const _default: {
|
|
259
315
|
deviceId?: string;
|
260
316
|
user?: string | import("@webresto/core/models/User").default;
|
261
317
|
customData?: any;
|
262
|
-
state?: string;
|
263
318
|
}>;
|
264
319
|
};
|
265
320
|
orderSetDishComment: {
|
@@ -269,6 +324,7 @@ declare const _default: {
|
|
269
324
|
updatedAt?: Date;
|
270
325
|
id?: string;
|
271
326
|
shortId?: string;
|
327
|
+
state?: string;
|
272
328
|
concept?: string;
|
273
329
|
isMixedConcept?: boolean;
|
274
330
|
dishes?: number[] | import("@webresto/core/models/OrderDish").default[];
|
@@ -276,6 +332,15 @@ declare const _default: {
|
|
276
332
|
paymentMethodTitle?: string;
|
277
333
|
paid?: boolean;
|
278
334
|
isPaymentPromise?: boolean;
|
335
|
+
promotionState?: import("@webresto/core/models/Order").PromotionState[];
|
336
|
+
promotionCode?: string | import("@webresto/core/models/PromotionCode").default;
|
337
|
+
promotionCodeDescription?: string;
|
338
|
+
promotionCodeString?: string;
|
339
|
+
promotionFlatDiscount?: number;
|
340
|
+
promotionDelivery?: import("@webresto/core/adapters/delivery/DeliveryAdapter").Delivery;
|
341
|
+
promotionCodeCheckValidTill?: string;
|
342
|
+
promotionUnorderable?: boolean;
|
343
|
+
isPromoting?: boolean;
|
279
344
|
dishesCount?: number;
|
280
345
|
uniqueDishes?: number;
|
281
346
|
modifiers?: any;
|
@@ -294,7 +359,9 @@ declare const _default: {
|
|
294
359
|
rmsErrorCode?: string;
|
295
360
|
rmsStatusCode?: string;
|
296
361
|
deliveryStatus?: string;
|
362
|
+
pickupPoint?: string | import("@webresto/core/models/Place").default;
|
297
363
|
selfService?: boolean;
|
364
|
+
delivery?: import("@webresto/core/adapters/delivery/DeliveryAdapter").Delivery;
|
298
365
|
deliveryDescription?: string;
|
299
366
|
message?: string;
|
300
367
|
deliveryItem?: string | import("@webresto/core/models/Dish").default;
|
@@ -311,7 +378,6 @@ declare const _default: {
|
|
311
378
|
deviceId?: string;
|
312
379
|
user?: string | import("@webresto/core/models/User").default;
|
313
380
|
customData?: any;
|
314
|
-
state?: string;
|
315
381
|
}>;
|
316
382
|
};
|
317
383
|
orderUpdate: {
|
@@ -321,6 +387,7 @@ declare const _default: {
|
|
321
387
|
updatedAt?: Date;
|
322
388
|
id?: string;
|
323
389
|
shortId?: string;
|
390
|
+
state?: string;
|
324
391
|
concept?: string;
|
325
392
|
isMixedConcept?: boolean;
|
326
393
|
dishes?: number[] | import("@webresto/core/models/OrderDish").default[];
|
@@ -328,6 +395,15 @@ declare const _default: {
|
|
328
395
|
paymentMethodTitle?: string;
|
329
396
|
paid?: boolean;
|
330
397
|
isPaymentPromise?: boolean;
|
398
|
+
promotionState?: import("@webresto/core/models/Order").PromotionState[];
|
399
|
+
promotionCode?: string | import("@webresto/core/models/PromotionCode").default;
|
400
|
+
promotionCodeDescription?: string;
|
401
|
+
promotionCodeString?: string;
|
402
|
+
promotionFlatDiscount?: number;
|
403
|
+
promotionDelivery?: import("@webresto/core/adapters/delivery/DeliveryAdapter").Delivery;
|
404
|
+
promotionCodeCheckValidTill?: string;
|
405
|
+
promotionUnorderable?: boolean;
|
406
|
+
isPromoting?: boolean;
|
331
407
|
dishesCount?: number;
|
332
408
|
uniqueDishes?: number;
|
333
409
|
modifiers?: any;
|
@@ -346,7 +422,9 @@ declare const _default: {
|
|
346
422
|
rmsErrorCode?: string;
|
347
423
|
rmsStatusCode?: string;
|
348
424
|
deliveryStatus?: string;
|
425
|
+
pickupPoint?: string | import("@webresto/core/models/Place").default;
|
349
426
|
selfService?: boolean;
|
427
|
+
delivery?: import("@webresto/core/adapters/delivery/DeliveryAdapter").Delivery;
|
350
428
|
deliveryDescription?: string;
|
351
429
|
message?: string;
|
352
430
|
deliveryItem?: string | import("@webresto/core/models/Dish").default;
|
@@ -363,7 +441,6 @@ declare const _default: {
|
|
363
441
|
deviceId?: string;
|
364
442
|
user?: string | import("@webresto/core/models/User").default;
|
365
443
|
customData?: any;
|
366
|
-
state?: string;
|
367
444
|
}>;
|
368
445
|
};
|
369
446
|
orderClone: {
|
@@ -373,6 +450,7 @@ declare const _default: {
|
|
373
450
|
updatedAt?: Date;
|
374
451
|
id?: string;
|
375
452
|
shortId?: string;
|
453
|
+
state?: string;
|
376
454
|
concept?: string;
|
377
455
|
isMixedConcept?: boolean;
|
378
456
|
dishes?: number[] | import("@webresto/core/models/OrderDish").default[];
|
@@ -380,6 +458,15 @@ declare const _default: {
|
|
380
458
|
paymentMethodTitle?: string;
|
381
459
|
paid?: boolean;
|
382
460
|
isPaymentPromise?: boolean;
|
461
|
+
promotionState?: import("@webresto/core/models/Order").PromotionState[];
|
462
|
+
promotionCode?: string | import("@webresto/core/models/PromotionCode").default;
|
463
|
+
promotionCodeDescription?: string;
|
464
|
+
promotionCodeString?: string;
|
465
|
+
promotionFlatDiscount?: number;
|
466
|
+
promotionDelivery?: import("@webresto/core/adapters/delivery/DeliveryAdapter").Delivery;
|
467
|
+
promotionCodeCheckValidTill?: string;
|
468
|
+
promotionUnorderable?: boolean;
|
469
|
+
isPromoting?: boolean;
|
383
470
|
dishesCount?: number;
|
384
471
|
uniqueDishes?: number;
|
385
472
|
modifiers?: any;
|
@@ -398,7 +485,9 @@ declare const _default: {
|
|
398
485
|
rmsErrorCode?: string;
|
399
486
|
rmsStatusCode?: string;
|
400
487
|
deliveryStatus?: string;
|
488
|
+
pickupPoint?: string | import("@webresto/core/models/Place").default;
|
401
489
|
selfService?: boolean;
|
490
|
+
delivery?: import("@webresto/core/adapters/delivery/DeliveryAdapter").Delivery;
|
402
491
|
deliveryDescription?: string;
|
403
492
|
message?: string;
|
404
493
|
deliveryItem?: string | import("@webresto/core/models/Dish").default;
|
@@ -415,7 +504,6 @@ declare const _default: {
|
|
415
504
|
deviceId?: string;
|
416
505
|
user?: string | import("@webresto/core/models/User").default;
|
417
506
|
customData?: any;
|
418
|
-
state?: string;
|
419
507
|
}>;
|
420
508
|
};
|
421
509
|
orderPromocodeApply: {
|
@@ -425,6 +513,7 @@ declare const _default: {
|
|
425
513
|
updatedAt?: Date;
|
426
514
|
id?: string;
|
427
515
|
shortId?: string;
|
516
|
+
state?: string;
|
428
517
|
concept?: string;
|
429
518
|
isMixedConcept?: boolean;
|
430
519
|
dishes?: number[] | import("@webresto/core/models/OrderDish").default[];
|
@@ -432,6 +521,15 @@ declare const _default: {
|
|
432
521
|
paymentMethodTitle?: string;
|
433
522
|
paid?: boolean;
|
434
523
|
isPaymentPromise?: boolean;
|
524
|
+
promotionState?: import("@webresto/core/models/Order").PromotionState[];
|
525
|
+
promotionCode?: string | import("@webresto/core/models/PromotionCode").default;
|
526
|
+
promotionCodeDescription?: string;
|
527
|
+
promotionCodeString?: string;
|
528
|
+
promotionFlatDiscount?: number;
|
529
|
+
promotionDelivery?: import("@webresto/core/adapters/delivery/DeliveryAdapter").Delivery;
|
530
|
+
promotionCodeCheckValidTill?: string;
|
531
|
+
promotionUnorderable?: boolean;
|
532
|
+
isPromoting?: boolean;
|
435
533
|
dishesCount?: number;
|
436
534
|
uniqueDishes?: number;
|
437
535
|
modifiers?: any;
|
@@ -450,7 +548,9 @@ declare const _default: {
|
|
450
548
|
rmsErrorCode?: string;
|
451
549
|
rmsStatusCode?: string;
|
452
550
|
deliveryStatus?: string;
|
551
|
+
pickupPoint?: string | import("@webresto/core/models/Place").default;
|
453
552
|
selfService?: boolean;
|
553
|
+
delivery?: import("@webresto/core/adapters/delivery/DeliveryAdapter").Delivery;
|
454
554
|
deliveryDescription?: string;
|
455
555
|
message?: string;
|
456
556
|
deliveryItem?: string | import("@webresto/core/models/Dish").default;
|
@@ -467,7 +567,6 @@ declare const _default: {
|
|
467
567
|
deviceId?: string;
|
468
568
|
user?: string | import("@webresto/core/models/User").default;
|
469
569
|
customData?: any;
|
470
|
-
state?: string;
|
471
570
|
}>;
|
472
571
|
};
|
473
572
|
orderPromocodeReset: {
|
@@ -477,6 +576,7 @@ declare const _default: {
|
|
477
576
|
updatedAt?: Date;
|
478
577
|
id?: string;
|
479
578
|
shortId?: string;
|
579
|
+
state?: string;
|
480
580
|
concept?: string;
|
481
581
|
isMixedConcept?: boolean;
|
482
582
|
dishes?: number[] | import("@webresto/core/models/OrderDish").default[];
|
@@ -484,6 +584,15 @@ declare const _default: {
|
|
484
584
|
paymentMethodTitle?: string;
|
485
585
|
paid?: boolean;
|
486
586
|
isPaymentPromise?: boolean;
|
587
|
+
promotionState?: import("@webresto/core/models/Order").PromotionState[];
|
588
|
+
promotionCode?: string | import("@webresto/core/models/PromotionCode").default;
|
589
|
+
promotionCodeDescription?: string;
|
590
|
+
promotionCodeString?: string;
|
591
|
+
promotionFlatDiscount?: number;
|
592
|
+
promotionDelivery?: import("@webresto/core/adapters/delivery/DeliveryAdapter").Delivery;
|
593
|
+
promotionCodeCheckValidTill?: string;
|
594
|
+
promotionUnorderable?: boolean;
|
595
|
+
isPromoting?: boolean;
|
487
596
|
dishesCount?: number;
|
488
597
|
uniqueDishes?: number;
|
489
598
|
modifiers?: any;
|
@@ -502,7 +611,9 @@ declare const _default: {
|
|
502
611
|
rmsErrorCode?: string;
|
503
612
|
rmsStatusCode?: string;
|
504
613
|
deliveryStatus?: string;
|
614
|
+
pickupPoint?: string | import("@webresto/core/models/Place").default;
|
505
615
|
selfService?: boolean;
|
616
|
+
delivery?: import("@webresto/core/adapters/delivery/DeliveryAdapter").Delivery;
|
506
617
|
deliveryDescription?: string;
|
507
618
|
message?: string;
|
508
619
|
deliveryItem?: string | import("@webresto/core/models/Dish").default;
|
@@ -519,7 +630,6 @@ declare const _default: {
|
|
519
630
|
deviceId?: string;
|
520
631
|
user?: string | import("@webresto/core/models/User").default;
|
521
632
|
customData?: any;
|
522
|
-
state?: string;
|
523
633
|
}>;
|
524
634
|
};
|
525
635
|
};
|
package/src/resolvers/order.js
CHANGED
@@ -1,11 +1,14 @@
|
|
1
1
|
"use strict";
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
|
+
};
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
const checkExpression_1 = require("@webresto/core/libs/checkExpression");
|
6
|
+
const checkExpression_1 = __importDefault(require("@webresto/core/libs/checkExpression"));
|
4
7
|
const jwt_1 = require("../../lib/jwt");
|
5
8
|
const graphqlHelper_1 = require("@webresto/graphql/lib/graphqlHelper");
|
6
9
|
(0, graphqlHelper_1.addToReplaceList)("Order.promotionState", "promotionState: [PromotionState]");
|
7
10
|
(0, graphqlHelper_1.addToReplaceList)("Order.pickupPoint", "pickupPoint: PickupPoint");
|
8
|
-
const graphqlHelper_2 = require("../../lib/graphqlHelper");
|
11
|
+
const graphqlHelper_2 = __importDefault(require("../../lib/graphqlHelper"));
|
9
12
|
graphqlHelper_2.default.addType(`#graphql
|
10
13
|
input InputOrderUpdate {
|
11
14
|
id: String!
|
@@ -1,6 +1,9 @@
|
|
1
1
|
"use strict";
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
|
+
};
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
const graphqlHelper_1 = require("../../lib/graphqlHelper");
|
6
|
+
const graphqlHelper_1 = __importDefault(require("../../lib/graphqlHelper"));
|
4
7
|
graphqlHelper_1.default.addType(`#graphql
|
5
8
|
type UserRestrictions {
|
6
9
|
"Indicate main login field"
|
@@ -1,6 +1,9 @@
|
|
1
1
|
"use strict";
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
|
+
};
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
const graphqlHelper_1 = require("../../lib/graphqlHelper");
|
6
|
+
const graphqlHelper_1 = __importDefault(require("../../lib/graphqlHelper"));
|
4
7
|
graphqlHelper_1.default.addType(`#graphql
|
5
8
|
type Telemetry {
|
6
9
|
"System uptime in seconds"
|
package/src/resolvers/user.js
CHANGED
@@ -1,10 +1,13 @@
|
|
1
1
|
"use strict";
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
|
+
};
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
6
|
// const userAuth = sails.config.restographql.authService;
|
4
7
|
const jwt_1 = require("../../lib/jwt");
|
5
8
|
const adapters_1 = require("@webresto/core/adapters");
|
6
9
|
let captchaAdapter = adapters_1.Captcha.getAdapter();
|
7
|
-
const graphqlHelper_1 = require("../../lib/graphqlHelper");
|
10
|
+
const graphqlHelper_1 = __importDefault(require("../../lib/graphqlHelper"));
|
8
11
|
graphqlHelper_1.default.addType(`#graphql
|
9
12
|
type UserResponse {
|
10
13
|
user: User
|
@@ -397,7 +400,7 @@ exports.default = {
|
|
397
400
|
): Response`,
|
398
401
|
fn: async (parent, payload, context, info) => {
|
399
402
|
const auth = await jwt_1.JWTAuth.verify(context.connectionParams.authorization);
|
400
|
-
await User.delete(auth.userId, payload.otp);
|
403
|
+
await User.delete(auth.userId, payload.otp, false);
|
401
404
|
let message = {
|
402
405
|
deviceId: null,
|
403
406
|
title: context.i18n.__("Success"),
|
package/src/resolvers/user.ts
CHANGED
@@ -1,10 +1,13 @@
|
|
1
1
|
"use strict";
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
|
+
};
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
6
|
// const userAuth = sails.config.restographql.authService;
|
4
7
|
const jwt_1 = require("../../lib/jwt");
|
5
8
|
const adapters_1 = require("@webresto/core/adapters");
|
6
9
|
let captchaAdapter = adapters_1.Captcha.getAdapter();
|
7
|
-
const graphqlHelper_1 = require("../../lib/graphqlHelper");
|
10
|
+
const graphqlHelper_1 = __importDefault(require("../../lib/graphqlHelper"));
|
8
11
|
graphqlHelper_1.default.addType(`#graphql
|
9
12
|
input InputLocation {
|
10
13
|
street: String
|
@@ -1,11 +1,14 @@
|
|
1
1
|
"use strict";
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
|
+
};
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
6
|
// const userAuth = sails.config.restographql.authService;
|
4
7
|
const adapters_1 = require("@webresto/core/adapters");
|
5
8
|
const adapters_2 = require("@webresto/core/adapters");
|
6
9
|
let captchaAdapter = adapters_1.Captcha.getAdapter();
|
7
10
|
let OTPAdapter = adapters_2.OTP.getAdapter();
|
8
|
-
const graphqlHelper_1 = require("../../lib/graphqlHelper");
|
11
|
+
const graphqlHelper_1 = __importDefault(require("../../lib/graphqlHelper"));
|
9
12
|
graphqlHelper_1.default.addType(`#graphql
|
10
13
|
type OTPResponse {
|
11
14
|
id: String
|
package/test/e2e_helper.js
CHANGED
@@ -3,13 +3,39 @@
|
|
3
3
|
// E2E Test Setup
|
4
4
|
// e2e_helpers.js
|
5
5
|
//
|
6
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
7
|
+
if (k2 === undefined) k2 = k;
|
8
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
9
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
10
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
11
|
+
}
|
12
|
+
Object.defineProperty(o, k2, desc);
|
13
|
+
}) : (function(o, m, k, k2) {
|
14
|
+
if (k2 === undefined) k2 = k;
|
15
|
+
o[k2] = m[k];
|
16
|
+
}));
|
17
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
18
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
19
|
+
}) : function(o, v) {
|
20
|
+
o["default"] = v;
|
21
|
+
});
|
22
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
23
|
+
if (mod && mod.__esModule) return mod;
|
24
|
+
var result = {};
|
25
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
26
|
+
__setModuleDefault(result, mod);
|
27
|
+
return result;
|
28
|
+
};
|
29
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
30
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
31
|
+
};
|
6
32
|
Object.defineProperty(exports, "__esModule", { value: true });
|
7
33
|
exports.runGQL = exports.createSubscription = exports.TestApolloClient = void 0;
|
8
34
|
const utilities_1 = require("@apollo/client/utilities");
|
9
35
|
const ws_1 = require("@apollo/client/link/ws");
|
10
|
-
const cross_fetch_1 = require("cross-fetch");
|
11
|
-
const ws = require("ws");
|
12
|
-
const axios_1 = require("axios");
|
36
|
+
const cross_fetch_1 = __importDefault(require("cross-fetch"));
|
37
|
+
const ws = __importStar(require("ws"));
|
38
|
+
const axios_1 = __importDefault(require("axios"));
|
13
39
|
const client_1 = require("@apollo/client");
|
14
40
|
const host = "127.0.0.1";
|
15
41
|
const port = process.env.PORT === undefined ? "42772" : process.env.PORT;
|
@@ -1,7 +1,30 @@
|
|
1
1
|
"use strict";
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
3
|
+
if (k2 === undefined) k2 = k;
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
7
|
+
}
|
8
|
+
Object.defineProperty(o, k2, desc);
|
9
|
+
}) : (function(o, m, k, k2) {
|
10
|
+
if (k2 === undefined) k2 = k;
|
11
|
+
o[k2] = m[k];
|
12
|
+
}));
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
15
|
+
}) : function(o, v) {
|
16
|
+
o["default"] = v;
|
17
|
+
});
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
19
|
+
if (mod && mod.__esModule) return mod;
|
20
|
+
var result = {};
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
22
|
+
__setModuleDefault(result, mod);
|
23
|
+
return result;
|
24
|
+
};
|
2
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
26
|
const chai_1 = require("chai");
|
4
|
-
const e2e = require("../e2e_helper");
|
27
|
+
const e2e = __importStar(require("../e2e_helper"));
|
5
28
|
const e2e_helper_1 = require("../e2e_helper");
|
6
29
|
const apollo_server_core_1 = require("apollo-server-core");
|
7
30
|
const e2e_helper_2 = require("../e2e_helper");
|
package/tsconfig.json
CHANGED
package/types/global.d.ts
CHANGED
@@ -1,11 +1,13 @@
|
|
1
1
|
import sails from "@42pub/typed-sails";
|
2
2
|
import { Config } from "@webresto/core/interfaces/Config";
|
3
3
|
import AwaitEmitter from "@webresto/core/libs/AwaitEmitter";
|
4
|
-
import
|
4
|
+
import BonusProgram from "@webresto/core/models/BonusProgram";
|
5
|
+
import PaymentMethod from "@webresto/core/models/PaymentMethod";
|
6
|
+
import Order from "@webresto/core/models/Order";
|
5
7
|
type sailsConfig = typeof sails.config;
|
6
8
|
declare global {
|
7
9
|
const emitter: AwaitEmitter;
|
8
|
-
const NotificationManager: NotificationManager;
|
10
|
+
const NotificationManager: typeof import("@webresto/core/libs/NotificationManager").NotificationManager;
|
9
11
|
const Adapter: typeof import("@webresto/core/adapters").Adapter;
|
10
12
|
export interface Sails extends sails.Sails {
|
11
13
|
on: any;
|
@@ -27,4 +29,28 @@ declare global {
|
|
27
29
|
type ResType = sails.Response;
|
28
30
|
type PropType<TObj, TProp extends keyof TObj> = TObj[TProp];
|
29
31
|
}
|
32
|
+
declare global {
|
33
|
+
interface IAwaitEmitter {
|
34
|
+
[key: `graphql-query-${string}`]: [any];
|
35
|
+
[key: `http-api:before-send-${string}`]: [any];
|
36
|
+
'graphql-return-payment-method': [string, PaymentMethod[]];
|
37
|
+
"http-api:create-newcart": [Order];
|
38
|
+
"http-api:init-newcart": [Order];
|
39
|
+
"http-api:before-response-order-update": [Order];
|
40
|
+
/**
|
41
|
+
* В данном случае надо указывать PopulatedOrder
|
42
|
+
*/
|
43
|
+
"http-api:before-response-order-set-dish-comment": [Order];
|
44
|
+
"http-api:before-response-order-set-dish-amount": [Order];
|
45
|
+
"http-api:before-response-order-remove-dish": [Order];
|
46
|
+
"http-api:before-response-order-replace-dish": [Order];
|
47
|
+
"http-api:before-response-order-add-dish": [Order];
|
48
|
+
"http-api:before-response-order": [Order];
|
49
|
+
"graphql-return-bonus-program": [string, BonusProgram[]];
|
50
|
+
"send-message": [{
|
51
|
+
orderId: string;
|
52
|
+
message: any;
|
53
|
+
}];
|
54
|
+
}
|
55
|
+
}
|
30
56
|
export {};
|
package/types/global.ts
CHANGED
@@ -1,12 +1,16 @@
|
|
1
1
|
import sails from "@42pub/typed-sails";
|
2
2
|
import { Config } from "@webresto/core/interfaces/Config";
|
3
3
|
import AwaitEmitter from "@webresto/core/libs/AwaitEmitter";
|
4
|
-
import
|
4
|
+
import BonusProgram from "@webresto/core/models/BonusProgram";
|
5
|
+
import PaymentMethod from "@webresto/core/models/PaymentMethod";
|
6
|
+
import Order from "@webresto/core/models/Order";
|
7
|
+
import Dish from "@webresto/core/models/Dish";
|
8
|
+
|
5
9
|
type sailsConfig = typeof sails.config;
|
6
10
|
|
7
11
|
declare global {
|
8
12
|
const emitter: AwaitEmitter;
|
9
|
-
const NotificationManager: NotificationManager
|
13
|
+
const NotificationManager: typeof import("@webresto/core/libs/NotificationManager").NotificationManager
|
10
14
|
const Adapter: typeof import("@webresto/core/adapters").Adapter
|
11
15
|
|
12
16
|
export interface Sails extends sails.Sails {
|
@@ -28,4 +32,30 @@ declare global {
|
|
28
32
|
type ReqType = sails.Request;
|
29
33
|
type ResType = sails.Response;
|
30
34
|
type PropType<TObj, TProp extends keyof TObj> = TObj[TProp];
|
35
|
+
}
|
36
|
+
|
37
|
+
declare global {
|
38
|
+
interface IAwaitEmitter {
|
39
|
+
[key: `graphql-query-${string}`]: [any];
|
40
|
+
[key: `http-api:before-send-${string}`]: [any];
|
41
|
+
'graphql-return-payment-method': [string, PaymentMethod[]]
|
42
|
+
"http-api:create-newcart": [Order]
|
43
|
+
"http-api:init-newcart": [Order]
|
44
|
+
"http-api:before-response-order-update": [Order]
|
45
|
+
|
46
|
+
/**
|
47
|
+
* В данном случае надо указывать PopulatedOrder
|
48
|
+
*/
|
49
|
+
"http-api:before-response-order-set-dish-comment": [Order]
|
50
|
+
"http-api:before-response-order-set-dish-amount": [Order]
|
51
|
+
"http-api:before-response-order-remove-dish": [Order]
|
52
|
+
"http-api:before-response-order-replace-dish":[Order]
|
53
|
+
"http-api:before-response-order-add-dish": [Order]
|
54
|
+
"http-api:before-response-order": [Order]
|
55
|
+
"graphql-return-bonus-program": [string, BonusProgram[]]
|
56
|
+
|
57
|
+
"send-message": [{orderId: string, message: any}]
|
58
|
+
|
59
|
+
|
60
|
+
}
|
31
61
|
}
|