@chevre/domain 22.2.0-alpha.7 → 22.2.0-alpha.8

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

@@ -36,7 +36,9 @@ export declare class AuthorizationRepo {
         };
         id: string;
     }): Promise<Pick<IFindValidOneResult, 'object'>>;
-    search(params: factory.authorization.ISearchConditions): Promise<factory.authorization.IAuthorization[]>;
+    projectFields(params: factory.authorization.ISearchConditions): Promise<(factory.authorization.IAuthorization & {
+        id: string;
+    })[]>;
     /**
      * 有効期限を一定期間過ぎた承認を削除する
      */

package/lib/chevre/repo/authorization.js

@@ -114,14 +114,17 @@ class AuthorizationRepo {
                 code: { $eq: String(params.code) },
                 validFrom: { $lte: now },
                 validUntil: { $gte: now }
-            }, { object: 1, _id: 1, typeOf: 1, audience: 1, issuedBy: 1 })
-                // projection的にleanで十分
-                // .lean<Pick<factory.authorization.IAuthorization, 'object'>>()
+            }, {
+                _id: 0,
+                id: { $toString: '$_id' },
+                object: 1, typeOf: 1, audience: 1, issuedBy: 1
+            })
+                .lean()
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.authorizationModel.modelName);
             }
-            const { id, object, typeOf, audience, issuedBy } = doc.toObject();
+            const { id, object, typeOf, audience, issuedBy } = doc;
             return Object.assign(Object.assign({ id, object, typeOf }, (typeof (issuedBy === null || issuedBy === void 0 ? void 0 : issuedBy.id) === 'string') ? { issuedBy } : undefined), (typeof (audience === null || audience === void 0 ? void 0 : audience.id) === 'string') ? { audience } : undefined);
         });
     }
@@ -145,14 +148,22 @@ class AuthorizationRepo {
             return doc;
         });
     }
-    search(params) {
+    projectFields(params) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = AuthorizationRepo.CREATE_MONGO_CONDITIONS(params);
             const query = this.authorizationModel.find((conditions.length > 0) ? { $and: conditions } : {}, {
-            // __v: 0,
-            // createdAt: 0,
-            // updatedAt: 0
+                _id: 0,
+                id: { $toString: '$_id' },
+                project: 1,
+                typeOf: 1,
+                code: 1,
+                object: 1,
+                validFrom: 1,
+                validUntil: 1,
+                audience: 1,
+                author: 1,
+                issuedBy: 1
             });
             if (typeof params.limit === 'number' && params.limit > 0) {
                 const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
@@ -165,8 +176,8 @@ class AuthorizationRepo {
                 query.sort({ validFrom: params.sort.validFrom });
             }
             return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
+                .lean()
+                .exec();
         });
     }
     /**

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

@@ -45,13 +45,17 @@ export declare class CategoryCodeRepo {
     /**
      * 検索
      */
-    search(params: factory.categoryCode.ISearchConditions, inclusion: IKeyOfProjection[], exclusion: IKeyOfProjection[]): Promise<factory.categoryCode.ICategoryCode[]>;
+    search(params: factory.categoryCode.ISearchConditions, inclusion: IKeyOfProjection[], exclusion: IKeyOfProjection[]): Promise<(factory.categoryCode.ICategoryCode & {
+        id: string;
+    })[]>;
     save(params: {
         id?: string;
         attributes: factory.categoryCode.ICategoryCode & {
             $unset?: IUnset;
         };
-    }): Promise<factory.categoryCode.ICategoryCode>;
+    }): Promise<factory.categoryCode.ICategoryCode & {
+        id: string;
+    }>;
     saveManyByCodeValue(params: {
         attributes: factory.categoryCode.ICategoryCode;
         upsert?: boolean;

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

@@ -74,7 +74,7 @@ function createStartParams(params) {
     else if (params.paymentServiceType === factory.service.paymentService.PaymentServiceType.CreditCard) {
         const creditCardPaymentServiceOutput = (_l = params.paymentService) === null || _l === void 0 ? void 0 : _l.serviceOutput;
         const invoiceAsServiceOutput = (Array.isArray(creditCardPaymentServiceOutput))
-            ? creditCardPaymentServiceOutput.find((output) => output.typeOf === 'Invoice')
+            ? creditCardPaymentServiceOutput.find((output) => (output === null || output === void 0 ? void 0 : output.typeOf) === 'Invoice')
             : creditCardPaymentServiceOutput;
         // カード通貨区分が存在すれば適用
         if ((invoiceAsServiceOutput === null || invoiceAsServiceOutput === void 0 ? void 0 : invoiceAsServiceOutput.typeOf) === 'Invoice') {

package/lib/chevre/service/assetTransaction/refund/factory.js

@@ -24,7 +24,7 @@ function createStartParams(params) {
     if (((_g = params.paymentService) === null || _g === void 0 ? void 0 : _g.typeOf) === factory.service.paymentService.PaymentServiceType.CreditCard) {
         // カード通貨区分の存在する決済サービスを考慮(2023-08-09~)
         const invoiceAsServiceOutput = (Array.isArray(params.paymentService.serviceOutput))
-            ? params.paymentService.serviceOutput.find((output) => output.typeOf === 'Invoice')
+            ? params.paymentService.serviceOutput.find((output) => (output === null || output === void 0 ? void 0 : output.typeOf) === 'Invoice')
             : params.paymentService.serviceOutput;
         let paymentServiceOutputAmountCurrency;
         if ((invoiceAsServiceOutput === null || invoiceAsServiceOutput === void 0 ? void 0 : invoiceAsServiceOutput.typeOf) === 'Invoice') {

package/lib/chevre/service/assetTransaction/reserve/start/createSubReservations.js

@@ -53,6 +53,7 @@ function createSubReservations(params) {
             });
             const programMembershipUsed = yield validateProgramMembershipUsed({
                 acceptedOffer,
+                availableOffer: ticketType,
                 project: { id: params.event.project.id }
             })(repos);
             // チケット作成
@@ -273,7 +274,7 @@ function validateAdvanceBookingRequirement(params) {
 function validateProgramMembershipUsed(params) {
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         const now = new Date();
         let programMembershipUsed;
         const requestedProgramMembershipUsed = (_b = (_a = params.acceptedOffer.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.programMembershipUsed;
@@ -329,32 +330,36 @@ function validateProgramMembershipUsed(params) {
             }
             switch (permitIssuedThrough.typeOf) {
                 case factory.service.paymentService.PaymentServiceType.FaceToFace:
-                    // 問答無用に受け入れる
-                    programMembershipUsed = {
-                        typeOf: factory.permit.PermitType.Permit,
-                        identifier: programMembershipUsedIdentifier,
-                        issuedThrough: {
-                            typeOf: permitIssuedThrough.typeOf
-                        }
-                    };
+                    // 適用メンバーシップ条件有のオファーであれば、問答無用に受け入れる
+                    const eligibleMembershipType = (_g = (_f = params.availableOffer.eligibleMembershipType) === null || _f === void 0 ? void 0 : _f.shift()) === null || _g === void 0 ? void 0 : _g.codeValue;
+                    if (typeof eligibleMembershipType === 'string') {
+                        programMembershipUsed = {
+                            typeOf: factory.permit.PermitType.Permit,
+                            identifier: programMembershipUsedIdentifier,
+                            issuedThrough: {
+                                serviceType: { codeValue: eligibleMembershipType },
+                                typeOf: permitIssuedThrough.typeOf
+                            }
+                        };
+                    }
                     break;
                 // 発行サービスがCreditCardのケースに対応(2023-09-01~)
                 case factory.service.paymentService.PaymentServiceType.CreditCard:
                     // 決済サービスのserviceOutputにPermitが存在すれば、設定されたメンバーシップ区分のPermitをprogramMembershipUsedとして適用する
                     let issuedThroughServiceType;
                     if (Array.isArray(permitIssuedThrough.serviceOutput)) {
-                        const serviceOutputAsPermit = permitIssuedThrough.serviceOutput.find((output) => output.typeOf === factory.permit.PermitType.Permit);
+                        const serviceOutputAsPermit = permitIssuedThrough.serviceOutput.find((output) => (output === null || output === void 0 ? void 0 : output.typeOf) === factory.permit.PermitType.Permit);
                         if ((serviceOutputAsPermit === null || serviceOutputAsPermit === void 0 ? void 0 : serviceOutputAsPermit.typeOf) === factory.permit.PermitType.Permit) {
                             issuedThroughServiceType = serviceOutputAsPermit.issuedThrough.serviceType;
                         }
                     }
-                    if ((issuedThroughServiceType === null || issuedThroughServiceType === void 0 ? void 0 : issuedThroughServiceType.typeOf) === 'CategoryCode') {
+                    if (typeof (issuedThroughServiceType === null || issuedThroughServiceType === void 0 ? void 0 : issuedThroughServiceType.codeValue) === 'string') {
                         programMembershipUsed = {
                             typeOf: factory.permit.PermitType.Permit,
                             identifier: programMembershipUsedIdentifier,
                             issuedThrough: {
                                 id: permitIssuedThrough.id,
-                                serviceType: issuedThroughServiceType,
+                                serviceType: { codeValue: issuedThroughServiceType.codeValue },
                                 typeOf: permitIssuedThrough.typeOf
                             }
                         };
@@ -383,13 +388,13 @@ function validateProgramMembershipUsed(params) {
                             .isBefore(moment(now))) {
                         throw new factory.errors.Argument('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed', 'unavailable programMembership');
                     }
-                    if (((_f = permitIssuedThrough.serviceType) === null || _f === void 0 ? void 0 : _f.typeOf) === 'CategoryCode') {
+                    if (((_h = permitIssuedThrough.serviceType) === null || _h === void 0 ? void 0 : _h.typeOf) === 'CategoryCode') {
                         programMembershipUsed = {
                             typeOf: serviceOutput.typeOf,
                             identifier: programMembershipUsedIdentifier,
                             issuedThrough: {
                                 id: permitIssuedThrough.id,
-                                serviceType: permitIssuedThrough.serviceType,
+                                serviceType: { codeValue: permitIssuedThrough.serviceType.codeValue },
                                 typeOf: permitIssuedThrough.typeOf
                             }
                         };

package/lib/chevre/service/offer/event/importFromCOA/factory.d.ts

@@ -4,6 +4,8 @@ declare function coaTicket2offer(params: {
     theaterCode: string;
     ticketResult: COA.factory.master.ITicketResult;
     defaultCurrencyType?: factory.categoryCode.ICategoryCode;
-    defaultMembershipType?: factory.categoryCode.ICategoryCode;
+    defaultMembershipType?: factory.categoryCode.ICategoryCode & {
+        id: string;
+    };
 }): factory.aggregateOffer.ISubOffer;
 export { coaTicket2offer };

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.381.0-alpha.6",
-    "@cinerino/sdk": "10.5.0-alpha.1",
+    "@chevre/factory": "4.381.0-alpha.7",
+    "@cinerino/sdk": "10.5.0-alpha.2",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.2.0-alpha.7"
+  "version": "22.2.0-alpha.8"
 }