@chevre/domain 23.0.0-alpha.17 → 23.0.0-alpha.19

package/example/src/chevre/event/updateEventSellerMakesOffer.ts

@@ -0,0 +1,100 @@
+// tslint:disable:no-console
+import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+const project = { id: String(process.env.PROJECT_ID) };
+const { EVENT_ID } = process.env;
+
+async function main() {
+    if (typeof EVENT_ID !== 'string') {
+        throw new Error('environment variables required');
+    }
+
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const eventSellerMakesOfferRepo = await chevre.repository.EventSellerMakesOffer.createInstance(mongoose.connection);
+    const availabilityEnds = moment('2025-10-26T05:20:00.000Z')
+        .toDate();
+    const availabilityStarts = moment('2025-10-23T15:00:00.000Z')
+        .toDate();
+    const validFrom = moment('2025-10-12T15:00:00.000Z')
+        .toDate();
+    const validThrough = moment('2025-10-26T05:20:00.000Z')
+        .toDate();
+    const result = await eventSellerMakesOfferRepo.updateOffersByEventId(
+        {
+            project: { id: project.id },
+            offers: [
+                {
+                    typeOf: chevre.factory.offerType.Offer,
+                    availableAtOrFrom: {
+                        id: '3eo6okferrsdpfd9j2ce1iv9k7'
+                    },
+                    availabilityEnds,
+                    availabilityStarts,
+                    validFrom,
+                    validThrough
+                },
+                {
+                    typeOf: chevre.factory.offerType.Offer,
+                    availableAtOrFrom: {
+                        id: '51qbjcfr72h62m06vtv5kkhgje'
+                    },
+                    availabilityEnds,
+                    availabilityStarts,
+                    validFrom,
+                    validThrough
+                },
+                {
+                    typeOf: chevre.factory.offerType.Offer,
+                    availableAtOrFrom: {
+                        id: '5h3gs22mu9j3ok7o63uog9o9i3'
+                    },
+                    availabilityEnds,
+                    availabilityStarts,
+                    validFrom,
+                    validThrough
+                },
+                {
+                    typeOf: chevre.factory.offerType.Offer,
+                    availableAtOrFrom: {
+                        id: '66e7p2g713675v96nrhdm975kg'
+                    },
+                    availabilityEnds,
+                    availabilityStarts,
+                    validFrom,
+                    validThrough
+                },
+                {
+                    typeOf: chevre.factory.offerType.Offer,
+                    availableAtOrFrom: {
+                        id: '7divuoimobsfgq95tp1csorjqq'
+                    },
+                    availabilityEnds,
+                    availabilityStarts,
+                    validFrom,
+                    validThrough
+                },
+                {
+                    typeOf: chevre.factory.offerType.Offer,
+                    availableAtOrFrom: {
+                        id: 'ckevmf3fueqcunnideu6artt'
+                    },
+                    availabilityEnds,
+                    availabilityStarts,
+                    validFrom,
+                    validThrough
+                }
+            ],
+            itemOffered: { id: EVENT_ID }
+        }
+    );
+    // tslint:disable-next-line:no-null-keyword
+    console.dir(result, { depth: null });
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/example/src/chevre/paymentServices/findPaymentServices.ts

@@ -0,0 +1,37 @@
+// tslint:disable:no-implicit-dependencies no-console
+import * as  mongoose from 'mongoose';
+import { chevre } from '../../../../lib/index';
+
+const project = { id: String(process.env.PROJECT_ID) };
+
+async function main() {
+    try {
+        await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+        const paymentServiceRepo = await chevre.repository.PaymentService.createInstance(mongoose.connection);
+
+        const limit = 10;
+        const page = 1;
+        const docs = await paymentServiceRepo.projectFields(
+            {
+                limit,
+                page,
+                project: { id: { $eq: project.id } },
+                availableChannel: { id: { $eq: 'xxx' } },
+                id: { $eq: 'xxx' }
+            },
+            ['availableChannel', 'productID']
+        );
+        // tslint:disable-next-line:no-null-keyword
+        console.dir(docs, { depth: null });
+        console.log(docs.length, 'docs found');
+    } catch (error) {
+        throw await chevre.errorHandler.handleMongoError(error);
+    }
+}
+
+main()
+    .then(() => {
+        console.log('success!');
+    })
+    .catch(console.error);

package/lib/chevre/errorHandler.js

@@ -24,6 +24,7 @@ exports.handleAWSError = handleAWSError;
 const http_status_1 = require("http-status");
 const factory_1 = require("./factory");
 let mongo;
+let mongooseError;
 /**
  * https://www.mongodb.com/ja-jp/docs/manual/reference/error-codes/
  */
@@ -44,9 +45,13 @@ function isMongoError(error) {
 }
 function handleMongoError(error) {
     return __awaiter(this, void 0, void 0, function* () {
+        var _a;
         if (mongo === undefined) {
             mongo = (yield Promise.resolve().then(() => require('mongoose'))).mongo;
         }
+        if (mongooseError === undefined) {
+            mongooseError = (yield Promise.resolve().then(() => require('mongoose'))).Error;
+        }
         let handledError = error;
         if (handledError instanceof mongo.MongoError || handledError instanceof mongo.MongoServerError) {
             switch (handledError.code) {
@@ -66,6 +71,11 @@ function handleMongoError(error) {
         if (mongo.BSON.BSONError.isBSONError(handledError)) {
             handledError = new factory_1.errors.Argument('', handledError.message);
         }
+        // handle CastError(2025-10-27~)
+        // CastError: Cast to ObjectId failed for value "xxx" (type string) at path "_id" for model "xxxxxxxxxxxxx"
+        if (handledError instanceof mongooseError.CastError) {
+            handledError = new factory_1.errors.Argument(`${(_a = handledError.model) === null || _a === void 0 ? void 0 : _a.modelName}.${handledError.path}`, (handledError.reason instanceof Error) ? handledError.reason.message : handledError.message);
+        }
         return handledError;
     });
 }

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

@@ -1,54 +1,21 @@
 import type { Connection } from 'mongoose';
 import * as factory from '../factory';
-type IAggregateMakesOfferResult = Pick<factory.event.screeningEvent.ISellerMakesOffer, 'availabilityEnds' | 'availabilityStarts' | 'validFrom' | 'validThrough'> & {
-    itemOffered: {
-        serviceOutput: {
-            reservationFor: {
-                /**
-                 * イベントID
-                 */
-                id: string;
-            };
-        };
-    };
-};
 /**
- * イベントの販売者makesOfferリポジトリ
+ * イベントのアプリケーションオファーリポジトリ
  */
 export declare class EventSellerMakesOfferRepo {
     private readonly eventModel;
     constructor(connection: Connection);
     /**
-     * 指定クライアントのオファーを集計する(2024-10-09~)
+     * 単一イベントのmakesOfferを更新する
      */
-    aggregateMakesOffer(conditions: {
-        limit?: number;
-        page?: number;
+    updateOffersByEventId(params: {
         project: {
-            id: {
-                $eq: string;
-            };
-        };
-        /**
-         * アプリケーション(指定必須)
-         */
-        availableAtOrFrom: {
-            id: {
-                $eq: string;
-            };
+            id: string;
         };
+        offers: factory.event.screeningEvent.ISellerMakesOffer[];
         itemOffered: {
-            serviceOutput: {
-                reservationFor: {
-                    /**
-                     * イベントID
-                     */
-                    id: {
-                        $in?: string[];
-                    };
-                };
-            };
+            id: string;
         };
-    }): Promise<IAggregateMakesOfferResult[]>;
+    }): Promise<void>;
 }
-export {};

package/lib/chevre/repo/eventSellerMakesOffer.js

@@ -11,62 +11,53 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EventSellerMakesOfferRepo = void 0;
 const factory = require("../factory");
-const settings_1 = require("../settings");
+// import { MONGO_MAX_TIME_MS } from '../settings';
 const event_1 = require("./mongoose/schemas/event");
+// type IMatchStage = PipelineStage.Match;
+// type IAggregateMakesOfferResult = Pick<
+//     factory.event.screeningEvent.ISellerMakesOffer,
+//     'availabilityEnds' | 'availabilityStarts' | 'validFrom' | 'validThrough'
+// > & {
+//     itemOffered: {
+//         serviceOutput: {
+//             reservationFor: {
+//                 /**
+//                  * イベントID
+//                  */
+//                 id: string;
+//             };
+//         };
+//     };
+// };
 /**
- * イベントの販売者makesOfferリポジトリ
+ * イベントのアプリケーションオファーリポジトリ
  */
 class EventSellerMakesOfferRepo {
     constructor(connection) {
         this.eventModel = connection.model(event_1.modelName, (0, event_1.createSchema)());
     }
     /**
-     * 指定クライアントのオファーを集計する(2024-10-09~)
+     * 単一イベントのmakesOfferを更新する
      */
-    aggregateMakesOffer(conditions) {
+    updateOffersByEventId(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const { availableAtOrFrom } = conditions;
-            if (typeof ((_a = availableAtOrFrom === null || availableAtOrFrom === void 0 ? void 0 : availableAtOrFrom.id) === null || _a === void 0 ? void 0 : _a.$eq) !== 'string' || availableAtOrFrom.id.$eq === '') {
-                throw new factory.errors.ArgumentNull('availableAtOrFrom.id.$eq');
-            }
-            const matchStages = [
-                { $match: { 'project.id': { $eq: conditions.project.id.$eq } } },
-                { $match: { 'offers.seller.makesOffer.availableAtOrFrom.id': { $exists: true, $eq: availableAtOrFrom.id.$eq } } }
-            ];
-            const reservationForIdIn = conditions.itemOffered.serviceOutput.reservationFor.id.$in;
-            if (Array.isArray(reservationForIdIn)) {
-                matchStages.push({ $match: { _id: { $in: reservationForIdIn } } });
-            }
-            const aggregate = this.eventModel.aggregate([
-                { $unwind: '$offers.seller.makesOffer' },
-                ...matchStages,
-                { $sort: { _id: factory.sortType.Ascending } },
-                {
-                    $project: {
-                        _id: 0,
-                        availabilityEnds: '$offers.seller.makesOffer.availabilityEnds',
-                        availabilityStarts: '$offers.seller.makesOffer.availabilityStarts',
-                        validFrom: '$offers.seller.makesOffer.validFrom',
-                        validThrough: '$offers.seller.makesOffer.validThrough',
-                        itemOffered: {
-                            serviceOutput: {
-                                reservationFor: {
-                                    id: { $toString: '$_id' }
-                                }
-                            }
-                        }
-                    }
+            const { offers, itemOffered, project } = params;
+            const updateQuery = {
+                $set: {
+                    'offers.seller.makesOffer': offers
                 }
-            ]);
-            if (typeof conditions.limit === 'number' && conditions.limit > 0) {
-                const page = (typeof conditions.page === 'number' && conditions.page > 0) ? conditions.page : 1;
-                aggregate.limit(conditions.limit * page)
-                    .skip(conditions.limit * (page - 1));
-            }
-            return aggregate
-                .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            };
+            const updateFilter = {
+                _id: { $eq: itemOffered.id },
+                'project.id': { $eq: project.id }
+            };
+            const queryOptions = { upsert: false, new: false, projection: { _id: 1 } };
+            const doc = yield this.eventModel.findOneAndUpdate(updateFilter, updateQuery, queryOptions)
+                .lean()
                 .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(this.eventModel.modelName);
+            }
         });
     }
 }

package/package.json

@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "23.0.0-alpha.17"
+  "version": "23.0.0-alpha.19"
 }

package/example/src/chevre/aggregateEventSellerMakesOffer.ts

@@ -1,32 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-const project = { id: String(process.env.PROJECT_ID) };
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const eventSellerMakesOfferRepo = await chevre.repository.EventSellerMakesOffer.createInstance(mongoose.connection);
-    const result = await eventSellerMakesOfferRepo.aggregateMakesOffer(
-        {
-            limit: 10,
-            page: 1,
-            // id: { $eq: 'bm0f0cadu' },
-            // typeOf: chevre.factory.eventType.ScreeningEvent,
-            project: { id: { $eq: project.id } },
-            availableAtOrFrom: { id: { $eq: '3eo6okferrsdpfd9j2ce1iv9k7' } },
-            itemOffered: {
-                serviceOutput: { reservationFor: { id: { $in: ['bm0f0cadu', 'blco2394l'] } } }
-            }
-        }
-    );
-    // tslint:disable-next-line:no-null-keyword
-    console.dir(result, { depth: null });
-    console.dir(result.length, 'results found');
-}
-
-main()
-    .then(console.log)
-    .catch(console.error);

package/example/src/chevre/searchPaymentServices.ts

@@ -1,32 +0,0 @@
-// tslint:disable:no-implicit-dependencies no-console
-import * as  mongoose from 'mongoose';
-import { chevre } from '../../../lib/index';
-
-const project = { id: String(process.env.PROJECT_ID) };
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const paymentServiceRepo = await chevre.repository.PaymentService.createInstance(mongoose.connection);
-
-    const limit = 10;
-    const page = 1;
-    const docs = await paymentServiceRepo.projectFields(
-        {
-            limit,
-            page,
-            project: { id: { $eq: project.id } },
-            availableChannel: { id: { $eq: 'xxx' } }
-        },
-        ['availableChannel', 'productID']
-    );
-    // tslint:disable-next-line:no-null-keyword
-    console.dir(docs, { depth: null });
-    console.log(docs.length, 'docs found');
-}
-
-main()
-    .then(() => {
-        console.log('success!');
-    })
-    .catch(console.error);