@chevre/domain 21.33.0-alpha.6 → 21.33.0-alpha.8

package/example/src/chevre/searchTransactions.ts

@@ -5,6 +5,10 @@ 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 });
 
@@ -15,25 +19,19 @@ async function main() {
         page: 1,
         project: { id: { $eq: project.id } },
         typeOf: chevre.factory.transactionType.PlaceOrder,
-        statuses: [chevre.factory.transactionStatusType.Confirmed],
-        result: {
-            order: {
-                confirmationNumber: { $eq: '14438' },
-                orderNumbers: ['CIN3-0760465-8981560']
-            }
-        },
+        // statuses: [chevre.factory.transactionStatusType.Confirmed],
+        // result: {
+        //     order: {
+        //         confirmationNumber: { $eq: '14438' },
+        //         orderNumbers: ['CIN3-0760465-8981560']
+        //     }
+        // },
+        tasksExportAction: { actionStatus: { $eq: chevre.factory.actionStatusType.PotentialActionStatus } },
         inclusion: ['_id'],
         exclusion: []
     });
     console.log('transactions found', transactions);
     console.log(transactions.length, 'transactions found');
-
-    const transaction = await transactionRepo.findById({
-        typeOf: chevre.factory.transactionType.PlaceOrder,
-        id: '6570f9d7834f9638ceec86ad',
-        inclusion: ['_id', 'typeOf', 'status']
-    });
-    console.log('transaction found', transaction);
 }
 
 main()

package/lib/chevre/repo/mongoose/schemas/transaction.d.ts

@@ -1,5 +1,5 @@
 import { IndexDefinition, IndexOptions, Schema } from 'mongoose';
 declare const modelName = "Transaction";
-declare function createSchema(): Schema;
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
+declare function createSchema(): Schema;
 export { modelName, indexes, createSchema };

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

@@ -51,17 +51,6 @@ const schemaOptions = {
         versionKey: false
     }
 };
-/**
- * 取引スキーマ
- */
-let schema;
-function createSchema() {
-    if (schema === undefined) {
-        schema = new mongoose_1.Schema(schemaDefinition, schemaOptions);
-    }
-    return schema;
-}
-exports.createSchema = createSchema;
 const indexes = [
     [
         { createdAt: 1 },
@@ -234,42 +223,6 @@ const indexes = [
             }
         }
     ],
-    [
-        { 'agent.familyName': 1, startDate: -1 },
-        {
-            name: 'searchByAgentFamilyName',
-            partialFilterExpression: {
-                'agent.familyName': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'agent.givenName': 1, startDate: -1 },
-        {
-            name: 'searchByAgentGivenName',
-            partialFilterExpression: {
-                'agent.givenName': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'agent.email': 1, startDate: -1 },
-        {
-            name: 'searchByAgentEmail',
-            partialFilterExpression: {
-                'agent.email': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'agent.telephone': 1, startDate: -1 },
-        {
-            name: 'searchByAgentTelephone',
-            partialFilterExpression: {
-                'agent.telephone': { $exists: true }
-            }
-        }
-    ],
     [
         { 'seller.typeOf': 1, startDate: -1 },
         {
@@ -305,33 +258,45 @@ const indexes = [
     ],
     [
         { tasksExportationStatus: 1, updatedAt: 1 },
-        {
-            name: 'reexportTasks'
-        }
+        { name: 'reexportTasks' }
     ],
     [
-        { 'project.id': 1, tasksExportationStatus: 1, updatedAt: 1 },
-        {
-            name: 'reexportTasks-v2',
-            partialFilterExpression: {
-                'project.id': { $exists: true }
-            }
-        }
+        { status: 1, expires: 1 },
+        { name: 'makeExpired' }
     ],
     [
-        { status: 1, expires: 1 },
+        { 'tasksExportAction.actionStatus': 1, startDate: -1 },
         {
-            name: 'makeExpired'
+            name: 'searchByTasksExportActionActionStatus',
+            partialFilterExpression: {
+                'tasksExportAction.actionStatus': { $exists: true }
+            }
         }
     ],
     [
-        { 'project.id': 1, status: 1, expires: 1 },
+        { 'tasksExportAction.startDate': 1, startDate: -1 },
         {
-            name: 'makeExpired-v2',
+            name: 'searchByTasksExportActionActionStartDate',
             partialFilterExpression: {
-                'project.id': { $exists: true }
+                'tasksExportAction.startDate': { $exists: true }
             }
         }
     ]
 ];
 exports.indexes = indexes;
+/**
+ * 取引スキーマ
+ */
+let schema;
+function createSchema() {
+    if (schema === undefined) {
+        schema = new mongoose_1.Schema(schemaDefinition, schemaOptions);
+        if (settings_1.MONGO_AUTO_INDEX) {
+            indexes.forEach((indexParams) => {
+                schema === null || schema === void 0 ? void 0 : schema.index(...indexParams);
+            });
+        }
+    }
+    return schema;
+}
+exports.createSchema = createSchema;

package/lib/chevre/repo/transaction.js

@@ -24,7 +24,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         const andConditions = [];
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
@@ -175,23 +175,27 @@ class MongoRepository {
                 tasksExportationStatus: { $in: params.tasksExportationStatuses }
             });
         }
+        const tasksExportActionStatusEq = (_b = (_a = params.tasksExportAction) === null || _a === void 0 ? void 0 : _a.actionStatus) === null || _b === void 0 ? void 0 : _b.$eq;
+        if (typeof tasksExportActionStatusEq === 'string') {
+            andConditions.push({ 'tasksExportAction.actionStatus': { $exists: true, $eq: tasksExportActionStatusEq } });
+        }
         switch (params.typeOf) {
             case factory.transactionType.PlaceOrder:
-                const sellerIdIn = (_a = params.seller) === null || _a === void 0 ? void 0 : _a.ids;
+                const sellerIdIn = (_c = params.seller) === null || _c === void 0 ? void 0 : _c.ids;
                 if (Array.isArray(sellerIdIn)) {
                     andConditions.push({ 'seller.id': { $exists: true, $in: sellerIdIn } });
                 }
-                const resultOrderNumberIn = (_c = (_b = params.result) === null || _b === void 0 ? void 0 : _b.order) === null || _c === void 0 ? void 0 : _c.orderNumbers;
+                const resultOrderNumberIn = (_e = (_d = params.result) === null || _d === void 0 ? void 0 : _d.order) === null || _e === void 0 ? void 0 : _e.orderNumbers;
                 if (Array.isArray(resultOrderNumberIn)) {
                     andConditions.push({ 'result.order.orderNumber': { $exists: true, $in: resultOrderNumberIn } });
                 }
-                const resultOrderConfirmationNumberEq = (_f = (_e = (_d = params.result) === null || _d === void 0 ? void 0 : _d.order) === null || _e === void 0 ? void 0 : _e.confirmationNumber) === null || _f === void 0 ? void 0 : _f.$eq;
+                const resultOrderConfirmationNumberEq = (_h = (_g = (_f = params.result) === null || _f === void 0 ? void 0 : _f.order) === null || _g === void 0 ? void 0 : _g.confirmationNumber) === null || _h === void 0 ? void 0 : _h.$eq;
                 if (typeof resultOrderConfirmationNumberEq === 'string') {
                     andConditions.push({
                         'result.order.confirmationNumber': { $exists: true, $eq: resultOrderConfirmationNumberEq }
                     });
                 }
-                const objectOrderNumberEq = (_h = (_g = params.object) === null || _g === void 0 ? void 0 : _g.orderNumber) === null || _h === void 0 ? void 0 : _h.$eq;
+                const objectOrderNumberEq = (_k = (_j = params.object) === null || _j === void 0 ? void 0 : _j.orderNumber) === null || _k === void 0 ? void 0 : _k.$eq;
                 if (typeof objectOrderNumberEq === 'string') {
                     andConditions.push({ 'object.orderNumber': { $exists: true, $eq: objectOrderNumberEq } });
                 }

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

@@ -14,7 +14,7 @@ export declare function creatPayTransactionStartParams(params: {
     accountId?: string;
     object: factory.action.authorize.paymentMethod.any.IObject;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
-    transaction: Pick<factory.transaction.ITransaction<factory.transactionType>, 'expires' | 'seller' | 'project'>;
+    transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'expires' | 'seller' | 'project' | 'object'>;
     transactionNumber: string;
     location?: factory.action.trade.pay.ILocation;
 }): factory.assetTransaction.pay.IStartParamsWithoutDetail;

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

@@ -224,8 +224,11 @@ exports.processVoidPayTransaction = processVoidPayTransaction;
 function publishPaymentUrl(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
+        if (params.purpose.typeOf !== factory.transactionType.PlaceOrder) {
+            throw new factory.errors.NotImplemented(`purpose.typeOf '${params.purpose.typeOf} not implemented'`);
+        }
         try {
-            const transaction = yield repos.transaction.findInProgressById({ typeOf: params.purpose.typeOf, id: params.purpose.id }, ['expires', 'seller', 'project']);
+            const transaction = yield repos.transaction.findInProgressById({ typeOf: params.purpose.typeOf, id: params.purpose.id }, ['expires', 'seller', 'project', 'object']);
             const paymentServiceType = params.paymentServiceType;
             // 取引番号生成
             const { transactionNumber } = yield repos.transactionNumber.publishByTimestamp({
@@ -287,6 +290,9 @@ function authorize(params) {
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
+        if (params.purpose.typeOf !== factory.transactionType.PlaceOrder) {
+            throw new factory.errors.NotImplemented(`purpose.typeOf '${params.purpose.typeOf} not implemented'`);
+        }
         // MovieTicketの場合、確認番号を発行(着券に連携するため)(2024-05-27~)
         if (params.paymentServiceType === factory.service.paymentService.PaymentServiceType.MovieTicket) {
             yield (0, publishConfirmationNumberIfNotExist_1.publishConfirmationNumberIfNotExist)({

package/package.json

@@ -10,8 +10,8 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.371.0",
-    "@cinerino/sdk": "7.0.0-alpha.11",
+    "@chevre/factory": "4.372.0",
+    "@cinerino/sdk": "7.0.0-alpha.12",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.33.0-alpha.6"
+  "version": "21.33.0-alpha.8"
 }