@chevre/domain 20.14.0-alpha.0 → 20.14.0-alpha.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/lib/chevre/repo/mongoose/model/task.js +6 -0
  2. package/lib/chevre/repo/task.d.ts +1 -0
  3. package/lib/chevre/repo/task.js +26 -9
  4. package/lib/chevre/service/payment/movieTicket/checkByIdentifier.d.ts +0 -1
  5. package/lib/chevre/service/payment/movieTicket/checkByIdentifier.js +8 -90
  6. package/package.json +3 -3
package/lib/chevre/repo/mongoose/model/task.js CHANGED
@@ -87,6 +87,12 @@ schema.index({ 'data.object.transactionNumber': 1, runsAt: -1 }, {
87
87
  'data.object.transactionNumber': { $exists: true }
88
88
  }
89
89
  });
90
+ schema.index({ 'data.object.id': 1, runsAt: -1 }, {
91
+ name: 'searchByDataObjectId',
92
+ partialFilterExpression: {
93
+ 'data.object.id': { $exists: true }
94
+ }
95
+ });
90
96
  schema.index({ 'data.purpose.id': 1, runsAt: -1 }, {
91
97
  name: 'searchByDataPurposeId',
92
98
  partialFilterExpression: {
package/lib/chevre/repo/task.d.ts CHANGED
@@ -25,6 +25,7 @@ export declare class MongoRepository {
25
25
  constructor(connection: Connection);
26
26
  static CREATE_MONGO_CONDITIONS(params: factory.task.ISearchConditions): any[];
27
27
  saveMany(taskAttributes: factory.task.IAttributes<factory.taskName>[]): Promise<any[]>;
28
+ createInformTaskIfNotExist(params: factory.task.IAttributes<factory.taskName.TriggerWebhook>): Promise<void>;
28
29
  executeOneByName<T extends factory.taskName>(params: {
29
30
  name: T;
30
31
  }): Promise<factory.task.ITask<T> | null>;
package/lib/chevre/repo/task.js CHANGED
@@ -29,7 +29,7 @@ class MongoRepository {
29
29
  }
30
30
  // tslint:disable-next-line:max-func-body-length
31
31
  static CREATE_MONGO_CONDITIONS(params) {
32
- var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
32
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
33
33
  const andConditions = [];
34
34
  const idEq = (_a = params.id) === null || _a === void 0 ? void 0 : _a.$eq;
35
35
  if (typeof idEq === 'string') {
@@ -111,7 +111,16 @@ class MongoRepository {
111
111
  }
112
112
  });
113
113
  }
114
- const objectTransactionNumberEq = (_k = (_j = (_h = params.data) === null || _h === void 0 ? void 0 : _h.object) === null || _j === void 0 ? void 0 : _j.transactionNumber) === null || _k === void 0 ? void 0 : _k.$eq;
114
+ const objectIdEq = (_k = (_j = (_h = params.data) === null || _h === void 0 ? void 0 : _h.object) === null || _j === void 0 ? void 0 : _j.id) === null || _k === void 0 ? void 0 : _k.$eq;
115
+ if (typeof objectIdEq === 'string') {
116
+ andConditions.push({
117
+ 'data.object.id': {
118
+ $exists: true,
119
+ $eq: objectIdEq
120
+ }
121
+ });
122
+ }
123
+ const objectTransactionNumberEq = (_o = (_m = (_l = params.data) === null || _l === void 0 ? void 0 : _l.object) === null || _m === void 0 ? void 0 : _m.transactionNumber) === null || _o === void 0 ? void 0 : _o.$eq;
115
124
  if (typeof objectTransactionNumberEq === 'string') {
116
125
  andConditions.push({
117
126
  'data.object.transactionNumber': {
@@ -120,7 +129,7 @@ class MongoRepository {
120
129
  }
121
130
  });
122
131
  }
123
- const objectPurposeIdEq = (_o = (_m = (_l = params.data) === null || _l === void 0 ? void 0 : _l.purpose) === null || _m === void 0 ? void 0 : _m.id) === null || _o === void 0 ? void 0 : _o.$eq;
132
+ const objectPurposeIdEq = (_r = (_q = (_p = params.data) === null || _p === void 0 ? void 0 : _p.purpose) === null || _q === void 0 ? void 0 : _q.id) === null || _r === void 0 ? void 0 : _r.$eq;
124
133
  if (typeof objectPurposeIdEq === 'string') {
125
134
  andConditions.push({
126
135
  'data.purpose.id': {
@@ -129,7 +138,7 @@ class MongoRepository {
129
138
  }
130
139
  });
131
140
  }
132
- const objectPurposeOrderNumberEq = (_r = (_q = (_p = params.data) === null || _p === void 0 ? void 0 : _p.purpose) === null || _q === void 0 ? void 0 : _q.orderNumber) === null || _r === void 0 ? void 0 : _r.$eq;
141
+ const objectPurposeOrderNumberEq = (_u = (_t = (_s = params.data) === null || _s === void 0 ? void 0 : _s.purpose) === null || _t === void 0 ? void 0 : _t.orderNumber) === null || _u === void 0 ? void 0 : _u.$eq;
133
142
  if (typeof objectPurposeOrderNumberEq === 'string') {
134
143
  andConditions.push({
135
144
  'data.purpose.orderNumber': {
@@ -140,11 +149,6 @@ class MongoRepository {
140
149
  }
141
150
  return andConditions;
142
151
  }
143
- // public async save(taskAttributes: factory.task.IAttributes<factory.taskName>): Promise<void> {
144
- // // return this.taskModel.create(taskAttributes)
145
- // // .then((doc) => <factory.task.ITask<factory.taskName>>doc.toObject());
146
- // await this.taskModel.create(taskAttributes);
147
- // }
148
152
  saveMany(taskAttributes) {
149
153
  return __awaiter(this, void 0, void 0, function* () {
150
154
  if (taskAttributes.length > 0) {
@@ -159,6 +163,19 @@ class MongoRepository {
159
163
  }
160
164
  });
161
165
  }
166
+ createInformTaskIfNotExist(params) {
167
+ return __awaiter(this, void 0, void 0, function* () {
168
+ yield this.taskModel.findOneAndUpdate({
169
+ 'project.id': { $eq: params.project.id },
170
+ name: params.name,
171
+ 'data.object.id': {
172
+ $exists: true,
173
+ $eq: String(params.data.object.id)
174
+ }
175
+ }, { $setOnInsert: params }, { new: true, upsert: true })
176
+ .exec();
177
+ });
178
+ }
162
179
  executeOneByName(params) {
163
180
  return __awaiter(this, void 0, void 0, function* () {
164
181
  const doc = yield this.taskModel.findOneAndUpdate({
package/lib/chevre/service/payment/movieTicket/checkByIdentifier.d.ts CHANGED
@@ -5,7 +5,6 @@ import * as factory from '../../../factory';
5
5
  interface ICheckResult {
6
6
  purchaseNumberAuthIn: factory.action.check.paymentMethod.movieTicket.IPurchaseNumberAuthIn;
7
7
  purchaseNumberAuthResult: factory.action.check.paymentMethod.movieTicket.IPurchaseNumberAuthResult;
8
- movieTickets: factory.action.check.paymentMethod.movieTicket.IMovieTicket[];
9
8
  }
10
9
  /**
11
10
  * MovieTicket認証
package/lib/chevre/service/payment/movieTicket/checkByIdentifier.js CHANGED
@@ -88,96 +88,14 @@ function checkByIdentifier(params) {
88
88
  }, { timeout: credentials_1.credentials.movieticketReserve.timeout });
89
89
  purchaseNumberAuthResult = yield authService.purchaseNumberAuth(purchaseNumberAuthIn);
90
90
  // 決済カード配列に成形
91
- const movieTickets = purchaseNumberAuthResult2movieTickets({
92
- screeningEvent: params.screeningEvent,
93
- paymentMethodType,
94
- knyknrNoInfoIn,
95
- purchaseNumberAuthResult
96
- });
97
- return { purchaseNumberAuthIn, purchaseNumberAuthResult, movieTickets };
91
+ // const movieTickets = purchaseNumberAuthResult2movieTickets({
92
+ // screeningEvent: params.screeningEvent,
93
+ // paymentMethodType,
94
+ // knyknrNoInfoIn,
95
+ // purchaseNumberAuthResult
96
+ // });
97
+ // return { purchaseNumberAuthIn, purchaseNumberAuthResult, movieTickets };
98
+ return { purchaseNumberAuthIn, purchaseNumberAuthResult };
98
99
  });
99
100
  }
100
101
  exports.checkByIdentifier = checkByIdentifier;
101
- function purchaseNumberAuthResult2movieTickets(params) {
102
- const movieTickets = [];
103
- const paymentMethodType = params.paymentMethodType;
104
- const knyknrNoInfoIn = params.knyknrNoInfoIn;
105
- const purchaseNumberAuthResult = params.purchaseNumberAuthResult;
106
- if (Array.isArray(purchaseNumberAuthResult.knyknrNoInfoOut)) {
107
- purchaseNumberAuthResult.knyknrNoInfoOut.forEach((knyknrNoInfoOut) => {
108
- const knyknrNoInfo = knyknrNoInfoIn.find((info) => info.knyknrNo === knyknrNoInfoOut.knyknrNo);
109
- if (knyknrNoInfo !== undefined) {
110
- const movieTicketCategoryCode = (typeof knyknrNoInfoOut.znkkkytsknGkjknTyp === 'string')
111
- ? knyknrNoInfoOut.znkkkytsknGkjknTyp
112
- : '';
113
- if (Array.isArray(knyknrNoInfoOut.ykknInfo)) {
114
- knyknrNoInfoOut.ykknInfo.forEach((ykknInfo) => {
115
- // tslint:disable-next-line:prefer-array-literal
116
- [...Array(Number(ykknInfo.ykknKnshbtsmiNum))].forEach(() => {
117
- movieTickets.push({
118
- // project: { typeOf: factory.organizationType.Project, id: params.screeningEvent.project.id },
119
- typeOf: paymentMethodType,
120
- identifier: knyknrNoInfo.knyknrNo,
121
- accessCode: knyknrNoInfo.pinCd,
122
- category: {
123
- codeValue: movieTicketCategoryCode // 追加(2023-02-08~)
124
- },
125
- serviceType: ykknInfo.ykknshTyp,
126
- serviceOutput: {
127
- reservationFor: {
128
- typeOf: params.screeningEvent.typeOf,
129
- id: params.screeningEvent.id
130
- }
131
- // reservedTicket: {
132
- // ticketedSeat: {
133
- // typeOf: factory.placeType.Seat,
134
- // // seatingType: 'Default', // 情報空でよし
135
- // seatNumber: '', // 情報空でよし
136
- // seatRow: '', // 情報空でよし
137
- // seatSection: '' // 情報空でよし
138
- // }
139
- // }
140
- }
141
- });
142
- });
143
- });
144
- }
145
- if (Array.isArray(knyknrNoInfoOut.mkknInfo)) {
146
- knyknrNoInfoOut.mkknInfo.forEach((mkknInfo) => {
147
- // tslint:disable-next-line:prefer-array-literal
148
- [...Array(Number(mkknInfo.mkknKnshbtsmiNum))].forEach(() => {
149
- movieTickets.push(Object.assign({
150
- // project: { typeOf: factory.organizationType.Project, id: params.screeningEvent.project.id },
151
- typeOf: paymentMethodType, identifier: knyknrNoInfo.knyknrNo, accessCode: knyknrNoInfo.pinCd, category: {
152
- codeValue: movieTicketCategoryCode // 追加(2023-02-08~)
153
- }, amount: {
154
- typeOf: 'MonetaryAmount',
155
- // currency: factory.priceCurrency.JPY,
156
- validThrough: moment(`${mkknInfo.yykDt}+09:00`, 'YYYY/MM/DD HH:mm:ssZ')
157
- .toDate()
158
- }, serviceType: mkknInfo.mkknshTyp, serviceOutput: {
159
- reservationFor: {
160
- typeOf: params.screeningEvent.typeOf,
161
- id: params.screeningEvent.id
162
- }
163
- // reservedTicket: {
164
- // ticketedSeat: {
165
- // typeOf: factory.placeType.Seat,
166
- // // seatingType: 'Default', // 情報空でよし
167
- // seatNumber: '', // 情報空でよし
168
- // seatRow: '', // 情報空でよし
169
- // seatSection: '' // 情報空でよし
170
- // }
171
- // }
172
- } }, {
173
- validThrough: moment(`${mkknInfo.yykDt}+09:00`, 'YYYY/MM/DD HH:mm:ssZ')
174
- .toDate()
175
- }));
176
- });
177
- });
178
- }
179
- }
180
- });
181
- }
182
- return movieTickets;
183
- }
package/package.json CHANGED
@@ -9,8 +9,8 @@
9
9
  }
10
10
  ],
11
11
  "dependencies": {
12
- "@chevre/factory": "4.309.0-alpha.0",
13
- "@cinerino/sdk": "3.152.0",
12
+ "@chevre/factory": "4.309.0",
13
+ "@cinerino/sdk": "3.153.0",
14
14
  "@motionpicture/coa-service": "9.2.0",
15
15
  "@motionpicture/gmo-service": "5.2.0",
16
16
  "@sendgrid/mail": "6.4.0",
@@ -120,5 +120,5 @@
120
120
  "postversion": "git push origin --tags",
121
121
  "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
122
122
  },
123
- "version": "20.14.0-alpha.0"
123
+ "version": "20.14.0-alpha.2"
124
124
  }