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

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,11 @@ 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 +43,9 @@ const schemaDefinition = {
     checkedIn: { type: Boolean, default: false },
     attended: { type: Boolean, default: false },
     additionalProperty: mongoose_1.SchemaTypes.Mixed,
+    // bookingAgent: SchemaTypes.Mixed,
+    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';
 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,14 @@ export type IReservationAsFindResult = Omit<factory.reservation.eventReservation
      * 実データとしてはまだ存在しているが型から廃止(2026-03-26~)
      */
     underName?: never;
+    /**
+     * discontinue(2026-05-10~)
+     */
+    priceCurrency?: never;
+    /**
+     * discontinue(2026-05-10~)
+     */
+    issuedThrough?: never;
 };
 /**
  * 予約リポジトリ
@@ -142,18 +150,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/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/package.json

@@ -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.12"
 }