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

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
                         }

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.386.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.22"
 }