@chevre/domain 21.4.0-alpha.8 → 21.4.0

package/lib/chevre/repo/product.js

@@ -151,9 +151,30 @@ class MongoRepository {
         }
         return andConditions;
     }
-    findById(conditions, projection) {
+    findById(conditions, 
+    // inclusion化(2023-07-20~)
+    // projection?: { [key: string]: number }
+    inclusion, exclusion) {
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.productModel.findOne({ _id: conditions.id }, Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection))
+            let projection = {};
+            if (Array.isArray(inclusion) && inclusion.length > 0) {
+                inclusion.forEach((field) => {
+                    projection[field] = 1;
+                });
+            }
+            else {
+                projection = {
+                    __v: 0,
+                    createdAt: 0,
+                    updatedAt: 0
+                };
+                if (Array.isArray(exclusion) && exclusion.length > 0) {
+                    exclusion.forEach((field) => {
+                        projection[field] = 0;
+                    });
+                }
+            }
+            const doc = yield this.productModel.findOne({ _id: conditions.id }, projection)
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.productModel.modelName);
@@ -303,10 +324,34 @@ class MongoRepository {
                 delete params.attributes.id;
             }
             if (typeof params.id === 'string') {
-                // 上書き禁止属性を除外(2022-08-24~)
-                const _a = params.attributes, { id, productID, project, typeOf } = _a, updateFields = __rest(_a, ["id", "productID", "project", "typeOf"]);
-                doc = yield this.productModel.findOneAndUpdate({ _id: params.id }, updateFields, { upsert: false, new: true })
-                    .exec();
+                const _a = params.attributes, { id, productID, project } = _a, updateFields = __rest(_a, ["id", "productID", "project"]);
+                switch (updateFields.typeOf) {
+                    case factory.product.ProductType.EventService:
+                    case factory.product.ProductType.MembershipService:
+                    case factory.product.ProductType.PaymentCard:
+                    case factory.product.ProductType.Product:
+                    case factory.product.ProductType.Transportation:
+                        // 上書き禁止属性を除外(2022-08-24~)
+                        const { offers } = updateFields, updateProductFields = __rest(updateFields, ["offers"]);
+                        doc = yield this.productModel.findOneAndUpdate({
+                            _id: { $eq: params.id },
+                            typeOf: { $eq: updateProductFields.typeOf }
+                        }, updateProductFields, { upsert: false, new: true })
+                            .exec();
+                        break;
+                    case factory.service.paymentService.PaymentServiceType.CreditCard:
+                    case factory.service.paymentService.PaymentServiceType.MovieTicket:
+                        // 上書き禁止属性を除外(2022-08-24~)
+                        const { provider } = updateFields, updatePaymentServiceFields = __rest(updateFields, ["provider"]);
+                        doc = yield this.productModel.findOneAndUpdate({
+                            _id: { $eq: params.id },
+                            typeOf: { $eq: updatePaymentServiceFields.typeOf }
+                        }, updatePaymentServiceFields, { upsert: false, new: true })
+                            .exec();
+                        break;
+                    default:
+                        throw new factory.errors.NotImplemented(`${updateFields.typeOf} not implemented`);
+                }
                 if (doc === null) {
                     throw new factory.errors.NotFound(this.productModel.modelName);
                 }
@@ -315,7 +360,7 @@ class MongoRepository {
                 if (params.createIfNotExist === true) {
                     doc = yield this.productModel.findOneAndUpdate({
                         'project.id': { $eq: params.attributes.project.id },
-                        typeOf: params.attributes.typeOf
+                        typeOf: { $eq: params.attributes.typeOf }
                     }, { $setOnInsert: params.attributes }, { new: true, upsert: true })
                         .exec();
                 }

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

@@ -31,16 +31,18 @@ export declare class MongoRepository {
     private readonly projectModel;
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: factory.project.ISearchConditions): any[];
-    findById(conditions: {
+    findById(params: {
         id: string;
-    }, projection?: any): Promise<factory.project.IProject>;
+        inclusion: string[];
+        exclusion: string[];
+    }): Promise<factory.project.IProject>;
     findAlternateNameById(params: {
         id: string;
     }): Promise<Pick<factory.project.IProject, 'alternateName'>>;
     /**
      * プロジェクト検索
      */
-    search(conditions: factory.project.ISearchConditions, projection?: any): Promise<factory.project.IProject[]>;
+    search(conditions: factory.project.ISearchConditions, inclusion: string[], exclusion: string[]): Promise<factory.project.IProject[]>;
     createById(params: factory.project.IProject): Promise<factory.project.IProject>;
     findByIdAndIUpdate(params: {
         id: string;

package/lib/chevre/repo/project.js

@@ -26,9 +26,7 @@ class MongoRepository {
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (Array.isArray(params.ids)) {
-            andConditions.push({
-                _id: { $in: params.ids }
-            });
+            andConditions.push({ _id: { $in: params.ids } });
         }
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
@@ -52,9 +50,29 @@ class MongoRepository {
         }
         return andConditions;
     }
-    findById(conditions, projection) {
+    findById(params
+    // projection?: any
+    ) {
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.projectModel.findOne({ _id: conditions.id }, Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection))
+            let projection = {};
+            if (Array.isArray(params.inclusion) && params.inclusion.length > 0) {
+                params.inclusion.forEach((field) => {
+                    projection[field] = 1;
+                });
+            }
+            else {
+                projection = {
+                    __v: 0,
+                    createdAt: 0,
+                    updatedAt: 0
+                };
+                if (Array.isArray(params.exclusion) && params.exclusion.length > 0) {
+                    params.exclusion.forEach((field) => {
+                        projection[field] = 0;
+                    });
+                }
+            }
+            const doc = yield this.projectModel.findOne({ _id: { $eq: params.id } }, projection)
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.projectModel.modelName);
@@ -64,7 +82,7 @@ class MongoRepository {
     }
     findAlternateNameById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.projectModel.findOne({ _id: params.id }, { alternateName: 1 })
+            const doc = yield this.projectModel.findOne({ _id: { $eq: params.id } }, { alternateName: 1 })
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.projectModel.modelName);
@@ -75,11 +93,33 @@ class MongoRepository {
     /**
      * プロジェクト検索
      */
-    search(conditions, projection) {
+    search(conditions, 
+    // inclusion対応(2023-07-27~)
+    inclusion, exclusion
+    // projection?: any
+    ) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const andConditions = MongoRepository.CREATE_MONGO_CONDITIONS(conditions);
-            const query = this.projectModel.find((andConditions.length > 0) ? { $and: andConditions } : {}, Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection));
+            let projection = {};
+            if (Array.isArray(inclusion) && inclusion.length > 0) {
+                inclusion.forEach((field) => {
+                    projection[field] = 1;
+                });
+            }
+            else {
+                projection = {
+                    __v: 0,
+                    createdAt: 0,
+                    updatedAt: 0
+                };
+                if (Array.isArray(exclusion) && exclusion.length > 0) {
+                    exclusion.forEach((field) => {
+                        projection[field] = 0;
+                    });
+                }
+            }
+            const query = this.projectModel.find((andConditions.length > 0) ? { $and: andConditions } : {}, projection);
             if (typeof conditions.limit === 'number' && conditions.limit > 0) {
                 const page = (typeof conditions.page === 'number' && conditions.page > 0) ? conditions.page : 1;
                 query.limit(conditions.limit)

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

@@ -1,11 +1,39 @@
+/// <reference types="mongoose/types/aggregate" />
+/// <reference types="mongoose/types/callback" />
+/// <reference types="mongoose/types/collection" />
+/// <reference types="mongoose/types/connection" />
+/// <reference types="mongoose/types/cursor" />
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/error" />
+/// <reference types="mongoose/types/expressions" />
+/// <reference types="mongoose/types/helpers" />
+/// <reference types="mongoose/types/middlewares" />
+/// <reference types="mongoose/types/indexes" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/mongooseoptions" />
+/// <reference types="mongoose/types/pipelinestage" />
+/// <reference types="mongoose/types/populate" />
+/// <reference types="mongoose/types/query" />
+/// <reference types="mongoose/types/schemaoptions" />
+/// <reference types="mongoose/types/schematypes" />
+/// <reference types="mongoose/types/session" />
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/utility" />
+/// <reference types="mongoose/types/validation" />
+/// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/inferschematype" />
 import { BulkWriteResult as BulkWriteOpResultObject } from 'mongodb';
 import { Connection, UpdateWriteOpResult } from 'mongoose';
 import * as factory from '../factory';
 export interface IUpdatePartiallyParams {
     additionalTicketText?: string;
-    'reservedTicket.dateUsed'?: Date;
 }
 export type ICancelResult = UpdateWriteOpResult;
+export type ICreatingReservation<T extends factory.reservationType> = T extends factory.reservationType.BusReservation ? (factory.reservation.busReservation.IReservation) & {
+    _id: string;
+} : T extends factory.reservationType.EventReservation ? (factory.reservation.eventReservation.IReservation) & {
+    _id: string;
+} : never;
 /**
  * 予約リポジトリ
  */
@@ -13,10 +41,6 @@ export declare class MongoRepository {
     private readonly reservationModel;
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: factory.reservation.ISearchConditions<factory.reservationType>): any[];
-    createMany(params: {
-        reservations: factory.assetTransaction.reserve.IObjectSubReservation[];
-        reservationFor: factory.assetTransaction.reserve.IReservationFor;
-    }): Promise<void>;
     /**
      * 汎用予約カウント
      */
@@ -32,26 +56,13 @@ export declare class MongoRepository {
         inclusion?: string[];
         exclusion?: string[];
     }): Promise<factory.reservation.IReservation<T>>;
-    confirmByReservationNumber(params: {
-        reservationNumber: string;
-        previousReservationStatus: factory.reservationStatusType;
-        underName?: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
-        broker?: factory.reservation.IBroker<factory.reservationType>;
-        issuedThrough?: factory.assetTransaction.reserve.IIssuedThrough;
-    }): Promise<void>;
-    confirmByIdIfNotExist__(params: {
-        reservation: factory.assetTransaction.reserve.IObjectSubReservation;
-        reservationFor: factory.assetTransaction.reserve.IReservationFor;
-        underName?: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
-        broker?: factory.reservation.IBroker<factory.reservationType>;
-        issuedThrough?: factory.assetTransaction.reserve.IIssuedThrough;
-    }): Promise<void>;
     confirmManyIfNotExist(params: {
+        provider: factory.reservation.IProvider;
         subReservation: factory.assetTransaction.reserve.IObjectSubReservation[];
+        issuedThrough: factory.assetTransaction.reserve.IIssuedThrough;
         reservationFor: factory.assetTransaction.reserve.IReservationFor;
         underName?: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
         broker?: factory.reservation.IBroker<factory.reservationType>;
-        issuedThrough?: factory.assetTransaction.reserve.IIssuedThrough;
     }): Promise<BulkWriteOpResultObject | void>;
     /**
      * 予約取消
@@ -103,7 +114,7 @@ export declare class MongoRepository {
     updatePartiallyById(params: {
         id: string;
         update: IUpdatePartiallyParams;
-    }): Promise<factory.reservation.eventReservation.IReservation>;
+    }): Promise<Pick<factory.reservation.eventReservation.IReservation, 'id'>>;
     deleteByIds(params: {
         project: {
             id: string;
@@ -131,4 +142,5 @@ export declare class MongoRepository {
         };
     }): Promise<string[]>;
     deleteReservedTicketUnderName(): Promise<import("mongodb").UpdateResult>;
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
 }