@chevre/domain 21.27.0-alpha.16 → 21.27.0-alpha.17

package/example/src/chevre/{aggregateAllEvents.ts → aggregation/createAggregateEventTasks.ts}

@@ -1,10 +1,10 @@
 // tslint:disable:no-console
-// import * as moment from 'moment';
+import * as moment from 'moment';
 import * as mongoose from 'mongoose';
 
-import { chevre } from '../../../lib/index';
+import { chevre } from '../../../../lib/index';
 
-const project = { typeOf: chevre.factory.organizationType.Project, id: String(process.env.PROJECT_ID) };
+const PROJECT = { typeOf: chevre.factory.organizationType.Project, id: String(process.env.PROJECT_ID) };
 
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI);
@@ -12,18 +12,21 @@ async function main() {
     const eventRepo = await chevre.repository.Event.createInstance(mongoose.connection);
     const taskRepo = await chevre.repository.Task.createInstance(mongoose.connection);
 
-    const now = new Date();
-
-    const events = await eventRepo.search<chevre.factory.eventType.ScreeningEvent>(
+    const events = <Pick<
+        chevre.factory.event.IEvent<chevre.factory.eventType.ScreeningEvent>,
+        'id' | 'typeOf' | 'startDate' | 'project'
+    >[]>await eventRepo.search<chevre.factory.eventType.ScreeningEvent>(
         {
             typeOf: chevre.factory.eventType.ScreeningEvent,
-            project: { id: { $eq: project.id } },
-            startFrom: now
+            project: { id: { $eq: PROJECT.id } },
+            startFrom: moment()
+                .add(-1, 'days')
+                .toDate()
             // startFrom: moment().add(-1, 'day').toDate(),
             // startThrough: moment().add(1, 'day').toDate(),
             // startThrough: now
         },
-        [],
+        ['id', 'typeOf', 'startDate', 'project'],
         []
     );
 
@@ -31,8 +34,8 @@ async function main() {
     console.log(events.length);
     // return;
 
-    const tasks = [];
-    for (const event of events) {
+    const tasks: chevre.factory.task.aggregateScreeningEvent.IAttributes[] = [];
+    for (const { id, typeOf, startDate, project } of events) {
         const aggregateTask: chevre.factory.task.aggregateScreeningEvent.IAttributes = {
             name: chevre.factory.taskName.AggregateScreeningEvent,
             project: { typeOf: chevre.factory.organizationType.Project, id: project.id },
@@ -41,10 +44,20 @@ async function main() {
             remainingNumberOfTries: 1,
             numberOfTried: 0,
             executionResults: [],
-            data: { typeOf: event.typeOf, id: event.id }
+            data: { typeOf, id }
         };
+        // const aggregateUseActionsTask: chevre.factory.task.aggregateUseActionsOnEvent.IAttributes = {
+        //     name: chevre.factory.taskName.AggregateUseActionsOnEvent,
+        //     project: { typeOf: chevre.factory.organizationType.Project, id: project.id },
+        //     status: chevre.factory.taskStatus.Ready,
+        //     runsAt: new Date(),
+        //     remainingNumberOfTries: 1,
+        //     numberOfTried: 0,
+        //     executionResults: [],
+        //     data: { typeOf, id }
+        // };
         tasks.push(aggregateTask);
-        console.log('task created', event.id);
+        console.log('task created', project.id, id, startDate);
     }
 
     console.log('creating...', tasks.length, 'tasks');

package/example/src/chevre/aggregation/searchAggregateReservations.ts

@@ -0,0 +1,33 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+const project = { id: <string>process.env.PROJECT_ID };
+const EVENT_ID = String(process.env.EVENT_ID);
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const aggregateReservationRepo = await chevre.repository.AggregateReservation.createInstance(mongoose.connection);
+    const aggregateReservations = await aggregateReservationRepo.searchWithReservationForId(
+        {
+            limit: 100,
+            page: 1,
+            project: { id: { $eq: project.id } },
+            reservationFor: {
+                id: { $eq: EVENT_ID },
+                typeOf: chevre.factory.eventType.ScreeningEvent
+            }
+        },
+        ['aggregateEntranceGate', 'aggregateReservation', 'aggregateOffer']
+    );
+    console.log('aggregateReservations:', aggregateReservations);
+}
+
+main()
+    .then(() => {
+        console.log('success!');
+    })
+    .catch(console.error);

package/lib/chevre/service/offer/onEventChanged.js

@@ -130,13 +130,20 @@ function createInformTasks(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         let events4inform;
         if (params.typeOf === factory.eventType.Event) {
-            events4inform = yield repos.event.search({
+            const eventsFromDB = yield repos.event.search({
                 id: { $in: params.ids },
                 typeOf: params.typeOf
             }, [], [
                 'aggregateEntranceGate', 'aggregateOffer', 'aggregateReservation',
                 'remainingAttendeeCapacity', 'checkInCount', 'attendeeCount'
             ]);
+            // 最適化(2024-03-26~)
+            events4inform = eventsFromDB.map(({ project, organizer, typeOf, name, doorTime, endDate, eventStatus, location, startDate, id, additionalProperty }) => {
+                return {
+                    project, organizer, typeOf, name, doorTime, endDate,
+                    eventStatus, location, startDate, id, additionalProperty
+                };
+            });
         }
         else if (params.typeOf === factory.eventType.ScreeningEvent) {
             const screeningEvents4inform = yield repos.event.search({
@@ -162,7 +169,11 @@ function createInformTasks(params) {
                                 itemOffered: offers.itemOffered,
                                 seller: {
                                     id: offers.seller.id,
-                                    typeOf: offers.seller.typeOf
+                                    typeOf: offers.seller.typeOf,
+                                    // makesOfferを追加(2024-03-26~)
+                                    makesOffer: (Array.isArray(offers.seller.makesOffer))
+                                        ? offers.seller.makesOffer
+                                        : []
                                 }
                             }
                     }

package/package.json

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