@chevre/domain 23.0.0-alpha.3 → 23.0.0-alpha.5

package/example/src/chevre/note/findNotes.ts

@@ -0,0 +1,34 @@
+// tslint:disable:no-console no-magic-numbers
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+const project = { id: String(process.env.PROJECT_ID) };
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const noteRepo = await chevre.repository.Note.createInstance(mongoose.connection);
+    const notes = await noteRepo.findNotes(
+        {
+            limit: 10,
+            page: 1,
+            project: { id: { $eq: project.id } },
+            hasDigitalDocumentPermission: {
+                grantee: {
+                    audienceType: {
+                        $eq: chevre.factory.creativeWork.noteDigitalDocument.PermissionGranteeAudienceType.Public
+                    }
+                }
+            }
+        },
+        ['about', 'identifier']
+    );
+    // tslint:disable-next-line:no-null-keyword
+    console.dir(notes, { depth: null });
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/note/upsertNotesByIdentifier.ts

@@ -27,14 +27,13 @@ async function main() {
     };
     const createResult = await noteRepo.upsertNotesByIdentifier(
         [
-            {
-                $set: creatingNote
-                // $unset: {}
-            },
             {
                 $set: creatingNote
                 // $unset: {}
             }
+            // {
+            //     $set: creatingNote
+            // }
         ],
         { update: false }
     );
@@ -46,6 +45,9 @@ async function main() {
             {
                 $set: creatingNote
             }
+            // {
+            //     $set: creatingNote
+            // }
         ],
         { update: true }
     );

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

@@ -85,6 +85,15 @@ const indexes = [
     [
         { identifier: 1, dateCreated: -1 },
         { name: 'identifier' }
+    ],
+    [
+        { 'hasDigitalDocumentPermission.grantee.audienceType': 1, dateCreated: -1 },
+        {
+            name: 'permissionGranteeAudienceType',
+            partialFilterExpression: {
+                'hasDigitalDocumentPermission.grantee.audienceType': { $exists: true }
+            }
+        }
     ]
     // discontinue(2025-05-08~)
     // [

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

@@ -15,6 +15,8 @@ export declare class NoteRepo {
     })[]>;
     /**
      * メモ識別子をキーにして冪等置換
+     * 主題+識別子でユニーク必須
+     * 編集の場合、存在検証される
      */
     upsertNotesByIdentifier(params: {
         $set: Pick<INoteDigitalDocument, 'about' | 'creator' | 'identifier' | 'project' | 'provider' | 'text' | 'version' | 'hasDigitalDocumentPermission'> & {
@@ -32,15 +34,6 @@ export declare class NoteRepo {
             id: string;
         }[];
     } | void>;
-    /**
-     * 既知のメモIDリストからメモを削除する
-     */
-    deleteNotesByIds(params: {
-        project: {
-            id: string;
-        };
-        ids: string[];
-    }): Promise<DeleteResult | void>;
     /**
      * 主題リソースから全メモを削除する
      */

package/lib/chevre/repo/note.js

@@ -35,7 +35,7 @@ class NoteRepo {
         this.noteModel = connection.model(note_1.modelName, (0, note_1.createSchema)());
     }
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
         const andConditions = [];
         const idIn = (_a = params.id) === null || _a === void 0 ? void 0 : _a.$in;
         if (Array.isArray(idIn)) {
@@ -77,6 +77,10 @@ class NoteRepo {
         if (Array.isArray(identifierIn)) {
             andConditions.push({ identifier: { $in: identifierIn } });
         }
+        const audienceTypeEq = (_v = (_u = (_t = params.hasDigitalDocumentPermission) === null || _t === void 0 ? void 0 : _t.grantee) === null || _u === void 0 ? void 0 : _u.audienceType) === null || _v === void 0 ? void 0 : _v.$eq;
+        if (typeof audienceTypeEq === 'string') {
+            andConditions.push({ 'hasDigitalDocumentPermission.grantee.audienceType': { $exists: true, $eq: audienceTypeEq } });
+        }
         return andConditions;
     }
     findNotes(params, inclusion) {
@@ -107,25 +111,33 @@ class NoteRepo {
     }
     /**
      * メモ識別子をキーにして冪等置換
+     * 主題+識別子でユニーク必須
+     * 編集の場合、存在検証される
      */
+    // tslint:disable-next-line:max-func-body-length
     upsertNotesByIdentifier(params, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const now = new Date();
             const { update } = options;
             const bulkWriteOps = [];
             const queryFilters = [];
+            let uniqueIdentifiers = [];
             if (Array.isArray(params)) {
                 params.forEach(({ $set }) => {
                     const { about, creator, identifier, project, provider, text, version, hasDigitalDocumentPermission } = $set;
-                    if (typeof identifier !== 'string' || identifier.length === 0) {
+                    if (typeof about.id !== 'string' || about.id === '') {
+                        throw new factory.errors.ArgumentNull('about.id');
+                    }
+                    if (typeof identifier !== 'string' || identifier === '') {
                         throw new factory.errors.ArgumentNull('identifier');
                     }
-                    if (typeof version !== 'string' || version.length === 0) {
+                    if (typeof version !== 'string' || version === '') {
                         throw new factory.errors.ArgumentNull('version');
                     }
                     if (typeof text !== 'string') {
                         throw new factory.errors.ArgumentNull('text');
                     }
+                    uniqueIdentifiers.push(`${about.id}:${identifier}`);
                     // リソースのユニークネスを保証するfilter
                     const filter = {
                         'project.id': { $eq: project.id },
@@ -167,6 +179,25 @@ class NoteRepo {
                 });
             }
             if (bulkWriteOps.length > 0) {
+                // 主題+識別子でユニーク検証
+                uniqueIdentifiers = [...new Set(uniqueIdentifiers)];
+                if (uniqueIdentifiers.length !== bulkWriteOps.length) {
+                    throw new factory.errors.Argument('identifier', '(about.id + identifier)s must be unique');
+                }
+                if (update === true) {
+                    // 編集の場合、存在検証
+                    const modifyingNotes = yield this.noteModel.find({ $or: queryFilters }, {
+                        _id: 0,
+                        id: { $toString: '$_id' }
+                    })
+                        .lean()
+                        .exec();
+                    // tslint:disable-next-line:no-console
+                    console.log('NoteRepo.upsertNotesByIdentifier:', params.length, 'params ->', modifyingNotes.length, 'modifyingNotes found.', JSON.stringify(modifyingNotes));
+                    if (modifyingNotes.length !== bulkWriteOps.length) {
+                        throw new factory.errors.NotFound(factory.creativeWorkType.NoteDigitalDocument);
+                    }
+                }
                 const bulkWriteResult = yield this.noteModel.bulkWrite(bulkWriteOps, { ordered: false });
                 // modifiedの場合upsertedIdsに含まれないので、idを検索する
                 const modifiedNotes = yield this.noteModel.find({ $or: queryFilters }, {
@@ -179,21 +210,24 @@ class NoteRepo {
             }
         });
     }
-    /**
-     * 既知のメモIDリストからメモを削除する
-     */
-    deleteNotesByIds(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { project, ids } = params;
-            if (Array.isArray(ids) && ids.length > 0) {
-                return this.noteModel.deleteMany({
-                    'project.id': { $eq: project.id },
-                    _id: { $in: ids }
-                })
-                    .exec();
-            }
-        });
-    }
+    // /**
+    //  * 既知のメモIDリストからメモを削除する
+    //  */
+    // public async deleteNotesByIds(params: {
+    //     project: { id: string };
+    //     ids: string[];
+    // }): Promise<DeleteResult | void> {
+    //     const { project, ids } = params;
+    //     if (Array.isArray(ids) && ids.length > 0) {
+    //         return this.noteModel.deleteMany(
+    //             {
+    //                 'project.id': { $eq: project.id },
+    //                 _id: { $in: ids }
+    //             }
+    //         )
+    //             .exec();
+    //     }
+    // }
     /**
      * 主題リソースから全メモを削除する
      */

package/lib/chevre/service/assetTransaction/reserve/validateStartRequest.js

@@ -20,6 +20,7 @@ function verifyOfferedByToken(params) {
         try {
             result = yield new Promise((resolve, reject) => {
                 jwt.verify(token, secret, {
+                    algorithms: ['HS256'],
                     issuer
                     // ...(Array.isArray(params.audience)) ? { audience: params.audience } : undefined
                 }, (err, decoded) => {

package/lib/chevre/service/task/createEvent/createEventBySchedule/factory.js

@@ -4,105 +4,7 @@ exports.tour2creatingEvent = tour2creatingEvent;
 exports.schedule2tours = schedule2tours;
 const moment = require("moment-timezone");
 const factory = require("../../../../factory");
-// tslint:disable-next-line:max-func-body-length
-// function schedule2createEventParams(
-//     schedule: factory.schedule.IEventWithSchedule,
-//     createDate: Date
-// ): factory.event.screeningEvent.ICreateParams[] {
-//     const eventServiceId = schedule.offers?.itemOffered?.id;
-//     const makesOffer = schedule.offers?.seller?.makesOffer;
-//     const applicationIds: string[] = (Array.isArray(makesOffer))
-//         ? makesOffer.map(({ availableAtOrFrom }) => availableAtOrFrom.id)
-//         : [];
-//     const eventSeriesId = schedule.superEvent?.id;
-//     if (typeof eventServiceId !== 'string' || eventServiceId === '') {
-//         throw new factory.errors.NotFound('schedule.offers.itemOffered.id');
-//     }
-//     if (typeof eventSeriesId !== 'string' || eventSeriesId === '') {
-//         throw new factory.errors.NotFound('schedule.superEvent.id');
-//     }
-//     // 引数情報取得
-//     if (schedule.eventSchedule === undefined) {
-//         throw new factory.errors.NotFound('eventSchedule');
-//     }
-//     const targetInfo = getTargetInfoByEventWithSchedule(schedule, createDate);
-//     debug(targetInfo.length, 'targetInfos ->', targetInfo);
-//     const createParams: factory.event.screeningEvent.ICreateParams[] = [];
-//     for (const performanceInfo of targetInfo) {
-//         const oldEventId = [
-//             // tslint:disable-next-line:no-magic-numbers
-//             performanceInfo.day.slice(-6),
-//             workPerformedIdentifier,
-//             movieTheater.branchCode,
-//             screeningRoom.branchCode,
-//             performanceInfo.start_time
-//         ].join('');
-//         const maxValue = movieTheater.offers?.eligibleQuantity?.maxValue;
-//         const availabilityEnds: Date = moment(performanceInfo.end_date)
-//             .tz('Asia/Tokyo')
-//             .endOf('date')
-//             .toDate();
-//         const availabilityStarts: Date = moment(performanceInfo.start_date)
-//             .tz('Asia/Tokyo')
-//             .startOf('date')
-//             // tslint:disable-next-line:no-magic-numbers
-//             .add(-3, 'months')
-//             .toDate();
-//         const validThrough: Date = moment(performanceInfo.end_date)
-//             .tz('Asia/Tokyo')
-//             .endOf('date')
-//             .toDate();
-//         const validFrom: Date = moment(performanceInfo.start_date)
-//             .tz('Asia/Tokyo')
-//             .startOf('date')
-//             // tslint:disable-next-line:no-magic-numbers
-//             .add(-3, 'months')
-//             .toDate();
-//         // イベント作成
-//         createParams.push({
-//             eventStatus: factory.eventStatusType.EventScheduled,
-//             doorTime: performanceInfo.door_time,
-//             startDate: performanceInfo.start_date,
-//             endDate: performanceInfo.end_date,
-//             offers: {
-//                 eligibleQuantity: {
-//                     ...(typeof maxValue === 'number') ? { maxValue } : undefined // ひとまず全座席予約可能なように
-//                 },
-//                 itemOffered: {
-//                     // 興行ID追加(2022-09-01~)
-//                     id: eventServiceId,
-//                     serviceOutput: {
-//                         typeOf: factory.reservationType.EventReservation,
-//                         reservedTicket: {
-//                             typeOf: 'Ticket',
-//                             ticketedSeat: { typeOf: factory.placeType.Seat }
-//                         }
-//                     },
-//                 },
-//                 seller: {
-//                     // event.offersにseller.makesOfferを追加(2022-11-18~)
-//                     makesOffer: applicationIds.map((applicationId) => {
-//                         return {
-//                             typeOf: factory.offerType.Offer,
-//                             availableAtOrFrom: { id: applicationId }, // support no-array(2024-10-13~),
-//                             availabilityEnds,
-//                             availabilityStarts,
-//                             validFrom,
-//                             validThrough
-//                         };
-//                     })
-//                 }
-//             },
-//             // 旧フォーマットIDを追加特性に追加(2022-09-08~)
-//             additionalProperty: [
-//                 { name: 'tourNumber', value: String(performanceInfo.tour_number) },
-//                 { name: 'oldEventId', value: oldEventId }
-//             ],
-//             identifier: oldEventId
-//         });
-//     }
-//     return createParams;
-// }
+const TIMEZONE = 'Asia/Tokyo';
 // tslint:disable-next-line:max-func-body-length
 function tour2creatingEvent(tour, movieTheater, screeningRoom, existingApplicationMembers, maxValue, eventService, screeningEventSeries, project) {
     var _a;
@@ -115,22 +17,34 @@ function tour2creatingEvent(tour, movieTheater, screeningRoom, existingApplicati
         screeningRoom.branchCode,
         tour.start_time
     ].join('');
+    // 00:00:00で再実装(2025-10-09~)
+    // const availabilityEnds: Date = moment(tour.end_date)
+    //     .tz(TIMEZONE)
+    //     .endOf('date')
+    //     .toDate();
     const availabilityEnds = moment(tour.end_date)
-        .tz('Asia/Tokyo')
-        .endOf('date')
+        .tz(TIMEZONE)
+        .startOf('date')
+        .add(1, 'day')
         .toDate();
     const availabilityStarts = moment(tour.start_date)
-        .tz('Asia/Tokyo')
+        .tz(TIMEZONE)
         .startOf('date')
         // tslint:disable-next-line:no-magic-numbers
         .add(-3, 'months')
         .toDate();
+    // 00:00:00で再実装(2025-10-09~)
+    // const validThrough: Date = moment(tour.end_date)
+    //     .tz(TIMEZONE)
+    //     .endOf('date')
+    //     .toDate();
     const validThrough = moment(tour.end_date)
-        .tz('Asia/Tokyo')
-        .endOf('date')
+        .tz(TIMEZONE)
+        .startOf('date')
+        .add(1, 'day')
         .toDate();
     const validFrom = moment(tour.start_date)
-        .tz('Asia/Tokyo')
+        .tz(TIMEZONE)
         .startOf('date')
         // tslint:disable-next-line:no-magic-numbers
         .add(-3, 'months')

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": "5.0.0-alpha.3",
-    "@cinerino/sdk": "12.5.0-alpha.5",
+    "@chevre/factory": "5.1.0-alpha.0",
+    "@cinerino/sdk": "12.5.0-alpha.6",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
     "@sendgrid/client": "8.1.4",
@@ -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.3"
+  "version": "23.0.0-alpha.5"
 }