npm - @chevre/domain - Versions diffs - 24.1.0-alpha.54 → 24.1.0-alpha.56 - Mend

@chevre/domain 24.1.0-alpha.54 → 24.1.0-alpha.56

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 (13) hide show

package/lib/chevre/factory/transaction/placeOrder.d.ts CHANGED Viewed

@@ -1,7 +1,4 @@
 import { factory } from '../../factory';
-export type IStartParams = factory.transaction.placeOrder.IStartParamsWithoutDetail & {
-    broker?: factory.order.IBroker;
-};
 export type IOrderURLGenerator = (order: factory.transaction.placeOrder.IOrderAsResult) => string;
 export type IResultOrderParams = factory.transaction.placeOrder.IResultOrderParams & {
     /**

package/lib/chevre/repo/mongoose/schemas/reservation.js CHANGED Viewed

@@ -26,13 +26,7 @@ const schemaDefinition = {
     underName: mongoose_1.SchemaTypes.Mixed,
     checkedIn: { type: Boolean, default: false },
     attended: { type: Boolean, default: false },
-    additionalProperty: mongoose_1.SchemaTypes.Mixed,
-    // 以下廃止予定
-    // bookingAgent: SchemaTypes.Mixed,
-    // numSeats: Number, // discontinue(2026-05-13~)
-    // price: SchemaTypes.Mixed, // discontinue(2026-05-13~)
-    // priceCurrency: String, // discontinue(2026-05-13~)
-    // issuedThrough: SchemaTypes.Mixed // discontinue(2026-05-13~)
+    // additionalProperty: SchemaTypes.Mixed, // 完全に廃止(2026-06-09~)
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,
@@ -91,15 +85,6 @@ const indexes = [
         { attended: 1, bookingTime: -1 },
         { name: 'searchByAttended-v3' }
     ],
-    // [
-    //     { useActionExists: 1, bookingTime: -1 },
-    //     {
-    //         name: 'searchByUseActionExists',
-    //         partialFilterExpression: {
-    //             useActionExists: { $exists: true }
-    //         }
-    //     }
-    // ],
     [
         { additionalTicketText: 1, bookingTime: -1 },
         {
@@ -109,24 +94,6 @@ const indexes = [
             }
         }
     ],
-    // [
-    //     { additionalProperty: 1, bookingTime: -1 },
-    //     {
-    //         name: 'searchByAdditionalProperty-v3',
-    //         partialFilterExpression: {
-    //             additionalProperty: { $exists: true }
-    //         }
-    //     }
-    // ],
-    // [
-    //     { 'price.priceComponent.appliesToMovieTicket.identifier': 1, bookingTime: -1 },
-    //     {
-    //         name: 'searchByPriceComponentAppliesToMovieTicketIdentifier',
-    //         partialFilterExpression: {
-    //             'price.priceComponent.appliesToMovieTicket.identifier': { $exists: true }
-    //         }
-    //     }
-    // ],
     [
         { 'reservationFor.typeOf': 1, bookingTime: -1 },
         {

package/lib/chevre/repo/orderInTransaction.d.ts CHANGED Viewed

@@ -34,15 +34,17 @@ export type IMinimizedReservationFor = Pick<factory.order.IEventAsReservationFor
     };
 };
 export type IMinimizedItemOffered = Pick<factory.order.IEventReservation, 'id' | 'reservationNumber' | 'typeOf'> & {
-    reservedTicket?: never;
     /**
      * 予約番号ごとに、ひとつめのオファーのみreservationForを含むように変更するのでoptionalに
      * 2026-06-04~
      */
     reservationFor?: IMinimizedReservationFor;
+    reservedTicket?: never;
 };
-export type IMinimizedAcceptedOffer = Pick<factory.order.IOptimizedAcceptedOffer, 'id' | 'name' | 'offeredThrough' | 'priceSpecification' | 'serialNumber' | 'typeOf'> & {
+export type IMinimizedAcceptedOffer = Pick<factory.order.IOptimizedAcceptedOffer, 'id' | 'offeredThrough' | 'serialNumber' | 'typeOf'> & {
     itemOffered: IMinimizedItemOffered;
+    priceSpecification?: never;
+    name?: never;
 };
 /**
  * 取引中注文リポジトリ

package/lib/chevre/service/offer/event/authorize.d.ts CHANGED Viewed

@@ -67,14 +67,6 @@ interface IAuthorizeOptions {
      * 最大n日前から予約可能
      */
     maxReservationGracePeriodInDays: number;
-    /**
-     * 2026-06-04~
-     */
-    useAcceptedOfferNoReservationFor: boolean;
-    /**
-     * 2026-06-09~
-     */
-    useAcceptedOfferNoName: boolean;
 }
 /**
  * 興行オファー承認

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

@@ -51,23 +51,22 @@ function authorize(params, options) {
             }, options)(repos, settings);
             acceptedOffers4result = processStartReserveResult.acceptedOffers4result;
             if (!noOfferSpecified) {
-                const useAcceptedOfferNoReservationFor = options.useAcceptedOfferNoReservationFor === true;
-                const useAcceptedOfferNoName = options.useAcceptedOfferNoName === true;
+                const minimizedAcceptedOffers = acceptedOffers4result.map((acceptOffer4result, offerIndex) => {
+                    const { priceSpecification: _priceSpecification, itemOffered, name: _name, // 名称非保管に対応(2026-06-11~)
+                    ...acceptOfferNoPriceSpec } = acceptOffer4result;
+                    const includeReservationFor = (offerIndex === 0); // ひとつめのオファーのみ含む(2026-06-04~)
+                    return {
+                        ...acceptOfferNoPriceSpec,
+                        // ...((!useAcceptedOfferNoName) && { name }), // 名称非保管に対応(2026-06-09~)
+                        itemOffered: minimizeItemOffered(itemOffered, {
+                            includeReservationFor
+                        })
+                    };
+                });
                 await (0, any_1.acceptOffer)({
                     orderNumber,
                     project: transaction.project,
-                    acceptedOffers: acceptedOffers4result.map((acceptOffer4result, offerIndex) => {
-                        const { priceSpecification: _priceSpecification, itemOffered, name, ...acceptOfferNoPriceSpec } = acceptOffer4result;
-                        const includeReservationFor = !useAcceptedOfferNoReservationFor
-                            || (useAcceptedOfferNoReservationFor && offerIndex === 0); // useAcceptedOfferNoReservationForの場合、ひとつめのオファーのみ含む(2026-06-04~)
-                        return {
-                            ...acceptOfferNoPriceSpec,
-                            ...((!useAcceptedOfferNoName) && { name }), // 名称非保管に対応(2026-06-09~)
-                            itemOffered: minimizeItemOffered(itemOffered, {
-                                includeReservationFor
-                            })
-                        };
-                    })
+                    acceptedOffers: minimizedAcceptedOffers
                 })(repos);
             }
         }
@@ -118,16 +117,7 @@ function minimizeItemOffered(itemOffered, options) {
         id,
         reservationNumber,
         typeOf,
-        ...((includeReservationFor) && { reservationFor: minimizedReservation }),
-        // useAcceptedOfferNoReservedTicketでない場合のみreservedTicket保管(2026-06-03~)
-        // ...((!useAcceptedOfferNoReservedTicket) && {
-        //     reservedTicket: {
-        //         typeOf: reservedTicket.typeOf,
-        //         // useAcceptedOfferNoTicketedSeatでない場合のみ座席保管(2026-06-01~)
-        //         ...((!useAcceptedOfferNoTicketedSeat && typeof reservedTicket.ticketedSeat?.typeOf === 'string') && { ticketedSeat: reservedTicket.ticketedSeat }),
-        //         ...((typeof reservedTicket.identifier === 'string') && { identifier: reservedTicket.identifier })
-        //     }
-        // })
+        ...((includeReservationFor) && { reservationFor: minimizedReservation })
     };
 }
 function validateCreateRequest(params) {

package/lib/chevre/service/transaction/placeOrder/start/factory.d.ts CHANGED Viewed

@@ -6,5 +6,14 @@ type IVerifiedPassport = factory.waiter.passport.IPassport & {
      */
     identifier: string;
 };
-declare function createStartParams(params: factory.transaction.placeOrder.IStartParamsWithoutDetail, expiresInSeconds: number, passport: IVerifiedPassport | undefined, seller: Pick<factory.seller.ISeller, 'id' | 'name' | 'typeOf' | 'project' | 'additionalProperty'>, broker?: factory.order.IBroker, customerType?: string, memeberOfPayload?: factory.transaction.placeOrder.IMemberOfPayload): factory.transaction.placeOrder.IStartParams;
-export { AGENT_IDENTIFIER_NAME_PASSPORT, createStartParams };
+type IStartPlaceOrderParams = factory.transaction.placeOrder.IStartParamsWithoutDetail & {
+    object: factory.transaction.placeOrder.IStartParamsWithoutDetail['object'] & {
+        /**
+         * api経由で取引が開始されれば必ず存在するはず
+         */
+        clientUser: factory.transaction.placeOrder.IClientUserBeforeStart;
+    };
+    broker?: factory.order.IBroker;
+};
+declare function createStartParams(params: IStartPlaceOrderParams, expiresInSeconds: number, passport: IVerifiedPassport | undefined, seller: Pick<factory.seller.ISeller, 'id' | 'name' | 'typeOf' | 'project' | 'additionalProperty'>, customerType?: string): factory.transaction.placeOrder.IStartParams;
+export { AGENT_IDENTIFIER_NAME_PASSPORT, createStartParams, IStartPlaceOrderParams };

package/lib/chevre/service/transaction/placeOrder/start/factory.js CHANGED Viewed

@@ -5,20 +5,22 @@ exports.createStartParams = createStartParams;
 const factory_1 = require("../../../../factory");
 const AGENT_IDENTIFIER_NAME_PASSPORT = 'passport';
 exports.AGENT_IDENTIFIER_NAME_PASSPORT = AGENT_IDENTIFIER_NAME_PASSPORT;
-function createStartParams(params, expiresInSeconds, passport, seller, broker, customerType, memeberOfPayload) {
-    let clientUser;
+function createStartParams(params, expiresInSeconds, passport, seller,
+// broker?: factory.order.IBroker,
+customerType) {
+    const { broker } = params;
+    // let clientUser: Omit<factory.clientUser.IClientUser, 'scope' | 'scopes'> | undefined;
     let instrument;
     if (typeof params.object.clientUser?.client_id === 'string') {
-        const { sub, token_use, iss, exp, iat, version, jti, client_id, username, aud, typ } = params.object.clientUser;
-        clientUser = { sub, token_use, iss, exp, iat, version, jti, client_id, username, aud, typ };
+        const { client_id } = params.object.clientUser;
+        // const { sub, token_use, iss, exp, iat, version, jti, client_id, username, aud, typ } = params.object.clientUser;
+        // clientUser = { sub, token_use, iss, exp, iat, version, jti, client_id, username, aud, typ };
         instrument = { id: client_id, typeOf: factory_1.factory.creativeWorkType.WebApplication };
     }
     const transactionObject = {
-        // discontinue passportToken(2024-07-05~)
-        // ...(typeof params.object.passport?.token === 'string') ? { passportToken: params.object.passport.token } : undefined,
-        ...(typeof passport?.scope === 'string') ? { passport } : undefined,
-        ...(typeof clientUser?.client_id === 'string') ? { clientUser } : undefined,
-        ...(typeof params.object?.name === 'string') ? { name: params.object?.name } : undefined,
+        // ...(typeof passport?.scope === 'string') ? { passport } : undefined, // discontinue(2026-06-10~)
+        // ...(typeof clientUser?.client_id === 'string') ? { clientUser } : undefined, // discontinue(2026-06-10~)
+        // ...(typeof params.object?.name === 'string') ? { name: params.object?.name } : undefined, // discontinue(2026-06-11~)
         ...(typeof broker?.typeOf === 'string') ? { broker: broker } : undefined,
         ...(typeof params.object.customer?.typeOf === 'string') ? { customer: params.object.customer } : undefined,
         ...(typeof customerType === 'string') ? { customerType } : undefined
@@ -36,7 +38,7 @@ function createStartParams(params, expiresInSeconds, passport, seller, broker, c
     ];
     const agent = {
         ...params.agent,
-        ...(memeberOfPayload !== undefined) ? { memeberOfPayload } : undefined,
+        // ...(memeberOfPayload !== undefined) ? { memeberOfPayload } : undefined, // discontinue(2026-06-10~)
         identifier: agentIdentifier
     };
     return {

package/lib/chevre/service/transaction/placeOrder/start/validateStartRequest.d.ts CHANGED Viewed

@@ -12,7 +12,7 @@ declare function validateStartRequest(params: {
     seller: {
         id: string;
     };
-    clientUser?: Omit<factory.clientUser.IClientUser, 'scope' | 'scopes'>;
+    clientUser?: factory.transaction.placeOrder.IClientUserBeforeStart;
     /**
      * passportによって決定するカスタマータイプ
      */
@@ -31,6 +31,5 @@ declare function validateStartRequest(params: {
 }) => Promise<{
     seller: ISeller;
     sellerMakesOffer: factory.seller.IMakesOffer;
-    memeberOfPayload?: factory.transaction.placeOrder.IMemberOfPayload;
 }>;
 export { validateStartRequest };

package/lib/chevre/service/transaction/placeOrder/start/validateStartRequest.js CHANGED Viewed

@@ -104,8 +104,8 @@ function validateStartRequest(params) {
         if (iamMember === undefined) {
             throw new factory_1.factory.errors.NotFound(factory_1.factory.role.RoleType.OrganizationRole);
         }
-        // メンバーシップトークン検証(2024-01-31~)
-        let memeberOfPayload;
+        // // メンバーシップトークン検証(2024-01-31~)
+        // let memeberOfPayload: factory.transaction.placeOrder.IMemberOfPayload | undefined;
         // 適用メンバーシップについてはproject.makesOfferを参照(2025-01-13~)
         const validMemberProgramIdentifier = projectMakesOffer.validForMemberTier?.isTierOf.identifier;
         if (typeof validMemberProgramIdentifier === 'string') {
@@ -126,29 +126,18 @@ function validateStartRequest(params) {
             if (typeof issuer.tokenSecret !== 'string' || issuer.tokenSecret === '') {
                 throw new factory_1.factory.errors.NotFound('issuer.tokenSecret');
             }
-            memeberOfPayload = await verifyMembershipToken({
+            // memeberOfPayload =
+            await verifyMembershipToken({
                 secret: issuer.tokenSecret,
                 // issuer: issuer.identifier,
                 issuer: issuer.url, // identifier -> url(2025-05-11~)
                 ...(typeof params.memberOfToken === 'string') ? { token: params.memberOfToken } : undefined
             });
         }
-        // discontinue(2025-01-14~)
-        // if (Array.isArray(iamMember.member.member)) {
-        //     const verifySecret = iamMember.member.member[0]?.memberOf?.secret; // ひとまず1種類のメンバーシップのみ対応
-        //     const verifyIssuer = iamMember.member.member[0]?.memberOf?.issuer; // ひとまず1種類のメンバーシップのみ対応
-        //     if (typeof verifySecret === 'string') {
-        //         memeberOfPayload = await verifyMembershipToken({
-        //             secret: verifySecret,
-        //             ...(typeof params.memberOfToken === 'string') ? { token: params.memberOfToken } : undefined,
-        //             ...(typeof verifyIssuer === 'string') ? { issuer: verifyIssuer } : undefined
-        //         });
-        //     }
-        // }
         return {
             sellerMakesOffer,
             seller,
-            ...(memeberOfPayload !== undefined) ? { memeberOfPayload } : undefined
+            // ...(memeberOfPayload !== undefined) ? { memeberOfPayload } : undefined
         };
     };
 }

package/lib/chevre/service/transaction/placeOrder/start.d.ts CHANGED Viewed

@@ -5,7 +5,7 @@ import type { PassportRepo } from '../../../repo/passport';
 import type { ProjectMakesOfferRepo } from '../../../repo/projectMakesOffer';
 import type { SellerRepo } from '../../../repo/seller';
 import type { IStartedPlaceOrder, PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
-import { PlaceOrderFactory } from '../../../factory/transaction';
+import { IStartPlaceOrderParams } from './start/factory';
 interface IStartOperationRepos {
     issuer: IssuerRepo;
     member: MemberRepo;
@@ -16,12 +16,11 @@ interface IStartOperationRepos {
     placeOrder: PlaceOrderRepo;
 }
 type IStartOperation<T> = (repos: IStartOperationRepos) => Promise<T>;
-type IStartParams = PlaceOrderFactory.IStartParams;
 interface IStartOptions {
     lockPassport: boolean;
 }
 /**
  * 取引開始
  */
-declare function start(params: IStartParams, options: IStartOptions): IStartOperation<IStartedPlaceOrder>;
-export { start };
+declare function start(params: IStartPlaceOrderParams, options: IStartOptions): IStartOperation<IStartedPlaceOrder>;
+export { start, IStartPlaceOrderParams };

package/lib/chevre/service/transaction/placeOrder/start.js CHANGED Viewed

@@ -10,7 +10,7 @@ const validateStartRequest_1 = require("./start/validateStartRequest");
 function start(params, options) {
     return async (repos) => {
         const { passport, customerType } = await repos.passport.validatePassportTokenIfExist(params);
-        const { memeberOfPayload, sellerMakesOffer, seller } = await (0, validateStartRequest_1.validateStartRequest)({
+        const { sellerMakesOffer, seller } = await (0, validateStartRequest_1.validateStartRequest)({
             project: { id: params.project.id },
             seller: { id: params.seller.id },
             ...(typeof passport?.scope === 'string') ? { customerType } : undefined,
@@ -22,7 +22,7 @@ function start(params, options) {
             throw new factory_1.factory.errors.NotFound('eligibleTransactionDuration.maxValue');
         }
         // 取引ファクトリーで新しい進行中取引オブジェクトを作成
-        const startParams = (0, factory_2.createStartParams)(params, expiresInSeconds, passport, seller, params.broker, customerType, memeberOfPayload);
+        const startParams = (0, factory_2.createStartParams)(params, expiresInSeconds, passport, seller, customerType);
         let transaction;
         // lock passport(2024-07-05~)
         if (options.lockPassport && passport !== undefined) {

package/lib/chevre/service/transaction/placeOrder.d.ts CHANGED Viewed

@@ -4,6 +4,6 @@
 import { POINT_AWARD_IDENTIFIER_NAME } from '../../factory/order';
 import { confirm } from './placeOrder/confirm';
 import { exportTasksById } from './placeOrder/exportTasksById';
-import { start } from './placeOrder/start';
+import { start, IStartPlaceOrderParams } from './placeOrder/start';
 import { updateAgent } from './placeOrder/updateAgent';
-export { confirm, POINT_AWARD_IDENTIFIER_NAME, start, exportTasksById, updateAgent };
+export { confirm, POINT_AWARD_IDENTIFIER_NAME, start, IStartPlaceOrderParams, exportTasksById, updateAgent };

package/package.json CHANGED Viewed

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "8.2.0-alpha.7",
+    "@chevre/factory": "8.2.0-alpha.9",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -91,5 +91,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "24.1.0-alpha.54"
+  "version": "24.1.0-alpha.56"
 }