@chevre/domain 21.24.1 → 21.25.0-alpha.0

package/example/src/chevre/migrateDeleteTransactionTasks.ts

@@ -20,7 +20,7 @@ async function main() {
             runsAt: {
                 $gte: moment()
                     // tslint:disable-next-line:no-magic-numbers
-                    .add(223, 'days')
+                    .add(236, 'days')
                     .toDate(),
                 $lte: moment()
                     // tslint:disable-next-line:no-magic-numbers

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

@@ -13,7 +13,10 @@ const schemaDefinition = {
         type: String,
         required: true
     },
-    identifier: mongoose_1.SchemaTypes.Mixed,
+    identifier: {
+        type: String,
+        required: true
+    },
     ownedBy: mongoose_1.SchemaTypes.Mixed,
     acquiredFrom: mongoose_1.SchemaTypes.Mixed,
     ownedFrom: Date,

package/lib/chevre/repo/ownershipInfo.js

@@ -225,9 +225,8 @@ class MongoRepository {
             let doc;
             let duplicate = false;
             try {
-                doc = yield this.ownershipInfoModel.findOneAndUpdate({ identifier: ownershipInfo.identifier }, {
-                    // insert時以外は何もしなくてもよいか
-                    // $set: ownershipInfo,
+                doc = yield this.ownershipInfoModel.findOneAndUpdate({ identifier: { $eq: ownershipInfo.identifier } }, {
+                    // insert時以外は何もしなくてもよい
                     $setOnInsert: Object.assign(Object.assign({}, ownershipInfo), { _id: uuid.v4() // 新規作成時は所有権ID発行
                      })
                 }, {
@@ -254,7 +253,7 @@ class MongoRepository {
             }
             if (duplicate) {
                 // 重複の場合、再度取得
-                doc = yield this.ownershipInfoModel.findOne({ identifier: ownershipInfo.identifier }, {
+                doc = yield this.ownershipInfoModel.findOne({ identifier: { $eq: ownershipInfo.identifier } }, {
                     __v: 0,
                     createdAt: 0,
                     updatedAt: 0
@@ -313,7 +312,7 @@ class MongoRepository {
                 .select({ __v: 0, createdAt: 0, updatedAt: 0 })
                 .exec()
                 .then((doc) => {
-                // 存在しない場合はいったん保留
+                // 存在しない場合も正常にハンドルする
                 if (doc === null) {
                     return;
                 }

package/lib/chevre/service/delivery/factory.js

@@ -85,8 +85,6 @@ function createOwnedby(params) {
             // 個人情報排除するように
             typeOf: customer.typeOf,
             id: customer.id
-            // project: customer.project,
-            // ...(Array.isArray(customer.identifier)) ? { identifier: customer.identifier } : undefined
         };
         owner = ownerAsOrganization;
     }
@@ -95,10 +93,6 @@ function createOwnedby(params) {
             // 個人情報排除するように
             typeOf: customer.typeOf,
             id: customer.id
-            // ...(Array.isArray(customer.identifier)) ? { identifier: customer.identifier } : undefined,
-            // ...(customer.typeOf === factory.personType.Person && typeof customer.memberOf?.typeOf === 'string')
-            //     ? { memberOf: customer.memberOf }
-            //     : undefined
         };
         owner = ownerAsPerson;
     }
@@ -107,8 +101,6 @@ function createOwnedby(params) {
             // 個人情報排除するように
             typeOf: customer.typeOf,
             id: customer.id
-            // ↓不要なので廃止(2022-07-28~)
-            // ...(Array.isArray(customer.identifier)) ? { identifier: customer.identifier } : undefined
         };
     }
     return [owner];

package/lib/chevre/service/order/returnOrder.js

@@ -139,8 +139,6 @@ function processReturnOrder(order, dateReturned) {
         // 所有権の所有期間変更
         // 注文オファーリポジトリから所有権識別子を検索する(2023-12-07~)
         const ownershipInfos = yield repos.acceptedOffer.aggreateOwnershipInfosByOrder({ orderNumber: { $eq: order.orderNumber } });
-        // const ownershipInfos = createOwnershipInfosFromOrder({ order });
-        debug('processing findByIdentifierAndUpdateOwnedThrough...', ownershipInfos);
         if (Array.isArray(ownershipInfos)) {
             yield Promise.all(ownershipInfos.map((ownershipInfo) => __awaiter(this, void 0, void 0, function* () {
                 const ownershipInfoReturned = yield repos.ownershipInfo.findByIdentifierAndUpdateOwnedThrough({
@@ -149,7 +147,7 @@ function processReturnOrder(order, dateReturned) {
                     ownedThrough: dateReturned
                 })
                     .then((ownershipInfoByDB) => {
-                    // 存在しない場合はいったん保留
+                    // 存在しない場合は識別子のみ保管(customer.typeOfによって存在しないこともありうる)
                     if (ownershipInfoByDB === undefined) {
                         return ownershipInfo;
                     }

package/lib/chevre/service/order/sendOrder.js

@@ -16,6 +16,7 @@ const factory_1 = require("../delivery/factory");
 const findPlaceOrderTransaction_1 = require("./findPlaceOrderTransaction");
 const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
 const factory = require("../../factory");
+const settings_1 = require("../../settings");
 const debug = createDebug('chevre-domain:service:order');
 /**
  * 注文を配送する
@@ -87,9 +88,20 @@ function sendOrder(params) {
                 typeOf: factory.actionType.SendAction
             };
             const action = yield repos.action.start(sendOrderActionAttributes);
-            let ownershipInfos;
+            let ownershipInfos = [];
             let allOffersDelivered = false;
             let acceptedOffers;
+            // 所有権生成を最小化(2024-03-01~)
+            let createOwnerships = false;
+            switch (order.customer.typeOf) {
+                case factory.creativeWorkType.WebApplication:
+                    if (settings_1.USE_OWNERSHIP_INFO_BY_WEB_APPLICATION) {
+                        createOwnerships = true;
+                    }
+                    break;
+                default:
+                    createOwnerships = true;
+            }
             try {
                 const searchSlicedAcceptedOffersResult = yield repos.acceptedOffer.searchSlicedAcceptedOffersByOrderNumber({
                     $slice: [limit * (page - 1), limit],
@@ -97,15 +109,15 @@ function sendOrder(params) {
                     project: { id: { $eq: order.project.id } }
                 });
                 acceptedOffers = searchSlicedAcceptedOffersResult.acceptedOffers;
-                debug('delivering...', order.orderNumber, acceptedOffers.map((offer) => `${offer.itemOffered.id}`), params.object.acceptedOffers);
                 // 所有権作成
-                ownershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({ order: Object.assign(Object.assign({}, order), { acceptedOffers }) });
-                ownershipInfos = yield Promise.all(ownershipInfos.map((ownershipInfo) => __awaiter(this, void 0, void 0, function* () {
-                    return repos.ownershipInfo.createIfNotExistByIdentifier(ownershipInfo);
-                })));
-                const deliveredCount = limit * page;
-                debug(deliveredCount, 'delivered.', order.orderNumber, params.object.acceptedOffers);
-                // if (deliveredCount >= numAcceptedOffers) {
+                if (createOwnerships) {
+                    ownershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({ order: Object.assign(Object.assign({}, order), { acceptedOffers }) });
+                    ownershipInfos = yield Promise.all(ownershipInfos.map((ownershipInfo) => __awaiter(this, void 0, void 0, function* () {
+                        return repos.ownershipInfo.createIfNotExistByIdentifier(ownershipInfo);
+                    })));
+                }
+                // const deliveredCount = limit * page;
+                // debug(deliveredCount, 'delivered.', order.orderNumber, params.object.acceptedOffers);
                 if (acceptedOffers.length === 0) {
                     order = yield repos.order.changeStatus({
                         project: { id: order.project.id },

package/lib/chevre/settings.d.ts

@@ -43,6 +43,7 @@ export declare const USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING: boolean;
 export declare const USE_MINIMIZED_PAY_TASK: boolean;
 export declare const USE_KANA_NAME_IN_ACCEPTED_OFFER: boolean;
 export declare const USE_VALIDATE_PROJECT_MAKES_OFFER: boolean;
+export declare const USE_OWNERSHIP_INFO_BY_WEB_APPLICATION: boolean;
 export declare const MONGO_MAX_TIME_MS: number;
 export declare const MONGO_READ_PREFERENCE: string;
 export declare const MONGO_AUTO_INDEX: boolean;

package/lib/chevre/settings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.settings = exports.DELIVER_ORDER_LIMIT = exports.MONGO_AUTO_INDEX = exports.MONGO_READ_PREFERENCE = exports.MONGO_MAX_TIME_MS = exports.USE_VALIDATE_PROJECT_MAKES_OFFER = exports.USE_KANA_NAME_IN_ACCEPTED_OFFER = exports.USE_MINIMIZED_PAY_TASK = exports.USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING = exports.USE_INFORM_ORDER_IN_TRANSIT = exports.USE_FETCH_API = exports.USE_OPTIMIZE_TICKET_OFFER = exports.USE_DELETE_EVENT_BY_ORDER = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.MAX_NUM_CREDIT_CARD_PAYMENT_METHOD = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
+exports.settings = exports.DELIVER_ORDER_LIMIT = exports.MONGO_AUTO_INDEX = exports.MONGO_READ_PREFERENCE = exports.MONGO_MAX_TIME_MS = exports.USE_OWNERSHIP_INFO_BY_WEB_APPLICATION = exports.USE_VALIDATE_PROJECT_MAKES_OFFER = exports.USE_KANA_NAME_IN_ACCEPTED_OFFER = exports.USE_MINIMIZED_PAY_TASK = exports.USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING = exports.USE_INFORM_ORDER_IN_TRANSIT = exports.USE_FETCH_API = exports.USE_OPTIMIZE_TICKET_OFFER = exports.USE_DELETE_EVENT_BY_ORDER = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.MAX_NUM_CREDIT_CARD_PAYMENT_METHOD = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
 const factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
     ? process.env.INFORM_TRANSACTION_URL.split(' ')
@@ -67,6 +67,7 @@ exports.USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING = process.env.USE_SEND_EMAIL_
 exports.USE_MINIMIZED_PAY_TASK = process.env.USE_MINIMIZED_PAY_TASK === '1';
 exports.USE_KANA_NAME_IN_ACCEPTED_OFFER = process.env.USE_KANA_NAME_IN_ACCEPTED_OFFER === '1';
 exports.USE_VALIDATE_PROJECT_MAKES_OFFER = process.env.USE_VALIDATE_PROJECT_MAKES_OFFER === '1';
+exports.USE_OWNERSHIP_INFO_BY_WEB_APPLICATION = process.env.USE_OWNERSHIP_INFO_BY_WEB_APPLICATION === '1';
 exports.MONGO_MAX_TIME_MS = (typeof process.env.MONGO_MAX_TIME_MS === 'string')
     ? Number(process.env.MONGO_MAX_TIME_MS)
     // tslint:disable-next-line:no-magic-numbers

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.358.0",
+    "@chevre/factory": "4.359.0",
     "@cinerino/sdk": "5.12.0",
     "@motionpicture/coa-service": "9.3.0-alpha.5",
     "@motionpicture/gmo-service": "5.3.0-alpha.4",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.24.1"
+  "version": "21.25.0-alpha.0"
 }