@chevre/domain 22.14.0-alpha.17 → 22.14.0-alpha.18

package/lib/chevre/service/assetTransaction/reserve/validateStartRequest.js

@@ -115,8 +115,7 @@ function validateMemberTier(params) {
  */
 function validateEventOfferPeriod(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        const { event, availableAt, validForMemberTierToken } = params;
+        const { event, availableAt, tokenizedMemberProgramTier } = params;
         const acceptedDate = moment(params.now);
         const eventOffers = event.offers;
         // アプリケーションごとの設定を参照する(2022-11-19~)
@@ -143,13 +142,20 @@ function validateEventOfferPeriod(params) {
                 throw new factory.errors.Argument('reservationFor.id', `Offer of ${params.event.id} is valid through ${validThrough}`);
             }
         }
+        // 有効メンバープログラムティアが存在する場合
         // support validForMemberTier(2025-05-14~)
         if (makesOfferOnApplication.typeOf === factory.offerType.AggregateOffer) {
-            const memberProgramIdentifierMustBe = (_b = (_a = makesOfferOnApplication.validForMemberTier) === null || _a === void 0 ? void 0 : _a.isTierOf) === null || _b === void 0 ? void 0 : _b.identifier;
-            if (typeof memberProgramIdentifierMustBe === 'string') {
-                // 有効メンバープログラムティアが存在する場合、ティアトークンが必須
+            const validForMemberTierExists = makesOfferOnApplication.validForMemberTier.typeOf === 'MemberProgramTier';
+            if (validForMemberTierExists) {
+                const validForMemberTierToken = tokenizedMemberProgramTier === null || tokenizedMemberProgramTier === void 0 ? void 0 : tokenizedMemberProgramTier.token;
+                const memberProgramIdentifierMustBe = tokenizedMemberProgramTier === null || tokenizedMemberProgramTier === void 0 ? void 0 : tokenizedMemberProgramTier.isTierOf.identifier;
+                // ティアトークンが必須
                 if (typeof validForMemberTierToken !== 'string' || validForMemberTierToken === '') {
-                    throw new factory.errors.ArgumentNull('reservationFor.offers.validForMemberTier');
+                    throw new factory.errors.ArgumentNull('reservationFor.offers.validForMemberTier.token');
+                }
+                // メンバープログラムコード指定が必須
+                if (typeof memberProgramIdentifierMustBe !== 'string' || memberProgramIdentifierMustBe === '') {
+                    throw new factory.errors.ArgumentNull('reservationFor.offers.validForMemberTier.isTierOf.identifier');
                 }
                 // 有効メンバープログラムティアが存在する場合、オファーコレクションコードが必須
                 const aggregateOfferIdentifier = makesOfferOnApplication.identifier;

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

@@ -8,7 +8,7 @@ declare function createReserveTransactionStartParams(params: {
     event: {
         id: string;
         offers?: {
-            validForMemberTier?: string;
+            validForMemberTier?: factory.assetTransaction.reserve.ITokenizedMemberProgramTier;
         };
     };
     broker?: factory.reservation.IBroker<factory.reservationType>;

package/lib/chevre/service/offer/event/authorize/factory.js

@@ -48,8 +48,8 @@ function createReserveTransactionStartParams(params) {
         //     }
         // ]
     };
-    const validForMemberTierToken = (_b = params.event.offers) === null || _b === void 0 ? void 0 : _b.validForMemberTier;
-    const object = Object.assign({ acceptedOffer: acceptedTicketOffersWithoutDetail, reservationFor: Object.assign({ id: params.event.id }, (typeof validForMemberTierToken === 'string') ? { offers: { validForMemberTier: validForMemberTierToken } } : undefined) }, (params.broker !== undefined) ? { broker: params.broker } : undefined);
+    const validForMemberTier = (_b = params.event.offers) === null || _b === void 0 ? void 0 : _b.validForMemberTier;
+    const object = Object.assign({ acceptedOffer: acceptedTicketOffersWithoutDetail, reservationFor: Object.assign({ id: params.event.id }, (typeof (validForMemberTier === null || validForMemberTier === void 0 ? void 0 : validForMemberTier.token) === 'string') ? { offers: { validForMemberTier } } : undefined) }, (params.broker !== undefined) ? { broker: params.broker } : undefined);
     return {
         project: { typeOf: factory.organizationType.Project, id: params.project.id },
         typeOf: factory.assetTransactionType.Reserve,

package/lib/chevre/service/offer/event/authorize/processStartReserve4chevre.d.ts

@@ -27,7 +27,7 @@ declare function processStartReserve4chevre(params: {
     acceptedOffers: factory.assetTransaction.reserve.IAcceptedTicketOfferWithoutDetail[];
     event: Pick<IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>, 'id'> & {
         offers?: {
-            validForMemberTier?: string;
+            validForMemberTier?: factory.assetTransaction.reserve.ITokenizedMemberProgramTier;
         };
     };
     broker?: factory.reservation.IBroker<factory.reservationType>;

package/lib/chevre/service/offer/event/authorize/processStartReserve4chevre.js

@@ -20,13 +20,13 @@ function processStartReserve4chevre(params, options) {
     //     jwt: JWTCredentials;
     // }
     ) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         const { event, transaction, transactionNumber } = params;
         let acceptedOffers4result = [];
         // 予約取引開始
         const startParams = (0, factory_1.createReserveTransactionStartParams)(Object.assign({ project: transaction.project, 
             // object: <IObjectWithDetail>action.object,
-            acceptedOffers: params.acceptedOffers, event: Object.assign({ id: event.id }, (typeof ((_a = event.offers) === null || _a === void 0 ? void 0 : _a.validForMemberTier) === 'string')
+            acceptedOffers: params.acceptedOffers, event: Object.assign({ id: event.id }, (typeof ((_b = (_a = event.offers) === null || _a === void 0 ? void 0 : _a.validForMemberTier) === null || _b === void 0 ? void 0 : _b.token) === 'string')
                 ? { offers: { validForMemberTier: event.offers.validForMemberTier } }
                 : undefined), transaction,
             transactionNumber }, (params.broker !== undefined) ? { broker: params.broker } : undefined));

package/lib/chevre/service/offer/event/authorize.js

@@ -99,8 +99,8 @@ function validateCreateRequest(params) {
             throw new factory.errors.ArgumentNull('object.reservationFor.id');
         }
         // support validForMemberTier(2025-05-14~)
-        const validForMemberTierToken = (_c = params.object.reservationFor.offers) === null || _c === void 0 ? void 0 : _c.validForMemberTier;
-        const event = Object.assign({ id: params.object.reservationFor.id, typeOf: factory.eventType.ScreeningEvent }, (typeof validForMemberTierToken === 'string') ? { offers: { validForMemberTier: validForMemberTierToken } } : undefined);
+        const validForMemberTier = (_c = params.object.reservationFor.offers) === null || _c === void 0 ? void 0 : _c.validForMemberTier;
+        const event = Object.assign({ id: params.object.reservationFor.id, typeOf: factory.eventType.ScreeningEvent }, (typeof (validForMemberTier === null || validForMemberTier === void 0 ? void 0 : validForMemberTier.token) === 'string') ? { offers: { validForMemberTier } } : undefined);
         return { transaction, event };
     });
 }

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.399.0-alpha.17",
+    "@chevre/factory": "4.399.0-alpha.18",
     "@cinerino/sdk": "12.2.0",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.14.0-alpha.17"
+  "version": "22.14.0-alpha.18"
 }