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

package/example/src/chevre/playAroundMessage.ts

@@ -36,12 +36,32 @@ async function main() {
                 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(
+        {
+            limit: 1,
+            page: 1,
+            project: {
+                id: { $eq: project.id }
+            },
+            identifier: { $eq: 'SendOrder-TTT5-8982603-9533198' },
+            mainEntity: {
+                orderNumber: { $eq: 'TTT5-8982603-9533198' }
+            },
+            about: { identifier: { $eq: chevre.factory.creativeWork.message.email.AboutIdentifier.OnOrderSent } },
+            provider: { id: { $eq: '5a392dfdfca1c8737fb6da42' } }
+        },
+        ['identifier', 'mainEntity', 'about', 'provider'],
+        []
+    );
+    console.log('messages:', messages);
+    console.log(messages.length, 'messages found');
 }
 
 main()

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

@@ -8,18 +8,63 @@ type IEmailMessage = factory.creativeWork.message.email.ICreativeWork & {
         id: string;
         typeOf: factory.organizationType.Project;
     };
+    provider: {
+        /**
+         * 販売者ID
+         */
+        id: string;
+        typeOf: factory.organizationType.Corporation;
+    };
 };
 type IFindByIdentifierResult = Pick<IEmailMessage, 'about' | 'identifier' | 'name' | 'sender' | 'text' | 'toRecipient' | 'typeOf'>;
+interface ISearchConditions {
+    limit?: number;
+    page?: number;
+    sort?: {
+        datePublished?: factory.sortType;
+    };
+    project?: {
+        id?: {
+            $eq?: string;
+        };
+    };
+    provider?: {
+        id?: {
+            $eq?: string;
+        };
+    };
+    mainEntity?: {
+        orderNumber?: {
+            $eq?: string;
+        };
+    };
+    identifier?: {
+        $eq?: string;
+    };
+    about?: {
+        identifier?: {
+            $eq?: string;
+        };
+    };
+}
+type IKeyOfProjection = keyof IEmailMessage | '_id';
 /**
  * メッセージリポジトリ
  */
 export declare class MessageRepo {
     private readonly messageModel;
     constructor(connection: Connection);
+    static CREATE_MONGO_CONDITIONS(params: ISearchConditions): any[];
+    /**
+     * 検索
+     */
+    search(params: ISearchConditions, inclusion: IKeyOfProjection[], exclusion: IKeyOfProjection[]): Promise<(IEmailMessage & {
+        id: string;
+    })[]>;
     /**
      * コードをキーにしてなければ作成する(複数対応)
      */
-    upsertByIdentifier(params: Pick<IEmailMessage, 'about' | 'identifier' | 'mainEntity' | 'name' | 'project' | 'sender' | 'text' | 'toRecipient'>[]): Promise<BulkWriteResult | void>;
+    upsertByIdentifier(params: Pick<IEmailMessage, 'about' | 'identifier' | 'mainEntity' | 'name' | 'project' | 'sender' | 'text' | 'toRecipient' | 'provider'>[]): Promise<BulkWriteResult | void>;
     /**
      * コードで参照
      */

package/lib/chevre/repo/message.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MessageRepo = void 0;
 const message_1 = require("./mongoose/schemas/message");
 const factory = require("../factory");
+const settings_1 = require("../settings");
 /**
  * メッセージリポジトリ
  */
@@ -19,6 +20,71 @@ class MessageRepo {
     constructor(connection) {
         this.messageModel = connection.model(message_1.modelName, (0, message_1.createSchema)());
     }
+    static CREATE_MONGO_CONDITIONS(params) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        const andConditions = [];
+        const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
+        if (typeof projectIdEq === 'string') {
+            andConditions.push({ 'project.id': { $eq: projectIdEq } });
+        }
+        const providerIdEq = (_d = (_c = params.provider) === null || _c === void 0 ? void 0 : _c.id) === null || _d === void 0 ? void 0 : _d.$eq;
+        if (typeof providerIdEq === 'string') {
+            andConditions.push({ 'provider.id': { $eq: providerIdEq } });
+        }
+        const mainEntityOrderNumberEq = (_f = (_e = params.mainEntity) === null || _e === void 0 ? void 0 : _e.orderNumber) === null || _f === void 0 ? void 0 : _f.$eq;
+        if (typeof mainEntityOrderNumberEq === 'string') {
+            andConditions.push({ 'mainEntity.orderNumber': { $exists: true, $eq: mainEntityOrderNumberEq } });
+        }
+        const identifierEq = (_g = params.identifier) === null || _g === void 0 ? void 0 : _g.$eq;
+        if (typeof identifierEq === 'string') {
+            andConditions.push({ identifier: { $eq: identifierEq } });
+        }
+        const aboutIdentifierEq = (_j = (_h = params.about) === null || _h === void 0 ? void 0 : _h.identifier) === null || _j === void 0 ? void 0 : _j.$eq;
+        if (typeof aboutIdentifierEq === 'string') {
+            andConditions.push({ 'about.identifier': { $eq: aboutIdentifierEq } });
+        }
+        return andConditions;
+    }
+    /**
+     * 検索
+     */
+    search(params, inclusion, exclusion) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            let projection = {};
+            if (Array.isArray(inclusion) && inclusion.length > 0) {
+                inclusion.forEach((field) => {
+                    projection[field] = 1;
+                });
+            }
+            else {
+                projection = {
+                    __v: 0,
+                    createdAt: 0,
+                    updatedAt: 0
+                };
+                if (Array.isArray(exclusion) && exclusion.length > 0) {
+                    exclusion.forEach((field) => {
+                        projection[field] = 0;
+                    });
+                }
+            }
+            const conditions = MessageRepo.CREATE_MONGO_CONDITIONS(params);
+            const query = this.messageModel.find((conditions.length > 0) ? { $and: conditions } : {})
+                .select(projection);
+            if (typeof params.limit === 'number' && params.limit > 0) {
+                const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
+                query.limit(params.limit)
+                    .skip(params.limit * (page - 1));
+            }
+            if (typeof ((_a = params.sort) === null || _a === void 0 ? void 0 : _a.datePublished) === 'number') {
+                query.sort({ datePublished: params.sort.datePublished });
+            }
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec()
+                .then((docs) => docs.map((doc) => doc.toObject()));
+        });
+    }
     /**
      * コードをキーにしてなければ作成する(複数対応)
      */
@@ -28,7 +94,7 @@ class MessageRepo {
             const bulkWriteOps = [];
             if (Array.isArray(params)) {
                 params.forEach((creatingNoteParams) => {
-                    const { about, identifier, project, text, mainEntity, name, sender, toRecipient } = creatingNoteParams;
+                    const { about, identifier, project, text, mainEntity, name, sender, toRecipient, provider } = creatingNoteParams;
                     if (typeof identifier !== 'string' || identifier.length === 0) {
                         throw new factory.errors.ArgumentNull('identifier');
                     }
@@ -48,7 +114,8 @@ class MessageRepo {
                         typeOf: factory.creativeWorkType.EmailMessage
                     };
                     // 変更可能な属性のみ上書き
-                    const setFields = Object.assign({ mainEntity,
+                    const setFields = Object.assign({ provider,
+                        mainEntity,
                         about,
                         sender,
                         text,

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

@@ -11,6 +11,10 @@ const schemaDefinition = {
         type: mongoose_1.SchemaTypes.Mixed,
         required: true
     },
+    provider: {
+        type: mongoose_1.SchemaTypes.Mixed,
+        required: true
+    },
     typeOf: {
         type: String,
         required: true

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

@@ -352,7 +352,7 @@ function payActionParams2seatInfoSyncIn(params) {
 function refundMovieTicket(params) {
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         const paymentMethodId = (_a = params.object[0]) === null || _a === void 0 ? void 0 : _a.paymentMethod.paymentMethodId;
         const paymentServiceId = (_b = params.object[0]) === null || _b === void 0 ? void 0 : _b.id;
         const availableChannel = yield repos.paymentService.findAvailableChannel({
@@ -387,12 +387,7 @@ function refundMovieTicket(params) {
         // instrumentをセット(2024-04-30~)
         const instrument = Object.assign(Object.assign({ typeOf: factory.service.paymentService.PaymentServiceType.MovieTicket }, (seatInfoSyncIn !== undefined) ? { seatInfoSyncIn } : undefined), (seatInfoSyncCancelIn !== undefined) ? { seatInfoSyncCancelIn } : undefined);
         let action = yield repos.action.start(Object.assign(Object.assign(Object.assign({}, params), (typeof ((_g = params.sameAs) === null || _g === void 0 ? void 0 : _g.id) === 'string')
-            ? {
-                sameAs: {
-                    id: params.sameAs.id,
-                    typeOf: 'Task'
-                }
-            }
+            ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } }
             : undefined), { instrument }));
         let seatInfoSyncCancelResult;
         let seatInfoSyncResult;
@@ -406,28 +401,18 @@ function refundMovieTicket(params) {
             }
             catch (error) {
                 let throwsError = true;
-                // 「存在しない興行会社システム座席予約番号が入力されました」の場合、取消済なのでok
                 if (error.name === errorHandler_1.MOVIE_TICKET_RESERVE_REQUEST_ERROR_NAME) {
-                    if (error.code === http_status_1.BAD_REQUEST && error.message === MovieticketReserveRequestErrorMessage.NotFound) {
-                        seatInfoSyncCancelResult = error;
-                        throwsError = false;
-                    }
-                    // ReservationResult 19の内容が不明だがリトライする意味はおそらくないパターン
-                    if (error.code === http_status_1.BAD_REQUEST && error.message === MovieticketReserveRequestErrorMessage.ReservationResult19) {
-                        seatInfoSyncCancelResult = error;
-                        throwsError = false;
-                    }
-                    // surfrock: bookingNoが存在しないケースをハンドル(2024-03-13~)
-                    const expectedMessage4surfrockNotFound = JSON.stringify({ message: `bookingNo:"${paymentMethodId}" が見つかりません。` });
-                    if (error.code === http_status_1.BAD_REQUEST && error.message === expectedMessage4surfrockNotFound) {
-                        seatInfoSyncCancelResult = error;
-                        throwsError = false;
-                    }
-                    // 着券取消可能期間超過を認識した上でのあえての返金の場合(注文からしばらく経って返品など)(2024-03-19~)
-                    if (error.code === http_status_1.BAD_REQUEST && error.message === MovieticketReserveRequestErrorMessage.CancellationPeriodPassed) {
-                        if (params.purpose.typeOf === factory.actionType.ReturnAction) {
-                            seatInfoSyncResultAsError = error;
-                            throwsError = false;
+                    if (error.code === http_status_1.BAD_REQUEST) {
+                        if (Array.isArray(error.errors) && error.errors.length > 0) {
+                            const mvtkReserveServiceError = error.errors[0];
+                            // 興行会社システム座席予約番号存在無の場合、取消済なのでok
+                            if (mvtkReserveServiceError.status === surfrock.factory.ResultStatus.Success) {
+                                const cnclResult = (_h = mvtkReserveServiceError.rawResult) === null || _h === void 0 ? void 0 : _h.cnclResult;
+                                if (cnclResult === surfrock.service.seat.factory.seatInfoSyncCancel.CancelResult.CancelResult02) {
+                                    seatInfoSyncCancelResult = error;
+                                    throwsError = false;
+                                }
+                            }
                         }
                     }
                 }
@@ -565,9 +550,9 @@ function createSeatInfoSyncCancelInOnRefund(params) {
         let seatInfoSyncCancelIn;
         seatInfoSyncCancelIn = {
             kgygishCd: seatInfoSyncInOnPay.kgygishCd,
-            kgysystmzskyykNo: seatInfoSyncInOnPay.kgysystmzskyykNo,
+            kgysystmzskyykNo: seatInfoSyncInOnPay.kgygishSstmZskyykNo,
             kgysystmzskyykNoIkktsCnclFlg: '1',
-            jyuTyp: surfrock.service.seat.factory.seatInfoSyncCancel.IJyuTyp.IJyuTyp05,
+            jyuTyp: surfrock.service.seat.factory.seatInfoSyncCancel.JyuTyp.IJyuTyp05,
             jyuTypRmk: ''
             // knyknrNoInfoIn: [],
         };

package/lib/chevre/service/transaction/placeOrderInProgress/confirm.js

@@ -130,12 +130,13 @@ function saveMessagesIfNeeded(params, order, emailMessages) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         if (params.options.useSaveMessages) {
             if (emailMessages.length > 0) {
-                const { orderNumber, typeOf, project } = order;
+                const { orderNumber, typeOf, project, seller } = order;
                 debug('saving', emailMessages.length, 'messages...', emailMessages);
                 const saveMessageResult = yield repos.message.upsertByIdentifier(emailMessages.map(({ identifier, name, about, text, toRecipient, sender }) => {
                     return {
                         identifier, name, about, text, toRecipient, sender,
                         project,
+                        provider: { id: seller.id, typeOf: seller.typeOf },
                         mainEntity: { orderNumber, typeOf }
                     };
                 }));

package/package.json

@@ -10,12 +10,12 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.369.0-alpha.2",
+    "@chevre/factory": "4.369.0-alpha.3",
     "@cinerino/sdk": "5.17.1",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
-    "@surfrock/sdk": "1.3.0-alpha.0",
+    "@surfrock/sdk": "1.3.0-alpha.1",
     "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.21"
+  "version": "21.30.0-alpha.23"
 }