@chevre/domain 22.5.0-alpha.21 → 22.5.0-alpha.23

package/example/src/chevre/migrateSellerMakesOfferAvailableAt.ts

@@ -0,0 +1,89 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+// const excludedProject = { id: String(process.env.EXCLUDED_PROJECT_ID) };
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const sellerRepo = await chevre.repository.Seller.createInstance(mongoose.connection);
+
+    const cursor = sellerRepo.getCursor(
+        {
+            _id: { $eq: '59d20831e53ebc2b4e774466' }
+        },
+        {
+            _id: 1,
+            makesOffer: 1,
+            startDate: 1,
+            project: 1,
+            typeOf: 1
+        }
+    );
+    console.log('docs found');
+
+    let i = 0;
+    let updateCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const seller: Pick<
+            chevre.factory.seller.ISeller,
+            'id' | 'typeOf' | 'name' | 'project' | 'makesOffer'
+        > = doc.toObject();
+
+        console.log(
+            'alreadyMigrated?', seller.project.id, seller.typeOf, seller.id, seller.name?.ja, i);
+        const originMakesOffer = seller.makesOffer;
+        const alreadyMigrated = !Array.isArray(originMakesOffer)
+            || (Array.isArray(originMakesOffer)
+                && originMakesOffer.every(
+                    ({ availableAtOrFrom }) => !Array.isArray(availableAtOrFrom) && typeof availableAtOrFrom?.id === 'string'
+                ));
+
+        if (alreadyMigrated) {
+            console.log(
+                'already migrated.', seller.project.id, seller.typeOf, seller.id, seller.name?.ja, i);
+        } else {
+            if (Array.isArray(originMakesOffer)) {
+                const newMakesOffer: chevre.factory.seller.IMakesOffer[] = originMakesOffer.map((offer) => {
+                    let newAvailableAtOrFrom: { id: string } | undefined;
+                    if (Array.isArray(offer.availableAtOrFrom)) {
+                        newAvailableAtOrFrom = offer.availableAtOrFrom.at(0);
+                    }
+                    if (newAvailableAtOrFrom === undefined) {
+                        throw new Error('newAvailableAtOrFrom undefined');
+                    }
+
+                    return {
+                        ...offer,
+                        availableAtOrFrom: newAvailableAtOrFrom
+                    };
+                });
+                console.log(
+                    'updating project...',
+                    seller.project.id, seller.typeOf, seller.id, seller.name?.ja, i, newMakesOffer);
+                // await sellerRepo.save({
+                //     id: String(seller.id),
+                //     attributes: <any>{
+                //         makesOffer: newMakesOffer
+                //     }
+                // });
+                updateCount += 1;
+                console.log(
+                    'updated.',
+                    seller.project.id, seller.typeOf, seller.id, seller.name?.ja, i);
+            }
+        }
+    });
+
+    console.log(i, 'docs checked');
+    console.log(updateCount, 'docs updated');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/searchSellersByAggregate.ts

@@ -36,8 +36,7 @@ async function main() {
             // paymentAccepted: { paymentMethodType: { $eq: 'Cash' } },
             // hasMerchantReturnPolicy: { applicablePaymentMethod: {} }
         },
-        [],
-        ['hasMerchantReturnPolicy', 'additionalProperty', 'project', 'name', 'typeOf', 'url', 'telephone']
+        ['id', 'typeOf']
     );
     console.log('sellers found', sellers, sellers[0]?.hasMerchantReturnPolicy);
     console.log(sellers.length, 'sellers found');

package/example/src/chevre/unsetUnnecessaryFields.ts

@@ -4,6 +4,8 @@ import * as mongoose from 'mongoose';
 
 import { chevre } from '../../../lib/index';
 
+const excludedProject = { id: String(process.env.EXCLUDED_PROJECT_ID) };
+
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
@@ -12,6 +14,7 @@ async function main() {
     let updateResult: any;
     updateResult = await eventRepo.unsetUnnecessaryFields({
         filter: {
+            'project.id': { $ne: excludedProject.id },
             'offers.validFrom': { $exists: true },
             startDate: {
                 $gte: moment()

package/example/src/chevre/upsertManyEventsByAdditionalProperty.ts

@@ -6,6 +6,7 @@ const PROJECT_ID = String(process.env.PROJECT_ID);
 
 // tslint:disable-next-line:max-func-body-length
 async function main() {
+    const now = new Date();
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
     const eventRepo = await chevre.repository.Event.createInstance(mongoose.connection);
@@ -14,8 +15,8 @@ async function main() {
             {
                 additionalProperty: [
                     {
-                        name: 'createId',
-                        value: 'akeuu512i-10-202409151130-01'
+                        name: 'sampleCreateId',
+                        value: 'akeuu512i-202410171410-01'
                     }
                 ],
                 project: {
@@ -23,10 +24,10 @@ async function main() {
                     typeOf: chevre.factory.organizationType.Project
                 },
                 typeOf: chevre.factory.eventType.ScreeningEvent,
-                doorTime: new Date('2024-09-15T02:30:00.000Z'),
-                endDate: new Date('2024-09-15T11:45:00.000Z'),
-                // eventStatus: chevre.factory.eventStatusType.EventScheduled,
-                eventStatus: chevre.factory.eventStatusType.EventCancelled,
+                doorTime: new Date('2024-10-17T05:30:00.000Z'),
+                endDate: new Date('2024-10-17T05:45:00.000Z'),
+                eventStatus: chevre.factory.eventStatusType.EventScheduled,
+                // eventStatus: chevre.factory.eventStatusType.EventCancelled,
                 location: {
                     typeOf: chevre.factory.placeType.ScreeningRoom,
                     branchCode: '10',
@@ -106,7 +107,16 @@ async function main() {
                             ja: 'シネモーション赤坂',
                             en: 'CineMotion Akasaka'
                         },
-                        makesOffer: []
+                        makesOffer: [
+                            {
+                                typeOf: chevre.factory.offerType.Offer,
+                                availableAtOrFrom: { id: '51qbjcfr72h62m06vtv5kkhgje' },
+                                availabilityEnds: now,
+                                availabilityStarts: now,
+                                validFrom: now,
+                                validThrough: now
+                            }
+                        ]
                     },
                     unacceptedPaymentMethod: [
                         'MovieTicket'
@@ -115,7 +125,7 @@ async function main() {
                 organizer: {
                     id: '59d20831e53ebc2b4e774466'
                 },
-                startDate: new Date('2024-09-15T02:30:00.000Z'),
+                startDate: new Date('2024-10-17T05:30:00.000Z'),
                 superEvent: {
                     typeOf: chevre.factory.eventType.ScreeningEventSeries,
                     id: 'akeuu512i',
@@ -163,13 +173,14 @@ async function main() {
                 }
             }
         ],
-        additionalPropertyFilter: { name: 'createId' },
+        additionalPropertyFilter: { name: 'sampleCreateId' },
         eventSeries: {
             id: 'akeuu512i'
         },
         screeningRoom: {
             branchCode: '10'
-        }
+        },
+        options: { updateOffersSeller: false }
     });
     // tslint:disable-next-line:no-null-keyword
     console.dir(result, { depth: null });

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

@@ -116,6 +116,9 @@ export declare class EventRepo {
              */
             branchCode: string;
         };
+        options: {
+            updateOffersSeller: boolean;
+        };
     }): Promise<{
         bulkWriteResult: BulkWriteResult;
         modifiedEvents: {

package/lib/chevre/repo/event.js

@@ -387,8 +387,10 @@ class EventRepo {
      * 施設コンテンツとルームは1つに限定
      * 存在すれば、特定の属性のみ更新する
      */
+    // tslint:disable-next-line:max-func-body-length
     upsertManyByAdditionalProperty(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { updateOffersSeller } = params.options;
             const uniqid = yield Promise.resolve().then(() => require('uniqid'));
             const bulkWriteOps = [];
             const additionalProperties = [];
@@ -406,7 +408,7 @@ class EventRepo {
                     additionalProperties.push({ name: additionalPropertyFilter.name, value: additionalPropertyValue });
                     const { coaInfo, // ←適用しない
                     maximumAttendeeCapacity, remainingAttendeeCapacity, checkInCount, attendeeCount, aggregateReservation, // ←適用しない
-                    eventStatus, superEvent } = creatingEventParams, setOnInsertFields = __rest(creatingEventParams, ["coaInfo", "maximumAttendeeCapacity", "remainingAttendeeCapacity", "checkInCount", "attendeeCount", "aggregateReservation", "eventStatus", "superEvent"]);
+                    eventStatus, superEvent, offers } = creatingEventParams, setOnInsertFields = __rest(creatingEventParams, ["coaInfo", "maximumAttendeeCapacity", "remainingAttendeeCapacity", "checkInCount", "attendeeCount", "aggregateReservation", "eventStatus", "superEvent", "offers"]);
                     if (superEvent.id !== eventSeries.id) {
                         throw new factory.errors.Argument('superEvent.id', 'superEvent.id not matched');
                     }
@@ -424,17 +426,23 @@ class EventRepo {
                         },
                         'superEvent.id': { $exists: true, $eq: superEvent.id } // add superEvent.id(2024-09-15~)
                     };
-                    const setOnInsert = Object.assign(Object.assign({}, setOnInsertFields), { _id: uniqid() });
+                    let setOnInsert;
+                    if (updateOffersSeller) {
+                        setOnInsert = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, setOnInsertFields), { 'offers.typeOf': offers.typeOf, 'offers.eligibleQuantity': offers.eligibleQuantity, 'offers.itemOffered': offers.itemOffered }), (offers.offeredThrough !== undefined) ? { 'offers.offeredThrough': offers.offeredThrough } : undefined), (offers.unacceptedPaymentMethod !== undefined)
+                            ? { 'offers.unacceptedPaymentMethod': offers.unacceptedPaymentMethod }
+                            : undefined), { _id: uniqid() });
+                    }
+                    else {
+                        setOnInsert = Object.assign(Object.assign({}, setOnInsertFields), { offers, _id: uniqid() });
+                    }
                     bulkWriteOps.push({
                         updateOne: {
                             filter,
                             update: {
                                 $setOnInsert: setOnInsert,
                                 // 変更可能な属性のみ上書き
-                                $set: {
-                                    eventStatus,
-                                    superEvent // add superEvent(2024-09-15~)
-                                }
+                                $set: Object.assign({ eventStatus,
+                                    superEvent }, (updateOffersSeller) ? { 'offers.seller': offers.seller } : undefined)
                             },
                             upsert: true
                         }
@@ -672,7 +680,13 @@ class EventRepo {
                 positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PUBLIC_PROJECT_FIELDS.includes(key));
                 projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
                 if (includeOffers) {
-                    projection = Object.assign(Object.assign(Object.assign({}, projection), { 'offers.typeOf': 1, 'offers.availabilityEnds': 1, 'offers.availabilityStarts': 1, 'offers.eligibleQuantity': 1, 'offers.itemOffered': 1, 'offers.offeredThrough': 1, 'offers.validFrom': 1, 'offers.validThrough': 1, 'offers.unacceptedPaymentMethod': 1, 'offers.seller.typeOf': 1, 'offers.seller.id': 1, 'offers.seller.name': 1 }), (includeSellerMakesOffer)
+                    projection = Object.assign(Object.assign(Object.assign({}, projection), { 'offers.typeOf': 1, 
+                        // 'offers.availabilityEnds': 1,
+                        // 'offers.availabilityStarts': 1,
+                        'offers.eligibleQuantity': 1, 'offers.itemOffered': 1, 'offers.offeredThrough': 1, 
+                        // 'offers.validFrom': 1,
+                        // 'offers.validThrough': 1,
+                        'offers.unacceptedPaymentMethod': 1, 'offers.seller.typeOf': 1, 'offers.seller.id': 1, 'offers.seller.name': 1 }), (includeSellerMakesOffer)
                         ? Object.assign({}, (Array.isArray(sellerMakesOfferAvailableAtIn))
                             ? {
                                 'offers.seller.makesOffer': {

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

@@ -165,51 +165,6 @@ const indexes = [
         { endDate: 1, startDate: 1 },
         { name: 'searchByEndDate' }
     ],
-    [
-        { 'offers.availabilityEnds': 1, startDate: 1 },
-        {
-            name: 'searchByOffersAvailabilityEnds-v2',
-            partialFilterExpression: {
-                'offers.availabilityEnds': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'offers.availabilityStarts': 1, startDate: 1 },
-        {
-            name: 'searchByOffersAvailabilityStarts-v2',
-            partialFilterExpression: {
-                'offers.availabilityStarts': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'offers.validThrough': 1, startDate: 1 },
-        {
-            name: 'searchByOffersValidThrough-v2',
-            partialFilterExpression: {
-                'offers.validThrough': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'offers.validFrom': 1, startDate: 1 },
-        {
-            name: 'searchByOffersValidFrom-v2',
-            partialFilterExpression: {
-                'offers.validFrom': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'offers.id': 1, startDate: 1 },
-        {
-            name: 'searchByOffersId-v2',
-            partialFilterExpression: {
-                'offers.id': { $exists: true }
-            }
-        }
-    ],
     [
         {
             'offers.itemOffered.serviceOutput.reservedTicket.ticketedSeat.typeOf': 1,

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

@@ -75,7 +75,7 @@ export declare class SellerRepo {
     /**
      * 販売者検索
      */
-    projectFields(conditions: factory.seller.ISearchConditions & IMemberSearchConditions, inclusion: IKeyOfProjection[], exclusion: IKeyOfProjection[]): Promise<ISellerWithId[]>;
+    projectFields(conditions: factory.seller.ISearchConditions & IMemberSearchConditions, inclusion: IKeyOfProjection[]): Promise<ISellerWithId[]>;
     /**
      * 販売者を削除する
      */

package/lib/chevre/repo/seller.js

@@ -274,7 +274,7 @@ class SellerRepo {
     /**
      * 販売者検索
      */
-    projectFields(conditions, inclusion, exclusion) {
+    projectFields(conditions, inclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const andConditions = SellerRepo.CREATE_MONGO_CONDITIONS(conditions);
@@ -283,37 +283,18 @@ class SellerRepo {
                 positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
             }
             else {
-                if (Array.isArray(exclusion) && exclusion.length > 0) {
-                    positiveProjectionFields = positiveProjectionFields.filter((key) => !exclusion.includes(key));
-                }
+                // discontinue(2024-10-19~)
+                // if (Array.isArray(exclusion) && exclusion.length > 0) {
+                //     positiveProjectionFields = positiveProjectionFields.filter((key) => !exclusion.includes(key));
+                // }
             }
             const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
-            // let projection: { [key: string]: number } = {};
-            // if (Array.isArray(inclusion) && inclusion.length > 0) {
-            //     inclusion.forEach((field) => {
-            //         projection[field] = 1;
-            //     });
-            // } else {
-            //     projection = {
-            //         __v: 0,
-            //         createdAt: 0,
-            //         updatedAt: 0,
-            //         paymentAccepted: 0 // 除外(2023-12-01~)
-            //     };
-            //     if (Array.isArray(exclusion) && exclusion.length > 0) {
-            //         exclusion.forEach((field) => {
-            //             projection[field] = 0;
-            //         });
-            //     }
-            // }
             const query = this.sellerModel.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)
                     .skip(conditions.limit * (page - 1));
             }
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore else */
             if (((_a = conditions.sort) === null || _a === void 0 ? void 0 : _a.branchCode) !== undefined) {
                 query.sort({ branchCode: conditions.sort.branchCode });
             }

package/lib/chevre/service/event.js

@@ -167,7 +167,7 @@ function processUpdateMovieTheater(params) {
                 page: 1,
                 project: { id: { $eq: params.project.id } },
                 branchCode: { $eq: params.locationBranchCode }
-            }, ['id'], []);
+            }, ['id']);
             const sellerWithSameBranchCode = sellersWithSameBranchCode.shift();
             if (typeof (sellerWithSameBranchCode === null || sellerWithSameBranchCode === void 0 ? void 0 : sellerWithSameBranchCode.id) !== 'string') {
                 throw new factory.errors.NotFound('Seller', `Seller with branchCode '${params.locationBranchCode}' not found`);

package/lib/chevre/service/transaction/moneyTransfer.js

@@ -32,7 +32,7 @@ function start(params) {
             limit: 1,
             page: 1,
             id: { $eq: params.seller.id }
-        }, ['name', 'typeOf'], []);
+        }, ['name', 'typeOf']);
         const seller = sellers.shift();
         if (seller === undefined) {
             throw new factory.errors.NotFound(factory.organizationType.Corporation);

package/lib/chevre/service/transaction/placeOrder/start/validateStartRequest.js

@@ -72,12 +72,14 @@ function validateStartRequest(params) {
             page: 1,
             project: { id: { $eq: params.project.id } },
             id: { $eq: params.seller.id }
-        }, ['name', 'project', 'typeOf', 'makesOffer', 'additionalProperty'], [])).shift();
+        }, ['name', 'project', 'typeOf', 'makesOffer', 'additionalProperty'])).shift();
         if (seller === undefined) {
             throw new factory.errors.NotFound(factory.organizationType.Corporation);
         }
+        // support non-array(2024-10-19~)
         const sellerMakesOffer = (_b = seller.makesOffer) === null || _b === void 0 ? void 0 : _b.find(({ availableAtOrFrom }) => {
-            return availableAtOrFrom === null || availableAtOrFrom === void 0 ? void 0 : availableAtOrFrom.some(({ id }) => id === clientId);
+            return (Array.isArray(availableAtOrFrom) && (availableAtOrFrom === null || availableAtOrFrom === void 0 ? void 0 : availableAtOrFrom.some(({ id }) => id === clientId)))
+                || (!Array.isArray(availableAtOrFrom) && (availableAtOrFrom === null || availableAtOrFrom === void 0 ? void 0 : availableAtOrFrom.id) === clientId);
         });
         if (sellerMakesOffer === undefined) {
             throw new factory.errors.Argument('seller', 'seller makes no offers');

package/lib/chevre/service/transaction/returnOrder/preStart.js

@@ -40,7 +40,7 @@ function preStart(params) {
             limit: 1,
             page: 1,
             id: { $eq: String(orders[0].seller.id) }
-        }, ['name', 'project', 'hasMerchantReturnPolicy', 'typeOf'], []);
+        }, ['name', 'project', 'hasMerchantReturnPolicy', 'typeOf']);
         const seller = sellers.shift();
         if (seller === undefined) {
             throw new factory.errors.NotFound(factory.organizationType.Corporation);

package/package.json

@@ -11,8 +11,8 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.386.0-alpha.9",
-    "@cinerino/sdk": "10.13.0-alpha.11",
+    "@chevre/factory": "4.387.0-alpha.0",
+    "@cinerino/sdk": "10.13.0",
     "@motionpicture/coa-service": "9.5.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
@@ -108,5 +108,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.5.0-alpha.21"
+  "version": "22.5.0-alpha.23"
 }