@chevre/domain 24.1.0-alpha.11 → 24.1.0-alpha.13

package/lib/chevre/repo/assetTransaction/reserve.d.ts

@@ -1,6 +1,7 @@
 import type { Connection } from 'mongoose';
 import { factory } from '../../factory';
 type ISubReservationAsFindResult = Pick<factory.reservation.eventReservation.IReservation, 'underName' | 'id'> & {
+    numSeats?: number;
     price?: factory.reservation.eventReservation.IPrice;
     reservedTicket?: Pick<factory.reservation.eventReservation.IReservedTicket, 'ticketType'>;
     reservationFor?: factory.assetTransaction.reserve.IReservationFor;

package/lib/chevre/repo/assetTransaction/reserve.js

@@ -91,6 +91,7 @@ class ReserveTransactionRepo {
                 $project: {
                     _id: 0,
                     id: '$object.subReservation.id',
+                    numSeats: '$object.subReservation.numSeats',
                     price: '$object.subReservation.price',
                     underName: '$object.underName',
                     reservationFor: '$object.reservationFor',

package/lib/chevre/repo/mongoose/schemas/reservation.d.ts

@@ -3,9 +3,10 @@ import { IVirtuals } from '../virtuals';
 import { factory } from '../../../factory';
 type IDocType = (Omit<factory.reservation.eventReservation.IReservation, 'id'>) & {
     _id: string;
-    bookingAgent?: any;
     previousReservationStatus?: factory.reservationStatusType;
-    priceCurrency?: factory.priceCurrency;
+    price?: never;
+    priceCurrency?: never;
+    issuedThrough?: never;
 };
 type IModel = Model<IDocType, Record<string, never>, Record<string, never>, IVirtuals>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;

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

@@ -22,18 +22,10 @@ const schemaDefinition = {
         required: true
     },
     additionalTicketText: String,
-    bookingAgent: mongoose_1.SchemaTypes.Mixed,
     bookingTime: Date,
     broker: mongoose_1.SchemaTypes.Mixed,
-    // cancelReservationUrl: String,
-    // checkinUrl: String,
-    // confirmReservationUrl: String,
     modifiedTime: Date,
-    // modifyReservationUrl: String,
-    numSeats: Number,
     previousReservationStatus: String,
-    price: mongoose_1.SchemaTypes.Mixed,
-    priceCurrency: String,
     programMembershipUsed: mongoose_1.SchemaTypes.Mixed,
     reservationFor: mongoose_1.SchemaTypes.Mixed,
     reservationNumber: {
@@ -50,6 +42,11 @@ const schemaDefinition = {
     checkedIn: { type: Boolean, default: false },
     attended: { type: Boolean, default: false },
     additionalProperty: mongoose_1.SchemaTypes.Mixed,
+    // 以下廃止予定
+    // bookingAgent: SchemaTypes.Mixed,
+    numSeats: Number,
+    price: mongoose_1.SchemaTypes.Mixed,
+    priceCurrency: String,
     issuedThrough: mongoose_1.SchemaTypes.Mixed
 };
 const schemaOptions = {

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

@@ -20,7 +20,7 @@ export type ICreatingReservation = Omit<factory.reservation.eventReservation.IRe
 /**
  * 廃止予定の予約属性
  */
-export type IDeprecatedField = 'price' | 'underName';
+export type IDeprecatedField = 'price' | 'underName' | 'priceCurrency' | 'issuedThrough' | 'numSeats';
 export type IKeyOfProjection = Exclude<keyof factory.reservation.eventReservation.IReservation, IDeprecatedField> | 'reservedTicket.dateUsed' | 'reservationFor.id' | 'reservationFor.typeOf';
 export type IAttendedReservation = Pick<factory.reservation.eventReservation.IReservation, 'id' | 'typeOf' | 'project' | 'modifiedTime'> & {
     reservationFor: Pick<factory.reservation.eventReservation.IReservationForMinimized, 'id' | 'typeOf'>;
@@ -35,6 +35,18 @@ export type IReservationAsFindResult = Omit<factory.reservation.eventReservation
      * 実データとしてはまだ存在しているが型から廃止(2026-03-26~)
      */
     underName?: never;
+    /**
+     * discontinue(2026-05-10~)
+     */
+    priceCurrency?: never;
+    /**
+     * discontinue(2026-05-10~)
+     */
+    issuedThrough?: never;
+    /**
+     * discontinue(2026-05-11~)
+     */
+    numSeats?: never;
 };
 /**
  * 予約リポジトリ
@@ -142,18 +154,20 @@ export declare class ReservationRepo {
     }): Promise<string[]>;
     getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<import("@chevre/factory/lib/chevre/reservation/event").IReservation, "id"> & {
         _id: string;
-        bookingAgent?: any;
         previousReservationStatus?: factory.reservationStatusType;
-        priceCurrency?: factory.priceCurrency;
+        price?: never;
+        priceCurrency?: never;
+        issuedThrough?: never;
     } & Required<{
         _id: string;
     }> & {
         __v: number;
     }, import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<import("@chevre/factory/lib/chevre/reservation/event").IReservation, "id"> & {
         _id: string;
-        bookingAgent?: any;
         previousReservationStatus?: factory.reservationStatusType;
-        priceCurrency?: factory.priceCurrency;
+        price?: never;
+        priceCurrency?: never;
+        issuedThrough?: never;
     } & Required<{
         _id: string;
     }> & {

package/lib/chevre/repo/reservation.js

@@ -115,6 +115,7 @@ class ReservationRepo {
         if (Array.isArray(params.subReservation)) {
             params.subReservation.forEach((subReservation) => {
                 const { price: _discontinuePrice, reservedTicket, priceCurrency: _discontinuePriceCurrency, // discontinue priceCurrency
+                numSeats: _numSeats, // discontinue(2026-05-11~)
                 ...subReservationWithoutPrice } = subReservation;
                 const { ticketType: _ticketType, ...reservedTicketWithoutTicketType } = reservedTicket;
                 // discontinue ticketType(2026-05-09~)

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

@@ -59,23 +59,9 @@ export declare class RoleRepo {
     } & {
         __v: number;
     }) | null>;
-    addMember(params: Pick<IRole, 'member' | 'memberOf' | 'roleName'>): Promise<(import("mongoose").FlattenMaps<{
-        typeOf: import("@chevre/factory/lib/chevre/role").RoleType;
-        memberOf: {
-            typeOf: factory.organizationType.Corporation | factory.organizationType.Project;
-        };
-        member: {
-            typeOf: import("@chevre/factory/lib/chevre/role/organizationRole").IMemberType;
-        };
-        roleName: import("@chevre/factory/lib/chevre/role/organizationRole").RoleName;
-        permissions: string[];
-    }> & {
-        _id: import("mongoose").Types.ObjectId;
-    } & {
-        __v: number;
-    }) | null>;
     create(params: Pick<IRole, 'member' | 'memberOf' | 'permissions' | 'roleName'>): Promise<{
         id: string;
     }>;
+    deleteByRoleName(params: Pick<IRole, 'roleName'>): Promise<import("mongodb").DeleteResult>;
 }
 export {};

package/lib/chevre/repo/role.js

@@ -139,20 +139,6 @@ class RoleRepo {
             .lean()
             .exec();
     }
-    async addMember(params) {
-        const { roleName, member, memberOf } = params;
-        return this.roleModel.findOneAndUpdate({
-            roleName: { $eq: roleName },
-            'member.typeOf': { $ne: member.typeOf }
-        }, {
-            $set: { member, memberOf }
-        }, {
-            new: true,
-            projection: { _id: 1 }
-        })
-            .lean()
-            .exec();
-    }
     async create(params) {
         const { member, memberOf, permissions, roleName } = params;
         const creatingRole = {
@@ -167,5 +153,12 @@ class RoleRepo {
         const savedId = insertedId;
         return { id: savedId };
     }
+    async deleteByRoleName(params) {
+        const { roleName } = params;
+        return this.roleModel.deleteOne({
+            roleName: { $eq: roleName }
+        })
+            .exec();
+    }
 }
 exports.RoleRepo = RoleRepo;

package/lib/chevre/service/assetTransaction/cancelReservation/start.d.ts

@@ -18,7 +18,7 @@ export declare function validateStartParams(params: IStartParams): (repos: {
     assetTransaction: AssetTransactionRepo;
 }) => Promise<{
     reserveTransaction: import("@chevre/factory/lib/chevre/assetTransaction/reserve").ITransaction | undefined;
-    reservations: (Pick<import("@chevre/factory/lib/chevre/reservation/event").IReservation, "id" | "typeOf" | "issuedThrough" | "reservationNumber"> & {
+    reservations: (Pick<import("@chevre/factory/lib/chevre/reservation/event").IReservation, "id" | "typeOf" | "reservationNumber"> & {
         reservationFor: Pick<factory.reservation.eventReservation.IReservationForMinimized, "id" | "typeOf">;
     })[] | undefined;
 }>;

package/lib/chevre/service/assetTransaction/cancelReservation/start.js

@@ -43,7 +43,7 @@ function validateStartParams(params) {
                 const reservation = await repos.reservation.findReservationById({
                     id: params.object.reservation.id,
                     inclusion: [
-                        'issuedThrough', 'typeOf', 'reservationNumber', 'reservationFor.id', 'reservationFor.typeOf', 'provider', 'reservationStatus'
+                        'typeOf', 'reservationNumber', 'reservationFor.id', 'reservationFor.typeOf', 'provider', 'reservationStatus'
                     ]
                 });
                 // 販売者検証(2023-08-01~)

package/lib/chevre/service/assetTransaction/reserve/start/factory/createReservation.js

@@ -328,27 +328,17 @@ function createReservation(params) {
     const price4reservation = (0, price_1.createPrice)(params);
     if (params.reservationFor.typeOf === factory_1.factory.eventType.ScreeningEvent) {
         return {
-            // project: params.project, // 廃止(2024-04-08~)
             typeOf: factory_1.factory.reservationType.EventReservation,
             id: params.id,
             // reservationPackage保管に移行(2023-06-06~)
             // issuedThrough,
             additionalProperty: params.additionalProperty,
-            // bookingTime: params.reserveDate, // 廃止(2024-04-08~)
-            // modifiedTime: params.reserveDate, // 廃止(2024-04-08~)
             numSeats: 1,
             price: price4reservation,
             priceCurrency: factory_1.factory.priceCurrency.JPY,
-            // reservationNumber: params.reservationNumber, // 廃止(2024-04-08~)
             // statusは不要なので削除(2023-07-19~)
             // reservationStatus: factory.reservationStatusType.ReservationPending,
             reservedTicket: params.reservedTicket,
-            // underName: { // 廃止(2024-04-08~)
-            //     typeOf: params.agent.typeOf,
-            //     name: params.agent.name
-            // },
-            // checkedIn: false, // 廃止(2024-04-08~)
-            // attended: false, // 廃止(2024-04-08~)
             ...(typeof params.additionalTicketText === 'string') ? { additionalTicketText: params.additionalTicketText } : undefined,
             ...(Array.isArray(params.subReservation))
                 ? {
@@ -362,8 +352,6 @@ function createReservation(params) {
                     })
                 }
                 : undefined,
-            // reservationPackage保管に移行(2023-06-06~)
-            // ...(typeof params.broker?.typeOf === 'string') ? { broker: params.broker } : undefined,
             ...(typeof params.programMembershipUsed?.identifier === 'string')
                 ? { programMembershipUsed: params.programMembershipUsed }
                 : undefined

package/lib/chevre/service/reserve/findReservations.d.ts

@@ -5,13 +5,14 @@ import type { IDeprecatedField, IKeyOfProjection, ReservationRepo } from '../../
  * 予約検索レスポンスとしての予約
  * 予約ドキュメントに予約取引の情報を補完する
  */
-type IReservationAsFindResult = Omit<factory.reservation.eventReservation.IReservation, 'price' | 'priceCurrency' | 'underName' | 'reservedTicket' | 'reservationFor' | 'issuedThrough'> & {
+type IReservationAsFindResult = Omit<factory.reservation.eventReservation.IReservation, 'price' | 'priceCurrency' | 'underName' | 'reservedTicket' | 'reservationFor' | 'issuedThrough' | 'numSeats'> & {
     price?: factory.reservation.eventReservation.IPrice;
     priceCurrency?: factory.priceCurrency.JPY;
     underName?: factory.assetTransaction.reserve.IUnderName;
     reservedTicket?: factory.assetTransaction.reserve.IObjectSubReservation['reservedTicket'];
     reservationFor?: factory.assetTransaction.reserve.IReservationFor;
     issuedThrough?: factory.assetTransaction.reserve.IIssuedThrough;
+    numSeats?: number;
 };
 /**
  * 予約を検索する

package/lib/chevre/service/reserve/findReservations.js

@@ -25,6 +25,7 @@ function findReservations(params, options) {
             const requireReservedTicket = Object.keys(inclusion).includes('reservedTicket');
             const requireReservationFor = Object.keys(inclusion).includes('reservationFor');
             const requireIssuedThrough = Object.keys(inclusion).includes('issuedThrough');
+            const requireNumSeats = Object.keys(inclusion).includes('numSeats');
             const reservationIds = rawReservations.map(({ id }) => id);
             const subReservations = await repos.assetTransaction.reserve.findSubReservationsById({
                 ids: reservationIds
@@ -38,6 +39,7 @@ function findReservations(params, options) {
                 const ticketTypeByTransaction = subReservationByTransaction?.reservedTicket?.ticketType;
                 const reservationForByTransaction = subReservationByTransaction?.reservationFor;
                 const issuedThroughByTransaction = subReservationByTransaction?.issuedThrough;
+                const numSeatsByTransaction = subReservationByTransaction?.numSeats;
                 // 予約ドキュメントを最適化し始めたため、もう等しくない(2026-04-06~)
                 // // 予約取引から参照した属性と全く等しいはず
                 // if (requirePrice) {
@@ -53,7 +55,7 @@ function findReservations(params, options) {
                 //         console.error('reservationForMatched: false!!!', reservation.id);
                 //     }
                 // }
-                const { reservationFor: _reservationFor, issuedThrough: _issuedThrough, priceCurrency: _priceCurrency, reservedTicket, ...rawReservation4result } = reservation;
+                const { reservationFor: _reservationFor, issuedThrough: _issuedThrough, priceCurrency: _priceCurrency, numSeats: _numSeats, reservedTicket, ...rawReservation4result } = reservation;
                 return {
                     ...rawReservation4result, // 予約ドキュメントはそのまま返す
                     ...(requirePrice && priceByTransaction !== undefined) ? { price: priceByTransaction } : undefined, // priceがあれば上書き
@@ -73,6 +75,9 @@ function findReservations(params, options) {
                     ...(requireIssuedThrough && issuedThroughByTransaction !== undefined)
                         ? { issuedThrough: issuedThroughByTransaction }
                         : undefined, // issuedThroughがあれば上書き(2026-05-09~)
+                    ...(requireNumSeats && numSeatsByTransaction !== undefined)
+                        ? { numSeats: numSeatsByTransaction }
+                        : undefined, // issuedThroughがあれば上書き(2026-05-09~)
                 };
             });
         }

package/lib/chevre/service/reserve/potentialActions/onReservationConfirmed.js

@@ -98,22 +98,14 @@ function onReservationConfirmed(confirmedReservations, reserveAction) {
                 }
             }
             const subReservations4inform = confirmedReservations.map((r) => {
-                const { additionalProperty, additionalTicketText, 
-                // attended, checkedIn,
-                id, modifiedTime, 
-                // numSeats,
-                price, programMembershipUsed, reservedTicket, subReservation, typeOf } = r;
+                const { additionalProperty, additionalTicketText, id, modifiedTime, price, programMembershipUsed, reservedTicket, subReservation, typeOf } = r;
                 return {
-                    // bookingTime, // discontinue(2024-10-27~)
                     id,
                     typeOf,
                     reservedTicket,
                     ...(Array.isArray(additionalProperty)) ? { additionalProperty } : undefined,
                     ...(typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined,
-                    // ...(typeof attended === 'boolean') ? { attended } : undefined, // discontinue(2024-10-27~)
-                    // ...(typeof checkedIn === 'boolean') ? { checkedIn } : undefined, // discontinue(2024-10-27~)
                     ...(modifiedTime instanceof Date) ? { modifiedTime } : undefined,
-                    // ...(typeof numSeats === 'number') ? { numSeats } : undefined, // discontinue(2024-10-27~)
                     ...(price !== undefined) ? { price } : undefined,
                     ...(programMembershipUsed !== undefined) ? { programMembershipUsed } : undefined,
                     ...(Array.isArray(subReservation)) ? { subReservation } : undefined

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": "8.1.0-alpha.6",
+    "@chevre/factory": "8.1.0-alpha.7",
     "@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.11"
+  "version": "24.1.0-alpha.13"
 }