@chevre/domain 21.4.0-alpha.2 → 21.4.0-alpha.21

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/productOffer.d.ts

@@ -17,16 +17,18 @@ export declare class MongoRepository {
                 $eq?: string;
             };
         };
-        id?: {
-            $eq?: string;
+        itemOffered?: {
+            id?: {
+                $eq?: string;
+            };
         };
         seller?: {
             id?: {
                 $eq?: string;
             };
         };
-    }): Promise<(Pick<factory.product.IProduct, 'id' | 'name' | 'typeOf'> & {
-        offers: Pick<factory.product.IOffer, 'availabilityEnds' | 'availabilityStarts' | 'seller' | 'validFrom' | 'validThrough'>;
+    }): Promise<(Pick<factory.product.IOffer, 'availabilityEnds' | 'availabilityStarts' | 'seller' | 'validFrom' | 'validThrough'> & {
+        itemOffered: Pick<factory.product.IProduct, 'id' | 'name' | 'typeOf'>;
     })[]>;
     create(params: factory.product.IOffer & {
         project: {
@@ -54,4 +56,17 @@ export declare class MongoRepository {
     }): Promise<{
         id: string;
     }>;
+    deleteOne(params: Pick<factory.product.IOffer, 'seller'> & {
+        project: {
+            id: string;
+        };
+        itemOffered: {
+            /**
+             * プロダクトID
+             */
+            id: string;
+        };
+    }): Promise<{
+        id: string;
+    }>;
 }

package/lib/chevre/repo/productOffer.js

@@ -25,7 +25,7 @@ class MongoRepository {
      * プロダクトオファー検索
      */
     search(params) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         return __awaiter(this, void 0, void 0, function* () {
             const matchStages = [{
                     $match: {
@@ -41,11 +41,11 @@ class MongoRepository {
             if (typeof projectIdEq === 'string') {
                 matchStages.push({ $match: { 'project.id': { $eq: projectIdEq } } });
             }
-            const idEq = (_c = params.id) === null || _c === void 0 ? void 0 : _c.$eq;
-            if (typeof idEq === 'string') {
-                matchStages.push({ $match: { _id: { $eq: new mongoose_1.Types.ObjectId(idEq) } } });
+            const itemOfferedIdEq = (_d = (_c = params.itemOffered) === null || _c === void 0 ? void 0 : _c.id) === null || _d === void 0 ? void 0 : _d.$eq;
+            if (typeof itemOfferedIdEq === 'string') {
+                matchStages.push({ $match: { _id: { $eq: new mongoose_1.Types.ObjectId(itemOfferedIdEq) } } });
             }
-            const sellerIdEq = (_e = (_d = params.seller) === null || _d === void 0 ? void 0 : _d.id) === null || _e === void 0 ? void 0 : _e.$eq;
+            const sellerIdEq = (_f = (_e = params.seller) === null || _e === void 0 ? void 0 : _e.id) === null || _f === void 0 ? void 0 : _f.$eq;
             if (typeof sellerIdEq === 'string') {
                 matchStages.push({ $match: { 'offers.seller.id': { $exists: true, $eq: sellerIdEq } } });
             }
@@ -60,16 +60,16 @@ class MongoRepository {
                 {
                     $project: {
                         _id: 0,
-                        offers: {
-                            availabilityEnds: '$offers.availabilityEnds',
-                            availabilityStarts: '$offers.availabilityStarts',
-                            validFrom: '$offers.validFrom',
-                            validThrough: '$offers.validThrough',
-                            seller: '$offers.seller'
+                        itemOffered: {
+                            id: { $toString: '$_id' },
+                            name: '$name',
+                            typeOf: '$typeOf'
                         },
-                        id: { $toString: '$_id' },
-                        name: '$name',
-                        typeOf: '$typeOf'
+                        availabilityEnds: '$offers.availabilityEnds',
+                        availabilityStarts: '$offers.availabilityStarts',
+                        validFrom: '$offers.validFrom',
+                        validThrough: '$offers.validThrough',
+                        seller: '$offers.seller'
                     }
                 }
             ]);
@@ -158,5 +158,28 @@ class MongoRepository {
             return doc.toObject();
         });
     }
+    deleteOne(params) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const sellerId = (_a = params.seller) === null || _a === void 0 ? void 0 : _a.id;
+            if (typeof sellerId !== 'string' || sellerId.length === 0) {
+                throw new factory.errors.ArgumentNull('seller.id');
+            }
+            const doc = yield this.productModel.findOneAndUpdate({
+                'project.id': { $eq: params.project.id },
+                _id: { $eq: params.itemOffered.id },
+                'offers.seller.id': { $exists: true, $eq: sellerId }
+            }, {
+                $pull: { offers: { 'seller.id': { $exists: true, $eq: sellerId } } }
+            }, {
+                projection: { _id: 1 }
+            })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound('Product');
+            }
+            return doc.toObject();
+        });
+    }
 }
 exports.MongoRepository = MongoRepository;

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>>;
 }