@chevre/domain 22.7.0-alpha.9 → 22.7.0

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

@@ -15,7 +15,6 @@ exports.publishPaymentUrl = exports.processVoidPayTransaction = exports.person2u
  */
 const factory = require("../../factory");
 const PayTransactionService = require("../assetTransaction/pay");
-const code_1 = require("../code");
 const factory_1 = require("./any/factory");
 const fixConfirmationNumberAsNeeded_1 = require("./any/fixConfirmationNumberAsNeeded");
 const handlePrePublishedPaymentMethodIdOnAuthorizing_1 = require("./any/handlePrePublishedPaymentMethodIdOnAuthorizing");
@@ -313,7 +312,11 @@ function minimizeObjectIncludingPaymentMethodDetails(authorizeObjectIncludingPay
  */
 function authorize(params) {
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
-    return (repos, settings, credentials) => __awaiter(this, void 0, void 0, function* () {
+    return (repos, settings
+    // credentials: {
+    //     jwt: JWTCredentials;
+    // }
+    ) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         const { paymentServiceType, purpose, project } = params;
         if (purpose.typeOf !== factory.transactionType.PlaceOrder) {
@@ -380,7 +383,7 @@ function authorize(params) {
         const movieTickets = (Array.isArray(params.object.movieTickets)) ? params.object.movieTickets.map(factory_1.createMovieTicket) : undefined;
         const { accountId } = yield fixAccountIdIfPossible({
             object: params.object, project: { id: transaction.project.id }
-        })(repos, credentials);
+        })();
         const authorizeObjectIncludingPaymentMethodDetails = Object.assign(Object.assign(Object.assign(Object.assign({}, params.object), { accountId, paymentMethodId: transactionNumber, typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment }), (creditCard !== undefined) ? { creditCard } : undefined), (Array.isArray(movieTickets)) ? { movieTickets } : undefined);
         const { authorizeObject } = minimizeObjectIncludingPaymentMethodDetails(authorizeObjectIncludingPaymentMethodDetails);
         // 承認アクションを開始する
@@ -458,30 +461,40 @@ exports.authorize = authorize;
  * 承認しようとしているobjectからaccountIdを決定する
  */
 function fixAccountIdIfPossible(params) {
-    return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
+    return (
+    // repos: {
+    //     action: ActionRepo;
+    //     authorization: AuthorizationRepo;
+    //     ticket: TicketRepo;
+    // }
+    // credentials: {
+    //     jwt: JWTCredentials;
+    // }
+    ) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
-        // let accountId = params.object?.accountId;
         let accountId = '';
         const fromLocation = (_a = params.object) === null || _a === void 0 ? void 0 : _a.fromLocation;
         const movieTickets = (_b = params.object) === null || _b === void 0 ? void 0 : _b.movieTickets;
-        // トークン化されたペイメントカード情報でリクエストされた場合、実ペイメントカード情報へ変換する
+        // discontinue token as fromLocation(ticketTokenへ移行するべき)(2024-12-18~)
         if (typeof fromLocation === 'string') {
-            const { authorizedObject } = yield (0, code_1.verifyToken)({
-                project: { id: params.project.id },
-                agent: { id: params.project.id, typeOf: factory.organizationType.Project },
-                token: fromLocation
-            })(repos, credentials);
-            const paymentCardOwnershipInfo = authorizedObject;
-            if (Array.isArray(paymentCardOwnershipInfo)) {
-                throw new factory.errors.NotImplemented('fromLocation as an array not implemented');
-            }
-            if (paymentCardOwnershipInfo.typeOf !== 'OwnershipInfo') {
-                throw new factory.errors.Argument('fromLocation', 'must be OwnershipInfo');
-            }
-            if (paymentCardOwnershipInfo.typeOfGood.typeOf !== factory.permit.PermitType.Permit) {
-                throw new factory.errors.Argument('fromLocation', 'must be Permit');
-            }
-            accountId = paymentCardOwnershipInfo.typeOfGood.identifier;
+            throw new factory.errors.NotImplemented('object.fromLocation as string not implemented');
+            // トークン化されたペイメントカード情報でリクエストされた場合、実ペイメントカード情報へ変換する
+            // const { authorizedObject } = await verifyToken({
+            //     project: { id: params.project.id },
+            //     agent: { id: params.project.id, typeOf: factory.organizationType.Project },
+            //     token: fromLocation
+            // })(repos);
+            // const paymentCardOwnershipInfo = authorizedObject;
+            // if (Array.isArray(paymentCardOwnershipInfo)) {
+            //     throw new factory.errors.NotImplemented('fromLocation as an array not implemented');
+            // }
+            // if (paymentCardOwnershipInfo.typeOf !== 'OwnershipInfo') {
+            //     throw new factory.errors.Argument('fromLocation', 'must be OwnershipInfo');
+            // }
+            // if (paymentCardOwnershipInfo.typeOfGood.typeOf !== factory.permit.PermitType.Permit) {
+            //     throw new factory.errors.Argument('fromLocation', 'must be Permit');
+            // }
+            // accountId = paymentCardOwnershipInfo.typeOfGood.identifier;
         }
         // 購入番号管理番号をaccountIdにセット(2024-03-24~)
         if (Array.isArray(movieTickets) && movieTickets.length > 0) {

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

@@ -22,9 +22,9 @@ function createPayObjectServiceOutput(params) {
             if (Array.isArray(movieTickets)) {
                 paymentServiceOutput = movieTickets.map((movieTicket) => {
                     var _a;
-                    const amount = movieTicket2amount(transaction, movieTicket);
+                    const { amount, additionalProperty } = checkResult2movieTicket(movieTicket, params.checkResult);
                     const reservation4invoice = movieTicket2reservation4invoice(movieTicket, order, String(paymentMethodType), transaction.transactionNumber);
-                    return Object.assign(Object.assign({ identifier: movieTicket.identifier }, (typeof (amount === null || amount === void 0 ? void 0 : amount.value) === 'number') ? { amount } : undefined), (typeof ((_a = reservation4invoice.priceSpecification) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
+                    return Object.assign(Object.assign({ identifier: movieTicket.identifier, additionalProperty }, (typeof (amount === null || amount === void 0 ? void 0 : amount.value) === 'number') ? { amount } : undefined), (typeof ((_a = reservation4invoice.priceSpecification) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
                         ? { serviceOutput: reservation4invoice }
                         : undefined);
                 });
@@ -36,32 +36,38 @@ function createPayObjectServiceOutput(params) {
     return paymentServiceOutput;
 }
 exports.createPayObjectServiceOutput = createPayObjectServiceOutput;
-function movieTicket2amount(transaction, movieTicket, checkResult) {
-    var _a, _b, _c;
+function checkResult2movieTicket(
+// transaction: Pick<factory.assetTransaction.ITransaction<factory.assetTransactionType.Pay>, 'object'>,
+movieTicket, checkResult) {
+    var _a, _b;
+    const additionalProperty = [];
     let amount;
-    // accountsReceivablesByServiceTypeへの依存をactionRecipeへ移行可能か？(2024-12-13~)
-    const ykknInfos = (_b = (_a = checkResult === null || checkResult === void 0 ? void 0 : checkResult.purchaseNumberAuthResult.knyknrNoInfoOut) === null || _a === void 0 ? void 0 : _a.find((knyknrNoInfoOut) => knyknrNoInfoOut.knyknrNo === movieTicket.identifier)) === null || _b === void 0 ? void 0 : _b.ykknInfo;
-    const ykknInfoOfServiceType = ykknInfos === null || ykknInfos === void 0 ? void 0 : ykknInfos.find((ykknInfo) => ykknInfo.ykknshTyp === movieTicket.serviceType);
-    const accountsReceivableByResponse = ykknInfoOfServiceType === null || ykknInfoOfServiceType === void 0 ? void 0 : ykknInfoOfServiceType.kijUnip;
-    // tslint:disable-next-line:no-console
-    console.log('movieTicket2amount:', transaction.object.paymentMethodId, movieTicket.identifier, movieTicket.serviceOutput, 'accountsReceivableByResponse:', accountsReceivableByResponse);
-    if (typeof accountsReceivableByResponse === 'string') {
-        // amount = {
-        //     typeOf: 'MonetaryAmount',
-        //     value: Number(accountsReceivableByResponse)
-        // };
+    // accountsReceivablesByServiceTypeへの依存をactionRecipeへ移行(2024-12-16~)
+    const purchaseNumberInfo = (_a = checkResult === null || checkResult === void 0 ? void 0 : checkResult.purchaseNumberAuthResult.knyknrNoInfoOut) === null || _a === void 0 ? void 0 : _a.find(({ knyknrNo }) => knyknrNo === movieTicket.identifier);
+    const ykknInfoOfServiceType = (_b = purchaseNumberInfo === null || purchaseNumberInfo === void 0 ? void 0 : purchaseNumberInfo.ykknInfo) === null || _b === void 0 ? void 0 : _b.find((ykknInfo) => ykknInfo.ykknshTyp === movieTicket.serviceType);
+    const kijUnip = ykknInfoOfServiceType === null || ykknInfoOfServiceType === void 0 ? void 0 : ykknInfoOfServiceType.kijUnip;
+    if (typeof kijUnip === 'string') {
+        amount = {
+            typeOf: 'MonetaryAmount',
+            value: Number(kijUnip)
+        };
     }
-    const accountsReceivables = transaction.object.accountsReceivablesByServiceType;
-    if (Array.isArray(accountsReceivables)) {
-        const accountsReceivable = (_c = accountsReceivables.find((a) => a.serviceType === movieTicket.serviceType)) === null || _c === void 0 ? void 0 : _c.accountsReceivable;
-        if (typeof accountsReceivable === 'number') {
-            amount = {
-                typeOf: 'MonetaryAmount',
-                value: accountsReceivable
-            };
-        }
-    }
-    return amount;
+    additionalProperty.push(...(typeof kijUnip === 'string') ? [{ name: 'kijUnip', value: kijUnip }] : [], ...(typeof (purchaseNumberInfo === null || purchaseNumberInfo === void 0 ? void 0 : purchaseNumberInfo.dnshKmTyp) === 'string') ? [{ name: 'dnshKmTyp', value: purchaseNumberInfo.dnshKmTyp }] : []
+    // ...(typeof purchaseNumberInfo?.znkkkytsknGkjknTyp === 'string')
+    //     ? [{ name: 'znkkkytsknGkjknTyp', value: purchaseNumberInfo.znkkkytsknGkjknTyp }]
+    //     : []
+    );
+    // const accountsReceivables = transaction.object.accountsReceivablesByServiceType;
+    // if (Array.isArray(accountsReceivables)) {
+    //     const accountsReceivable = accountsReceivables.find((a) => a.serviceType === movieTicket.serviceType)?.accountsReceivable;
+    //     if (typeof accountsReceivable === 'number') {
+    //         amount = {
+    //             typeOf: 'MonetaryAmount',
+    //             value: accountsReceivable
+    //         };
+    //     }
+    // }
+    return { additionalProperty, amount };
 }
 function reservationPriceComponent2invoicePriceComponent(component) {
     var _a;

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

@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateMovieTicket = void 0;
 const createDebug = require("debug");
 const factory = require("../../../factory");
-const taskIdentifier_1 = require("../../../factory/taskIdentifier");
 const processPurchaseNumberAuth_1 = require("./processPurchaseNumberAuth");
 const debug = createDebug('chevre-domain:service:payment');
 function validateMovieTicket(params, paymentServiceId, 
@@ -119,28 +118,9 @@ function checkByIdentifierIfNotYet(params) {
         var _a, _b, _c;
         let checkResult;
         let alreadyCheckedAction; // すでにCheckActionが存在すれば認証しない(2023-06-06~)
-        // search from checkMovieTicketTask(2024-06-26~)
         const placeOrderId = params.purpose.id;
         if (typeof placeOrderId === 'string') {
-            if (settings.useExperimentalFeature) {
-                const taskIdentifier = (0, taskIdentifier_1.createCheckMovieTicketTaskIdentifier)({
-                    project: { id: params.screeningEvent.project.id },
-                    purpose: { id: placeOrderId },
-                    object: {
-                        id: params.paymentServiceId,
-                        movieTicket: {
-                            identifier: params.movieTicketIdentifier,
-                            serviceOutput: { reservationFor: { id: params.screeningEvent.id } }
-                        }
-                    }
-                });
-                const existingCheckMovieTicketTask = yield repos.task.findByIdentifier({
-                    project: { id: params.screeningEvent.project.id },
-                    name: factory.taskName.CheckMovieTicket,
-                    identifier: taskIdentifier
-                });
-                debug('existingCheckMovieTicketTask:', JSON.stringify(existingCheckMovieTicketTask), 'placeOrderId:', placeOrderId);
-            }
+            // no op
         }
         const specifiedCheckedActionId = (_a = params.checkedAction) === null || _a === void 0 ? void 0 : _a.id;
         if (typeof specifiedCheckedActionId === 'string' && specifiedCheckedActionId !== '') {
@@ -160,7 +140,6 @@ function checkByIdentifierIfNotYet(params) {
                         }
                     }
                 } }, (typeof placeOrderId === 'string') ? { purpose: { id: { $in: [placeOrderId] } } } : undefined), ['id'])).shift();
-            debug('alreadyCheckedAction:', JSON.stringify(alreadyCheckedAction), 'placeOrderId:', placeOrderId);
         }
         if (alreadyCheckedAction !== undefined) {
             const recipe = yield repos.action.findRecipeByAction({

package/lib/chevre/service/report/telemetry.js

@@ -349,7 +349,7 @@ function createGlobalFlow(measuredFrom, measuredThrough) {
         const targetTaskNames = Object.keys(factory.taskName)
             .map((k) => factory.taskName[k]);
         const taskResults = yield Promise.all(targetTaskNames.map((taskName) => __awaiter(this, void 0, void 0, function* () {
-            const numberOfTasksCreated = yield repos.task.taskModel.count({
+            const numberOfTasksCreated = yield repos.task.taskModel.countDocuments({
                 name: taskName,
                 createdAt: {
                     $gte: measuredFrom,
@@ -359,7 +359,7 @@ function createGlobalFlow(measuredFrom, measuredThrough) {
                 .exec();
             debug('numberOfTasksCreated:', numberOfTasksCreated);
             // 実行中止ステータスで、最終試行日時が範囲にあるものを実行タスク数とする
-            const numberOfTasksAborted = yield repos.task.taskModel.count({
+            const numberOfTasksAborted = yield repos.task.taskModel.countDocuments({
                 name: taskName,
                 lastTriedAt: {
                     $type: 'date',
@@ -423,7 +423,7 @@ function createGlobalStock(measuredAt) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         // 待機状態のタスク数を算出
         debug('counting waiting tasks globally...');
-        const numberOfTasksUnexecuted = yield repos.task.taskModel.count({
+        const numberOfTasksUnexecuted = yield repos.task.taskModel.countDocuments({
             runsAt: { $lt: measuredAt },
             status: { $in: [factory.taskStatus.Ready, factory.taskStatus.Running] }
         })

package/lib/chevre/service/reserve/verifyToken4reservation.js

@@ -10,29 +10,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.verifyToken4reservation = void 0;
-// import type { JWTCredentials } from '../../credentials/jwt';
 const factory = require("../../factory");
-// import { verifyToken } from '../code';
 /**
  * 予約使用のためのチケットトークンを検証する
  */
 function verifyToken4reservation(params) {
-    return (repos
-    // credentials: {
-    //     jwt: JWTCredentials;
-    // }
-    ) => __awaiter(this, void 0, void 0, function* () {
-        // JWTと承認コードの両方に対応する(2024-02-28~)
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
         const { ticketToken } = params.ticket;
         let payload;
-        // if (typeof token === 'string' && token.length > 0) {
-        //     const { authorizedObject } = await verifyToken({
-        //         project: params.project,
-        //         agent: params.agent,
-        //         token
-        //     })(repos, credentials);
-        //     payload = authorizedObject;
-        // } else
         if (typeof ticketToken === 'string' && ticketToken.length > 0) {
             const findValidOneByCodeResult = yield repos.authorization.findValidOneByCode({
                 project: { id: params.project.id },

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

@@ -26,7 +26,7 @@ let coaAuthClient;
 function call(params) {
     // tslint:disable-next-line:max-func-body-length
     return ({ connection, redisClient, settings }, options) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         if (redisClient === undefined) {
             throw new factory.errors.Argument('settings', 'redisClient required');
         }
@@ -34,18 +34,22 @@ function call(params) {
         if (!options.executeById) {
             return;
         }
+        const interfaceRepo = new interface_1.InterfaceRepo(connection);
+        const coaAPI = yield interfaceRepo.findOne({ project: { id: { $eq: params.project.id } } });
+        if (typeof (coaAPI === null || coaAPI === void 0 ? void 0 : coaAPI.id) !== 'string') {
+            throw new factory.errors.NotFound('WebAPI');
+        }
+        const credentials = (_a = coaAPI.availableChannel) === null || _a === void 0 ? void 0 : _a.credentials;
+        const memberClients = (_b = coaAPI.availableChannel) === null || _b === void 0 ? void 0 : _b.memberClients;
+        if (typeof (credentials === null || credentials === void 0 ? void 0 : credentials.refreshToken) !== 'string') {
+            throw new factory.errors.NotFound('WebAPI');
+        }
+        if (!Array.isArray(memberClients)) {
+            throw new factory.errors.NotFound('WebAPI.availableChannel.memberClients');
+        }
         if (coaAuthClient === undefined) {
-            const interfaceRepo = new interface_1.InterfaceRepo(connection);
-            const coaAPI = yield interfaceRepo.findOne({ project: { id: { $eq: params.project.id } } });
-            const credentials = (_a = coaAPI === null || coaAPI === void 0 ? void 0 : coaAPI.availableChannel) === null || _a === void 0 ? void 0 : _a.credentials;
-            if (typeof (credentials === null || credentials === void 0 ? void 0 : credentials.refreshToken) !== 'string') {
-                throw new factory.errors.NotFound('WebAPI');
-            }
-            if (typeof (coaAPI === null || coaAPI === void 0 ? void 0 : coaAPI.id) !== 'string') {
-                throw new factory.errors.NotFound('WebAPI');
-            }
             let credentialsRepo;
-            const credentialsExpireInSeconds = (_c = (_b = coaAPI.availableChannel) === null || _b === void 0 ? void 0 : _b.credentials) === null || _c === void 0 ? void 0 : _c.expireInSeconds;
+            const credentialsExpireInSeconds = (_d = (_c = coaAPI.availableChannel) === null || _c === void 0 ? void 0 : _c.credentials) === null || _d === void 0 ? void 0 : _d.expireInSeconds;
             if (typeof credentialsExpireInSeconds === 'number') {
                 // set credentialsRepo(2024-11-20~)
                 credentialsRepo = new credentials_1.CredentialsRepo(redisClient, {
@@ -66,13 +70,17 @@ function call(params) {
                 endpoint: coaAuthClient.options.endpoint,
                 auth: coaAuthClient
             }, { timeout: settings.coa.timeout });
-            const { object, potentialActions, purpose } = params.data;
+            const { agent, object, potentialActions, purpose } = params.data;
+            // agent.idからflgMemberを自動セット(2024-12-16~)
+            const isMember = memberClients.includes(agent.id);
             if (typeof potentialActions.id === 'string') {
                 yield (0, acceptOffer_1.reAcceptOffer)({
+                    agent,
                     object,
                     purpose,
                     potentialActions: Object.assign(Object.assign({}, potentialActions), { id: potentialActions.id }),
-                    sameAs: { id: params.id }
+                    sameAs: { id: params.id },
+                    isMember
                 })({
                     action: actionRepo,
                     event: new event_1.EventRepo(connection),
@@ -83,10 +91,12 @@ function call(params) {
             }
             else {
                 yield (0, acceptOffer_1.acceptOffer)({
+                    agent,
                     object,
                     potentialActions,
                     purpose,
-                    sameAs: { id: params.id }
+                    sameAs: { id: params.id },
+                    isMember
                 })({
                     action: actionRepo,
                     event: new event_1.EventRepo(connection),

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

@@ -32,13 +32,13 @@ const any_1 = require("../payment/any");
  * タスク実行関数
  */
 function call(params) {
-    return ({ connection, redisClient, credentials, settings }, options) => __awaiter(this, void 0, void 0, function* () {
+    return ({ connection, redisClient, settings }, options) => __awaiter(this, void 0, void 0, function* () {
         if (redisClient === undefined) {
             throw new factory.errors.Argument('settings', 'redisClient required');
         }
-        if (credentials.jwt === undefined) {
-            throw new factory.errors.Argument('settings', 'jwtCredentials required');
-        }
+        // if (credentials.jwt === undefined) {
+        //     throw new factory.errors.Argument('settings', 'jwtCredentials required');
+        // }
         // 遅延実行(executeByName)には対応しない
         if (!options.executeById) {
             return;
@@ -72,7 +72,9 @@ function call(params) {
                 transaction: new transaction_1.TransactionRepo(connection),
                 transactionNumber: new transactionNumber_1.TransactionNumberRepo(redisClient),
                 transactionProcess: transactionProcessRepo
-            }, settings, { jwt: credentials.jwt });
+            }, settings
+            // { jwt: credentials.jwt }
+            );
         }
         catch (error) {
             let throwsError = true;

package/lib/chevre/service/task/createEvent/createEventSeries.js

@@ -62,8 +62,11 @@ function createEventSeries(params) {
                     const bulkWriteResult = yield repos.eventSeries.createIfNotExistByWorkPerformed(creatingEventParams);
                     let upsertedIds;
                     if (bulkWriteResult !== undefined) {
-                        upsertedIds = bulkWriteResult.getUpsertedIds()
-                            .map((doc) => doc._id.toString());
+                        // BulkWriteResult -> upsertedIds: { '0': '7iri6p4m54k0r3g' }
+                        upsertedIds = Object.values(bulkWriteResult.upsertedIds)
+                            .map(String);
+                        // upsertedIds = bulkWriteResult.getUpsertedIds()
+                        //     .map((doc) => doc._id.toString());
                     }
                     eventIds = (Array.isArray(upsertedIds)) ? upsertedIds : [];
                     eventType = factory.eventType.ScreeningEventSeries;

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

@@ -11,8 +11,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
 const GMO = require("@motionpicture/gmo-service");
+const createDebug = require("debug");
 const factory = require("../../factory");
-// import { Settings } from '../../settings';
 const person2username_1 = require("../payment/any/person2username");
 const account_1 = require("../../repo/account");
 const action_1 = require("../../repo/action");
@@ -20,10 +20,11 @@ const ownershipInfo_1 = require("../../repo/ownershipInfo");
 const creditCard_1 = require("../../repo/paymentMethod/creditCard");
 const paymentService_1 = require("../../repo/paymentService");
 const person_1 = require("../../repo/person");
-const project_1 = require("../../repo/project");
+// import { ProjectRepo } from '../../repo/project';
 const setting_1 = require("../../repo/setting");
 const task_1 = require("../../repo/task");
-const DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = 'CreditCard';
+const debug = createDebug('chevre-domain:service:task:deletePerson');
+const ADMIN_PROVIDER_NAME = 'Google';
 let cognitoIdentityServiceProvider;
 /**
  * タスク実行関数
@@ -54,24 +55,27 @@ 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~)
-            })
-        });
-        yield deleteById(params.data, setting)({
+        let creditCardRepo;
+        if (typeof params.data.paymentMethodType4creditCard === 'string' && params.data.paymentMethodType4creditCard.length > 0) {
+            const credentials = yield getCreditCardPaymentServiceChannel({
+                project: { id: params.project.id },
+                paymentMethodType: params.data.paymentMethodType4creditCard
+            })({ 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(Object.assign(Object.assign({}, params.data), { project: { id: params.project.id } }), setting)({
             account: new account_1.AccountRepo(connection),
             action: new action_1.ActionRepo(connection),
             creditCard: creditCardRepo,
@@ -79,7 +83,7 @@ function call(params) {
             paymentService: paymentServiceRepo,
             newPerson: newPersonRepo,
             oldPerson: oldPersonRepo,
-            project: new project_1.ProjectRepo(connection),
+            // project: new ProjectRepo(connection),
             task: new task_1.TaskRepo(connection),
             cognitoIdentityServiceProvider
         }
@@ -96,6 +100,7 @@ function deleteById(params, setting) {
     return (repos
     // settings: Settings
     ) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
         const deleteMemberAction = {
             agent: params.agent,
             object: Object.assign({ id: params.id, typeOf: factory.personType.Person, migrate: params.migrate, physically: params.physically }, (typeof params.migratePersonRecipientUrl === 'string')
@@ -106,16 +111,22 @@ function deleteById(params, setting) {
         const action = yield repos.action.start(deleteMemberAction);
         let existingPeople;
         try {
-            const project = yield repos.project.findById({
-                id: params.project.id,
-                inclusion: ['settings']
-            });
-            // const useUsernameAsGMOMemberId = project.settings?.useUsernameAsGMOMemberId === true;
+            // const project = <Pick<factory.project.IProject, 'settings' | 'id'>>await repos.project.findById({
+            //     id: params.project.id,
+            //     inclusion: ['settings']
+            // });
+            existingPeople = yield repos.newPerson.search({ id: params.id });
+            // exclude ADMIN_PROVIDER_NAME
+            const username = (_a = existingPeople.at(0)) === null || _a === void 0 ? void 0 : _a.Username;
+            const isAdminPerson = typeof username === 'string' && username.startsWith(ADMIN_PROVIDER_NAME, 0);
+            if (isAdminPerson) {
+                throw new factory.errors.Argument('id', `${ADMIN_PROVIDER_NAME} people cannot be deleted`);
+            }
             // 移行の場合、全所有権情報通知タスクを作成
             if (params.migrate && typeof params.migratePersonRecipientUrl === 'string') {
                 yield createInformTask({
                     id: params.id,
-                    project: { id: project.id },
+                    project: { id: params.project.id },
                     now: action.startDate,
                     migratePersonRecipientUrl: params.migratePersonRecipientUrl
                 })(repos);
@@ -124,38 +135,33 @@ function deleteById(params, setting) {
                 // 移行でなければDeleteTransactionタスクを作成(2023-07-03~)
                 yield createDeleteTransactionTask({
                     id: params.id,
-                    project: { id: project.id },
+                    project: { id: params.project.id },
                     now: action.startDate
                 })({ task: repos.task });
             }
-            existingPeople = yield repos.newPerson.search({ id: params.id });
-            // tslint:disable-next-line:no-console
-            console.log('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
-                );
             }
             // 所有権削除
-            // tslint:disable-next-line:no-console
-            console.log('admin:people:deleteById: deleteOwnershipInfosById processing... personId:', params.id);
+            debug('task:deletePerson:deleteById: deleteOwnershipInfosById processing... personId:', params.id);
             yield deleteOwnershipInfosById({
                 id: params.id,
-                project: { id: project.id }
+                project: { id: params.project.id }
             })({ ownershipInfo: repos.ownershipInfo });
             if (existingPeople.length > 0) {
                 // 会員削除
                 if (params.physically === true) {
-                    // tslint:disable-next-line:no-console
-                    console.log('admin:people:deleteById: deleteById processing...userId:', params.id);
+                    debug('task:deletePerson:deleteById: deleteById processing...userId:', params.id);
                     yield repos.newPerson.deleteById({ userId: params.id });
                 }
                 else {
@@ -376,9 +382,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) {
@@ -404,8 +408,7 @@ function deleteCreditCardsById(params, setting) {
                         let throwsPerson2usernameError = true;
                         // oldUserが存在しないケースをハンドル
                         if (error instanceof factory.errors.NotFound && error.entityName === 'User') {
-                            // tslint:disable-next-line:no-console
-                            console.log('admin:people:deleteById: deleteCreditCardsById oldUsername not found', 'personId:', params.id, 'numberOfTry:', numberOfTry);
+                            debug('task:deletePerson:deleteById: deleteCreditCardsById oldUsername not found', 'personId:', params.id, 'numberOfTry:', numberOfTry);
                             throwsPerson2usernameError = false;
                         }
                         if (throwsPerson2usernameError) {
@@ -413,16 +416,14 @@ function deleteCreditCardsById(params, setting) {
                         }
                     }
                     if (typeof oldUsername === 'string') {
-                        // tslint:disable-next-line:no-console
-                        console.log('admin:people:deleteById: deleteCreditCardsById processing... oldUsername:', oldUsername, 'personId:', params.id, 'numberOfTry:', numberOfTry);
+                        debug('task:deletePerson:deleteById: deleteCreditCardsById processing... oldUsername:', oldUsername, 'personId:', params.id, 'numberOfTry:', numberOfTry);
                         yield repos.creditCard.deleteAll({ personId: oldUsername });
                     }
                 }
                 else {
                     yield repos.creditCard.deleteAll({ personId: params.id });
                 }
-                // tslint:disable-next-line:no-console
-                console.log('admin:people:deleteById: deleteCreditCardsById processed. personId:', params.id, 'numberOfTry:', numberOfTry);
+                debug('task:deletePerson:deleteById: deleteCreditCardsById processed. personId:', params.id, 'numberOfTry:', numberOfTry);
                 break;
             }
             catch (error) {

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/task.d.ts

@@ -1,6 +1,5 @@
 import type { Connection } from 'mongoose';
 import type { RedisClientType } from 'redis';
-import { JWTCredentials } from '../credentials/jwt';
 import { LINENotifyCredentials } from '../credentials/lineNotify';
 import { SendGridCredentials } from '../credentials/sendGrid';
 import * as factory from '../factory';
@@ -9,7 +8,6 @@ import type { IExecutableTask, IExecutableTaskKeys, TaskRepo } from '../repo/tas
 import { Settings } from '../settings';
 import { AggregationSettings } from '../settings/aggregation';
 interface ICredentialSettings {
-    jwt?: JWTCredentials;
     sendGrid: SendGridCredentials;
 }
 interface IExecuteSettings {