@chevre/domain 20.13.0 → 20.14.0-alpha.1

package/example/src/chevre/person/{getUserAttributes.ts → globalSignOutAndDisable.ts}

@@ -3,15 +3,15 @@ import { chevre } from '../../../../lib/index';
 
 async function main() {
     const personRepo = new chevre.repository.Person({
-        userPoolId: <string>process.env.COGNITO_USER_POOL_ID
+        userPoolId: <string>process.env.USERPOOL_ID_NEW
     });
 
-    const username = 'xx';
+    const userId = 'xxx';
 
-    const profile = await personRepo.getUserAttributes({
-        username: username
+    await personRepo.globalSignOutAndDisable({
+        userId
     });
-    console.log('profile:', profile);
+    console.log('signed out.');
 }
 
 main()
@@ -20,5 +20,4 @@ main()
     })
     .catch((error) => {
         console.error(error);
-        console.log(error.code);
     });

package/lib/chevre/repo/mongoose/model/task.js

@@ -87,6 +87,12 @@ schema.index({ 'data.object.transactionNumber': 1, runsAt: -1 }, {
         'data.object.transactionNumber': { $exists: true }
     }
 });
+schema.index({ 'data.object.id': 1, runsAt: -1 }, {
+    name: 'searchByDataObjectId',
+    partialFilterExpression: {
+        'data.object.id': { $exists: true }
+    }
+});
 schema.index({ 'data.purpose.id': 1, runsAt: -1 }, {
     name: 'searchByDataPurposeId',
     partialFilterExpression: {

package/lib/chevre/repo/person.d.ts

@@ -62,6 +62,12 @@ export declare class CognitoRepository {
     disable(params: {
         userId: string;
     }): Promise<void>;
+    /**
+     * グローバルサインアウトかつ無効化
+     */
+    globalSignOutAndDisable(params: {
+        userId: string;
+    }): Promise<void>;
     /**
      * 検索
      */

package/lib/chevre/repo/person.js

@@ -380,6 +380,53 @@ class CognitoRepository {
             });
         });
     }
+    /**
+     * グローバルサインアウトかつ無効化
+     */
+    globalSignOutAndDisable(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return new Promise((resolve, reject) => {
+                this.cognitoIdentityServiceProvider.listUsers({
+                    UserPoolId: this.userPoolId,
+                    Filter: `sub="${params.userId}"`
+                }, (listUsersErr, data) => {
+                    var _a, _b;
+                    if (listUsersErr instanceof Error) {
+                        reject(listUsersErr);
+                    }
+                    else {
+                        const username = (_b = (_a = data.Users) === null || _a === void 0 ? void 0 : _a.shift()) === null || _b === void 0 ? void 0 : _b.Username;
+                        if (typeof username !== 'string') {
+                            reject(new factory.errors.NotFound('User'));
+                        }
+                        else {
+                            this.cognitoIdentityServiceProvider.adminUserGlobalSignOut({
+                                UserPoolId: this.userPoolId,
+                                Username: username
+                            }, (adminUserGlobalSignOutErr) => {
+                                if (adminUserGlobalSignOutErr instanceof Error) {
+                                    reject(adminUserGlobalSignOutErr);
+                                }
+                                else {
+                                    this.cognitoIdentityServiceProvider.adminDisableUser({
+                                        UserPoolId: this.userPoolId,
+                                        Username: username
+                                    }, (adminDisableUserErr) => {
+                                        if (adminDisableUserErr instanceof Error) {
+                                            reject(adminDisableUserErr);
+                                        }
+                                        else {
+                                            resolve();
+                                        }
+                                    });
+                                }
+                            });
+                        }
+                    }
+                });
+            });
+        });
+    }
     /**
      * 検索
      */

package/lib/chevre/repo/task.d.ts

@@ -25,6 +25,7 @@ export declare class MongoRepository {
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: factory.task.ISearchConditions): any[];
     saveMany(taskAttributes: factory.task.IAttributes<factory.taskName>[]): Promise<any[]>;
+    createInformTaskIfNotExist(params: factory.task.IAttributes<factory.taskName.TriggerWebhook>): Promise<void>;
     executeOneByName<T extends factory.taskName>(params: {
         name: T;
     }): Promise<factory.task.ITask<T> | null>;

package/lib/chevre/repo/task.js

@@ -29,7 +29,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
         const andConditions = [];
         const idEq = (_a = params.id) === null || _a === void 0 ? void 0 : _a.$eq;
         if (typeof idEq === 'string') {
@@ -111,7 +111,16 @@ class MongoRepository {
                 }
             });
         }
-        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;
+        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;
+        if (typeof objectIdEq === 'string') {
+            andConditions.push({
+                'data.object.id': {
+                    $exists: true,
+                    $eq: objectIdEq
+                }
+            });
+        }
+        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;
         if (typeof objectTransactionNumberEq === 'string') {
             andConditions.push({
                 'data.object.transactionNumber': {
@@ -120,7 +129,7 @@ class MongoRepository {
                 }
             });
         }
-        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;
+        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;
         if (typeof objectPurposeIdEq === 'string') {
             andConditions.push({
                 'data.purpose.id': {
@@ -129,7 +138,7 @@ class MongoRepository {
                 }
             });
         }
-        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;
+        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;
         if (typeof objectPurposeOrderNumberEq === 'string') {
             andConditions.push({
                 'data.purpose.orderNumber': {
@@ -140,11 +149,6 @@ class MongoRepository {
         }
         return andConditions;
     }
-    // public async save(taskAttributes: factory.task.IAttributes<factory.taskName>): Promise<void> {
-    //     // return this.taskModel.create(taskAttributes)
-    //     //     .then((doc) => <factory.task.ITask<factory.taskName>>doc.toObject());
-    //     await this.taskModel.create(taskAttributes);
-    // }
     saveMany(taskAttributes) {
         return __awaiter(this, void 0, void 0, function* () {
             if (taskAttributes.length > 0) {
@@ -159,6 +163,19 @@ class MongoRepository {
             }
         });
     }
+    createInformTaskIfNotExist(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.taskModel.findOneAndUpdate({
+                'project.id': { $eq: params.project.id },
+                name: params.name,
+                'data.object.id': {
+                    $exists: true,
+                    $eq: String(params.data.object.id)
+                }
+            }, { $setOnInsert: params }, { new: true, upsert: true })
+                .exec();
+        });
+    }
     executeOneByName(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.taskModel.findOneAndUpdate({

package/lib/chevre/service/assetTransaction/pay/potentialActions.js

@@ -140,6 +140,47 @@ function createPayObjectServiceOutput(params) {
     }
     return paymentServiceOutput;
 }
+function reservationPriceComponent2invoicePriceComponent(component) {
+    var _a;
+    const accounting = (typeof ((_a = component.accounting) === null || _a === void 0 ? void 0 : _a.accountsReceivable) === 'number')
+        ? { accountsReceivable: component.accounting.accountsReceivable }
+        : undefined;
+    let minimizedUnitPriceSpec;
+    let minimizedMovieTicketTypeChargeSpec;
+    let minimizedCategoryCodeChargeSpec;
+    if (component.typeOf === factory.priceSpecificationType.UnitPriceSpecification) {
+        const appliesToAddOn = (Array.isArray(component.appliesToAddOn))
+            ? component.appliesToAddOn.map((addOn) => {
+                return { typeOf: addOn.typeOf };
+            })
+            : undefined;
+        minimizedUnitPriceSpec = Object.assign(Object.assign({ typeOf: component.typeOf, price: component.price, referenceQuantity: component.referenceQuantity }, (Array.isArray(appliesToAddOn)) ? { appliesToAddOn } : undefined), (typeof (accounting === null || accounting === void 0 ? void 0 : accounting.accountsReceivable) === 'number') ? { accounting } : undefined);
+    }
+    else if (component.typeOf === factory.priceSpecificationType.MovieTicketTypeChargeSpecification) {
+        minimizedMovieTicketTypeChargeSpec = Object.assign({ typeOf: component.typeOf, price: component.price, 
+            // 適用決済方法区分を追加(2023-03-29~)
+            appliesToMovieTicket: {
+                serviceOutput: {
+                    typeOf: component.appliesToMovieTicket.serviceOutput.typeOf
+                }
+            } }, (typeof (accounting === null || accounting === void 0 ? void 0 : accounting.accountsReceivable) === 'number') ? { accounting } : undefined);
+    }
+    else {
+        minimizedCategoryCodeChargeSpec = Object.assign({ typeOf: component.typeOf, price: component.price }, (typeof (accounting === null || accounting === void 0 ? void 0 : accounting.accountsReceivable) === 'number') ? { accounting } : undefined);
+    }
+    if (minimizedUnitPriceSpec !== undefined) {
+        return minimizedUnitPriceSpec;
+    }
+    else if (minimizedMovieTicketTypeChargeSpec !== undefined) {
+        return minimizedMovieTicketTypeChargeSpec;
+    }
+    else if (minimizedCategoryCodeChargeSpec !== undefined) {
+        return minimizedCategoryCodeChargeSpec;
+    }
+    else {
+        throw new factory.errors.NotImplemented(`unexpected priceComponent: ${component.typeOf}`);
+    }
+}
 function movieTicket2reservation4invoice(movieTicket, order, paymentMethodType) {
     var _a, _b;
     let ticketToken;
@@ -188,23 +229,7 @@ function movieTicket2reservation4invoice(movieTicket, order, paymentMethodType)
         reservationNumber = reservationOffer.itemOffered.reservationNumber;
         const priceComponent = (_b = reservationOffer.priceSpecification) === null || _b === void 0 ? void 0 : _b.priceComponent;
         if (Array.isArray(priceComponent)) {
-            priceComponents4invoice = priceComponent.map((component) => {
-                var _a;
-                const accounting = (typeof ((_a = component.accounting) === null || _a === void 0 ? void 0 : _a.accountsReceivable) === 'number')
-                    ? { accountsReceivable: component.accounting.accountsReceivable }
-                    : undefined;
-                if (component.typeOf === factory.priceSpecificationType.UnitPriceSpecification) {
-                    const appliesToAddOn = (Array.isArray(component.appliesToAddOn))
-                        ? component.appliesToAddOn.map((addOn) => {
-                            return { typeOf: addOn.typeOf };
-                        })
-                        : undefined;
-                    return Object.assign(Object.assign({ typeOf: component.typeOf, price: component.price, referenceQuantity: component.referenceQuantity }, (Array.isArray(appliesToAddOn)) ? { appliesToAddOn } : undefined), (typeof (accounting === null || accounting === void 0 ? void 0 : accounting.accountsReceivable) === 'number') ? { accounting } : undefined);
-                }
-                else {
-                    return Object.assign({ typeOf: component.typeOf, price: component.price }, (typeof (accounting === null || accounting === void 0 ? void 0 : accounting.accountsReceivable) === 'number') ? { accounting } : undefined);
-                }
-            });
+            priceComponents4invoice = priceComponent.map(reservationPriceComponent2invoicePriceComponent);
         }
     }
     return Object.assign({ priceSpecification: {

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.308.0",
-    "@cinerino/sdk": "3.152.0",
+    "@chevre/factory": "4.309.0",
+    "@cinerino/sdk": "3.153.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.13.0"
+  "version": "20.14.0-alpha.1"
 }