@chevre/domain 21.30.0-alpha.23 → 21.30.0-alpha.25

package/example/src/chevre/playAroundMessage.ts

@@ -5,43 +5,47 @@ import { chevre } from '../../../lib/index';
 
 const project = { id: String(process.env.PROJECT_ID) };
 
+mongoose.Model.on('index', (...args) => {
+    console.error('******** index event emitted. ********\n', args);
+});
+
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
     const messageRepo = await chevre.repository.Message.createInstance(mongoose.connection);
-    const createResult = await messageRepo.upsertByIdentifier(
-        [
-            {
-                project: { id: project.id, typeOf: chevre.factory.organizationType.Project },
-                identifier: 'SendOrder-TTT5-8982603-9533198',
-                name: 'SendOrder-TTT5-8982603-9533198',
-                sender: {
-                    typeOf: 'Corporation',
-                    name: 'sample sender name',
-                    email: 'text@example.com'
-                },
-                toRecipient: [
-                    {
-                        typeOf: 'WebApplication',
-                        name: 'sample toRecipient',
-                        email: 'text@example.com'
-                    }
-                ],
-                about: {
-                    typeOf: 'Thing',
-                    identifier: chevre.factory.creativeWork.message.email.AboutIdentifier.OnOrderSent,
-                    name: 'sample about name'
-                },
-                text: 'sample text',
-                mainEntity: {
-                    typeOf: chevre.factory.order.OrderType.Order,
-                    orderNumber: 'TTT5-8982603-9533198'
-                },
-                provider: { id: '5a392dfdfca1c8737fb6da42', typeOf: chevre.factory.organizationType.Corporation }
-            }
-        ]
-    );
-    console.log('createResult:', createResult);
+    // const createResult = await messageRepo.upsertByIdentifier(
+    //     [
+    //         {
+    //             project: { id: project.id, typeOf: chevre.factory.organizationType.Project },
+    //             identifier: 'SendOrder-TTT5-8982603-9533198',
+    //             name: 'SendOrder-TTT5-8982603-9533198',
+    //             sender: {
+    //                 typeOf: 'Corporation',
+    //                 name: 'sample sender name',
+    //                 email: 'text@example.com'
+    //             },
+    //             toRecipient: [
+    //                 {
+    //                     typeOf: 'WebApplication',
+    //                     name: 'sample toRecipient',
+    //                     email: 'text@example.com'
+    //                 }
+    //             ],
+    //             about: {
+    //                 typeOf: 'Thing',
+    //                 identifier: chevre.factory.creativeWork.message.email.AboutIdentifier.OnOrderSent,
+    //                 name: 'sample about name'
+    //             },
+    //             text: 'sample text',
+    //             mainEntity: {
+    //                 typeOf: chevre.factory.order.OrderType.Order,
+    //                 orderNumber: 'TTT5-8982603-9533198'
+    //             },
+    //             provider: { id: '5a392dfdfca1c8737fb6da42', typeOf: chevre.factory.organizationType.Corporation }
+    //         }
+    //     ]
+    // );
+    // console.log('createResult:', createResult);
 
     const messages = await messageRepo.search(
         {

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

@@ -74,5 +74,17 @@ export declare class MessageRepo {
             id: string;
         };
     }): Promise<IFindByIdentifierResult>;
+    deleteByMainEntityOrderNumber(params: {
+        project: {
+            id: string;
+        };
+        mainEntity: {
+            orderNumber: string;
+        };
+    }): Promise<{
+        n?: number;
+        ok?: number;
+        deletedCount?: number;
+    } | null>;
 }
 export {};

package/lib/chevre/repo/message.js

@@ -161,5 +161,23 @@ class MessageRepo {
             return doc.toObject();
         });
     }
+    deleteByMainEntityOrderNumber(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.messageModel.deleteMany({
+                'project.id': { $eq: params.project.id },
+                'mainEntity.orderNumber': { $exists: true, $eq: params.mainEntity.orderNumber }
+            })
+                .exec()
+                .then((result) => {
+                return {
+                    // n: result?.n,
+                    // opTime: result.opTime,
+                    // ok: result?.ok,
+                    // operationTime,
+                    deletedCount: result === null || result === void 0 ? void 0 : result.deletedCount
+                };
+            });
+        });
+    }
 }
 exports.MessageRepo = MessageRepo;

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

@@ -29,9 +29,15 @@ const schemaDefinition = {
     },
     mainEntity: mongoose_1.SchemaTypes.Mixed,
     name: mongoose_1.SchemaTypes.Mixed,
-    about: mongoose_1.SchemaTypes.Mixed,
+    about: {
+        type: mongoose_1.SchemaTypes.Mixed,
+        required: true
+    },
     sender: mongoose_1.SchemaTypes.Mixed,
-    text: String,
+    text: {
+        type: String,
+        required: true
+    },
     toRecipient: mongoose_1.SchemaTypes.Mixed
 };
 const schemaOptions = {
@@ -68,6 +74,35 @@ const indexes = [
     [
         { updatedAt: 1 },
         { name: 'searchByUpdatedAt' }
+    ],
+    [
+        { datePublished: 1 },
+        { name: 'searchByDatePublished' }
+    ],
+    [
+        { identifier: 1, datePublished: 1 },
+        { name: 'searchByIdentifier' }
+    ],
+    [
+        { 'project.id': 1, datePublished: 1 },
+        { name: 'searchByProjectId' }
+    ],
+    [
+        { 'provider.id': 1, datePublished: 1 },
+        { name: 'searchByProviderId' }
+    ],
+    [
+        { 'about.identifier': 1, datePublished: 1 },
+        { name: 'searchByAboutIdentifier' }
+    ],
+    [
+        { 'mainEntity.orderNumber': 1, datePublished: 1 },
+        {
+            name: 'searchByMainEntityOrderNumber',
+            partialFilterExpression: {
+                'mainEntity.orderNumber': { $exists: true }
+            }
+        }
     ]
 ];
 exports.indexes = indexes;

package/lib/chevre/service/payment/movieTicket/checkByIdentifier.js

@@ -69,7 +69,7 @@ function checkByIdentifier(params) {
         })(repos);
         purchaseNumberAuthIn = {
             kgygishCd: sellerCredentials.kgygishCd,
-            jhshbtsCd: surfrock.service.auth.factory.InformationTypeCode.All,
+            jhshbtsCd: surfrock.factory.service.auth.purchaseNumberAuth.InformationTypeCode.All,
             knyknrNoInfoIn: knyknrNoInfoIn,
             skhnCd: skhnCd,
             stCd: sellerCredentials.stCd,

package/lib/chevre/service/payment/movieTicket/factory.d.ts

@@ -11,4 +11,4 @@ export declare function createSeatInfoSyncIn(params: {
         kgygishCd: string;
         stCd: string;
     };
-}): surfrock.service.seat.factory.ISeatInfoSyncIn;
+}): surfrock.factory.service.seat.seatInfoSync.ISeatInfoSyncIn;

package/lib/chevre/service/payment/movieTicket/factory.js

@@ -50,8 +50,8 @@ function createSeatInfoSyncIn(params) {
     // }
     return {
         kgygishCd: kgygishCd,
-        yykDvcTyp: surfrock.service.seat.factory.ReserveDeviceType.EntertainerSitePC,
-        trkshFlg: surfrock.service.seat.factory.DeleteFlag.False,
+        yykDvcTyp: surfrock.factory.service.seat.seatInfoSync.ReserveDeviceType.EntertainerSitePC,
+        trkshFlg: surfrock.factory.service.seat.seatInfoSync.DeleteFlag.False,
         kgygishSstmZskyykNo: params.paymentMethodId,
         // 興行会社ユーザー座席予約番号
         kgygishUsrZskyykNo: (typeof ((_c = params.purpose) === null || _c === void 0 ? void 0 : _c.confirmationNumber) === 'string')

package/lib/chevre/service/payment/movieTicket.js

@@ -519,7 +519,7 @@ function createSeatInfoSyncInOnRefund(params) {
         }
         let seatInfoSyncIn;
         // 着券時のseatInfoSyncInに対してtrkshFlgだけ変更してリクエストする
-        seatInfoSyncIn = Object.assign(Object.assign({}, seatInfoSyncInOnPay), { trkshFlg: surfrock.service.seat.factory.DeleteFlag.True // 取消フラグ
+        seatInfoSyncIn = Object.assign(Object.assign({}, seatInfoSyncInOnPay), { trkshFlg: surfrock.factory.service.seat.seatInfoSync.DeleteFlag.True // 取消フラグ
          });
         return seatInfoSyncIn;
     });
@@ -552,7 +552,7 @@ function createSeatInfoSyncCancelInOnRefund(params) {
             kgygishCd: seatInfoSyncInOnPay.kgygishCd,
             kgysystmzskyykNo: seatInfoSyncInOnPay.kgygishSstmZskyykNo,
             kgysystmzskyykNoIkktsCnclFlg: '1',
-            jyuTyp: surfrock.service.seat.factory.seatInfoSyncCancel.JyuTyp.IJyuTyp05,
+            jyuTyp: surfrock.service.seat.factory.seatInfoSyncCancel.JyuTyp.JyuTyp05,
             jyuTypRmk: ''
             // knyknrNoInfoIn: [],
         };

package/lib/chevre/service/task/deleteTransaction.js

@@ -15,6 +15,7 @@ const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const event_1 = require("../../repo/event");
+const message_1 = require("../../repo/message");
 const note_1 = require("../../repo/note");
 const order_1 = require("../../repo/order");
 const ownershipInfo_1 = require("../../repo/ownershipInfo");
@@ -33,6 +34,7 @@ function call(data) {
             action: new action_1.MongoRepository(settings.connection),
             assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
             event: new event_1.MongoRepository(settings.connection),
+            message: new message_1.MessageRepo(settings.connection),
             note: new note_1.MongoRepository(settings.connection),
             order: new order_1.MongoRepository(settings.connection),
             ownershipInfo: new ownershipInfo_1.MongoRepository(settings.connection),

package/lib/chevre/service/transaction/deleteTransaction.d.ts

@@ -4,6 +4,7 @@ import type { MongoRepository as AccountingReportRepo } from '../../repo/account
 import type { MongoRepository as ActionRepo } from '../../repo/action';
 import type { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { MongoRepository as EventRepo } from '../../repo/event';
+import type { MessageRepo } from '../../repo/message';
 import type { MongoRepository as NoteRepo } from '../../repo/note';
 import type { MongoRepository as OrderRepo } from '../../repo/order';
 import type { MongoRepository as OwnershipInfoRepo } from '../../repo/ownershipInfo';
@@ -20,6 +21,7 @@ export declare function deleteTransaction(params: factory.task.IData<factory.tas
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
     event: EventRepo;
+    message: MessageRepo;
     note: NoteRepo;
     order: OrderRepo;
     ownershipInfo: OwnershipInfoRepo;

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

@@ -154,6 +154,7 @@ function deleteTransactionById(params) {
         let deleteCancelReservationTransactionResult;
         let deletedReservationNumbers = [];
         let deleteActionResult;
+        let deleteMessagessResult;
         const action = yield repos.action.start(actionAttributes);
         try {
             const transactionTypeOf = transaction.typeOf;
@@ -209,6 +210,11 @@ function deleteTransactionById(params) {
                             ]
                         }
                     });
+                    // messages削除(2024-05-01~)
+                    const deleteMessagesByPlaceOrderResult = yield deleteMessagesByPlaceOrder({
+                        transaction: params.object
+                    })(repos);
+                    deleteMessagessResult = deleteMessagesByPlaceOrderResult.deleteResult;
                     // 取引削除
                     yield repos.transaction.findByIdAndDelete({ id: transaction.id });
                     break;
@@ -236,16 +242,14 @@ function deleteTransactionById(params) {
             throw error;
         }
         // アクション完了
-        const actionResult = {
-            deletePayTransactionResult,
+        const actionResult = Object.assign({ deletePayTransactionResult,
             deleteRefundResult,
             payTransactionNumbers,
             deleteReservationsResult,
             deleteReserveTransactionResult,
             deleteCancelReservationTransactionResult,
             deletedReservationNumbers,
-            deleteActionResult
-        };
+            deleteActionResult }, (deleteMessagessResult !== undefined) ? { deleteMessagessResult } : undefined);
         yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
     });
 }
@@ -359,3 +363,24 @@ function deletePayTransactionsByPlaceOrder(params) {
         return { deletePayTransactionResult, deleteRefundResult, payTransactionNumbers };
     });
 }
+function deleteMessagesByPlaceOrder(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        let deleteResult;
+        if (params.transaction.typeOf === factory.transactionType.PlaceOrder
+            && params.transaction.specifyingMethod === factory.task.deleteTransaction.SpecifyingMethod.Id) {
+            const orderNumber = params.transaction.object.orderNumber;
+            if (typeof orderNumber === 'string' && orderNumber.length > 0) {
+                const deleteReservationsResult = yield repos.message.deleteByMainEntityOrderNumber({
+                    project: { id: params.transaction.project.id },
+                    mainEntity: { orderNumber }
+                });
+                deleteResult = {
+                    n: deleteReservationsResult === null || deleteReservationsResult === void 0 ? void 0 : deleteReservationsResult.n,
+                    ok: deleteReservationsResult === null || deleteReservationsResult === void 0 ? void 0 : deleteReservationsResult.ok,
+                    deletedCount: deleteReservationsResult === null || deleteReservationsResult === void 0 ? void 0 : deleteReservationsResult.deletedCount
+                };
+            }
+        }
+        return { deleteResult };
+    });
+}

package/package.json

@@ -10,12 +10,12 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.369.0-alpha.3",
-    "@cinerino/sdk": "5.17.1",
+    "@chevre/factory": "4.369.0-alpha.4",
+    "@cinerino/sdk": "5.18.0-alpha.16",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
-    "@surfrock/sdk": "1.3.0-alpha.1",
+    "@surfrock/sdk": "1.3.0-alpha.2",
     "cdigit": "2.6.7",
     "debug": "^3.2.7",
     "google-libphonenumber": "^3.2.18",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.30.0-alpha.23"
+  "version": "21.30.0-alpha.25"
 }