@chevre/domain 22.7.0-alpha.21 → 22.7.0-alpha.22

package/lib/chevre/service/order/deleteOrder.d.ts

@@ -5,6 +5,8 @@ import type { NoteRepo } from '../../repo/note';
 import type { OrderRepo } from '../../repo/order';
 import type { OwnershipInfoRepo } from '../../repo/ownershipInfo';
 import type { ReservationRepo } from '../../repo/reservation';
+import type { SettingRepo } from '../../repo/setting';
+import type { TaskRepo } from '../../repo/task';
 import * as factory from '../../factory';
 /**
  * 注文に関わるリソースを削除する
@@ -20,5 +22,7 @@ declare function deleteOrder(params: {
     order: OrderRepo;
     ownershipInfo: OwnershipInfoRepo;
     reservation: ReservationRepo;
+    setting: SettingRepo;
+    task: TaskRepo;
 }) => Promise<void>;
 export { deleteOrder };

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

@@ -22,7 +22,7 @@ function deleteOrder(params) {
             limit: 1,
             page: 1,
             orderNumbers: [params.object.orderNumber]
-        }, { inclusion: ['orderDate', 'project', 'customer', 'orderNumber', 'seller'] });
+        }, { inclusion: ['orderDate', 'project', 'customer', 'orderNumber', 'seller', 'broker'] });
         const order = orders.shift();
         if (order === undefined) {
             // すでに削除済
@@ -50,15 +50,57 @@ function deleteOrder(params) {
                 typeOf: factory.order.OrderType.Order
             }
         });
-        // 終了済の関連イベントを削除(2023-08-16~)
-        // if (USE_DELETE_EVENT_BY_ORDER) {
-        //     await deleteEventsByOrder(order)(repos);
-        // }
+        // deletePerson(2024-12-25~)
+        yield deletePersonIfNecessary(order)(repos);
         // 注文削除
         yield repos.order.deleteByOrderNumber({ orderNumber: order.orderNumber });
     });
 }
 exports.deleteOrder = deleteOrder;
+function deletePersonIfNecessary(order) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        // 代理注文を除く
+        if (order.customer.typeOf === factory.personType.Person
+            && typeof ((_a = order.broker) === null || _a === void 0 ? void 0 : _a.typeOf) !== 'string') {
+            const ordersByPerson = yield repos.order.projectFields({
+                limit: 1,
+                page: 1,
+                customer: { ids: [order.customer.id] }
+            }, { inclusion: ['orderNumber'] });
+            if (ordersByPerson.length === 0) {
+                const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['userPoolIdNew']);
+                if (typeof (setting === null || setting === void 0 ? void 0 : setting.userPoolIdNew) !== 'string') {
+                    throw new factory.errors.NotFound('setting.userPoolIdNew');
+                }
+                const deletePersonTask = {
+                    project: { typeOf: factory.organizationType.Project, id: order.project.id },
+                    name: factory.taskName.DeletePerson,
+                    status: factory.taskStatus.Ready,
+                    runsAt: new Date(),
+                    remainingNumberOfTries: 10,
+                    numberOfTried: 0,
+                    executionResults: [],
+                    data: {
+                        id: order.customer.id,
+                        agent: {
+                            id: order.project.id,
+                            typeOf: factory.organizationType.Project,
+                            name: factory.organizationType.Project
+                        },
+                        physically: true,
+                        userPoolId: setting.userPoolIdNew,
+                        project: { id: order.project.id },
+                        migrate: false,
+                        useUsernameAsGMOMemberId: false,
+                        executeBackground: true
+                    }
+                };
+                yield repos.task.saveMany([deletePersonTask], { emitImmediately: true });
+            }
+        }
+    });
+}
 function deleteReservationsByOrder(order) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const acceptedOffers = yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({

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

@@ -56,23 +56,26 @@ function call(params) {
             cognitoIdentityServiceProvider
         });
         const paymentServiceRepo = new paymentService_1.PaymentServiceRepo(connection);
-        const credentials = yield getCreditCardPaymentServiceChannel({
-            project: { id: params.project.id },
-            paymentMethodType: DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD
-        })({ paymentService: paymentServiceRepo });
-        const creditCardRepo = new creditCard_1.CreditCardRepo({
-            siteId: credentials.siteId,
-            sitePass: credentials.sitePass,
-            cardService: new GMO.service.Card({
-                endpoint: credentials.endpoint,
-                useFetch: settings.gmo.useFetch
-            }, {
-                timeout: (params.data.executeBackground)
-                    ? settings.gmo.timeout
-                    // tslint:disable-next-line:no-magic-numbers
-                    : 20000 // cronで実行の場合は長めに(2024-10-05~)
-            })
-        });
+        let creditCardRepo;
+        if (params.data.useUsernameAsGMOMemberId === true) {
+            const credentials = yield getCreditCardPaymentServiceChannel({
+                project: { id: params.project.id },
+                paymentMethodType: DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD
+            })({ paymentService: paymentServiceRepo });
+            creditCardRepo = new creditCard_1.CreditCardRepo({
+                siteId: credentials.siteId,
+                sitePass: credentials.sitePass,
+                cardService: new GMO.service.Card({
+                    endpoint: credentials.endpoint,
+                    useFetch: settings.gmo.useFetch
+                }, {
+                    timeout: (params.data.executeBackground)
+                        ? settings.gmo.timeout
+                        // tslint:disable-next-line:no-magic-numbers
+                        : 20000 // cronで実行の場合は長めに(2024-10-05~)
+                })
+            });
+        }
         yield deleteById(params.data, setting)({
             account: new account_1.AccountRepo(connection),
             action: new action_1.ActionRepo(connection),
@@ -133,17 +136,17 @@ function deleteById(params, setting) {
             existingPeople = yield repos.newPerson.search({ id: params.id });
             debug('admin:people:deleteById: existingPeople:', JSON.stringify(existingPeople));
             if (existingPeople.length > 0) {
-                // クレジットカード削除
-                yield deleteCreditCardsById({
-                    id: params.id,
-                    useUsernameAsGMOMemberId: params.useUsernameAsGMOMemberId
-                }, setting)({
-                    person: repos.newPerson,
-                    creditCard: repos.creditCard,
-                    cognitoIdentityServiceProvider: repos.cognitoIdentityServiceProvider
+                if (repos.creditCard !== undefined) {
+                    // クレジットカード削除
+                    yield deleteCreditCardsById({
+                        id: params.id,
+                        useUsernameAsGMOMemberId: params.useUsernameAsGMOMemberId
+                    }, setting)({
+                        person: repos.newPerson,
+                        creditCard: repos.creditCard,
+                        cognitoIdentityServiceProvider: repos.cognitoIdentityServiceProvider
+                    });
                 }
-                // settings
-                );
             }
             // 所有権削除
             debug('admin:people:deleteById: deleteOwnershipInfosById processing... personId:', params.id);
@@ -375,9 +378,7 @@ function sleep(waitTime) {
 const DELETE_CREDIT_CARD_MAX_RETRY_COUNT = 2;
 const DELETE_CREDIT_CARD_RETRY_INTERVAL_IN_MS = 1000;
 function deleteCreditCardsById(params, setting) {
-    return (repos
-    // settings: Settings
-    ) => __awaiter(this, void 0, void 0, function* () {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
         let retry = true;
         let numberOfTry = 0;
         while (numberOfTry >= 0) {

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

@@ -20,6 +20,7 @@ const note_1 = require("../../repo/note");
 const order_1 = require("../../repo/order");
 const ownershipInfo_1 = require("../../repo/ownershipInfo");
 const reservation_1 = require("../../repo/reservation");
+const setting_1 = require("../../repo/setting");
 const task_1 = require("../../repo/task");
 const transaction_1 = require("../../repo/transaction");
 const TransactionService = require("../transaction");
@@ -39,6 +40,7 @@ function call(data) {
             order: new order_1.OrderRepo(connection),
             ownershipInfo: new ownershipInfo_1.OwnershipInfoRepo(connection),
             reservation: new reservation_1.ReservationRepo(connection),
+            setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection),
             transaction: new transaction_1.TransactionRepo(connection)
         });

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

@@ -9,6 +9,7 @@ import type { NoteRepo } from '../../repo/note';
 import type { OrderRepo } from '../../repo/order';
 import type { OwnershipInfoRepo } from '../../repo/ownershipInfo';
 import type { ReservationRepo } from '../../repo/reservation';
+import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
 import type { TransactionRepo } from '../../repo/transaction';
 /**
@@ -26,6 +27,7 @@ export declare function deleteTransaction(params: factory.task.IData<factory.tas
     order: OrderRepo;
     ownershipInfo: OwnershipInfoRepo;
     reservation: ReservationRepo;
+    setting: SettingRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
 }) => Promise<void>;

package/package.json

@@ -112,5 +112,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.7.0-alpha.21"
+  "version": "22.7.0-alpha.22"
 }