@chevre/domain 22.7.0-alpha.8 → 22.7.0

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/pay.js

@@ -37,6 +37,7 @@ function call(params) {
         let payActionAttributes;
         payActionAttributes = yield (0, payment_1.payTask2payActionAttributes)(Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id, typeOf: 'Task' } // タスクIDを関連付け(2024-04-20~)
          }))({
+            action: new action_1.ActionRepo(connection),
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
             order: new order_1.OrderRepo(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 {

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/lib/chevre/service/transaction/moneyTransfer.d.ts

@@ -1,4 +1,3 @@
-import { JWTCredentials } from '../../credentials/jwt';
 import type { ActionRepo } from '../../repo/action';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../repo/authorization';
@@ -26,9 +25,7 @@ export interface IStartOperationRepos {
     transactionNumber: TransactionNumberRepo;
     assetTransaction: AssetTransactionRepo;
 }
-export type IStartOperation<T> = (repos: IStartOperationRepos, credentials: {
-    jwt: JWTCredentials;
-}) => Promise<T>;
+export type IStartOperation<T> = (repos: IStartOperationRepos) => Promise<T>;
 export type ITaskAndTransactionOperation<T> = (repos: {
     setting: SettingRepo;
     task: TaskRepo;
@@ -53,8 +50,6 @@ export type IAuthorizeOperation<T> = (repos: {
     ticket: TicketRepo;
     transaction: TransactionRepo;
     assetTransaction: AssetTransactionRepo;
-}, credentials: {
-    jwt: JWTCredentials;
 }) => Promise<T>;
 /**
  * 取引確定

package/lib/chevre/service/transaction/moneyTransfer.js

@@ -21,13 +21,16 @@ const factory_1 = require("./moneyTransfer/exportTasks/factory");
 const factory_2 = require("./moneyTransfer/factory");
 const potentialActions_1 = require("./moneyTransfer/potentialActions");
 const MoneyTransferAssetTransactionService = require("../assetTransaction/moneyTransfer");
-const CodeService = require("../code");
 /**
  * 取引開始
  * 通貨転送資産取引サービスを利用して転送取引を開始する
  */
 function start(params) {
-    return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // credentials: {
+    //     jwt: JWTCredentials;
+    // }
+    ) => __awaiter(this, void 0, void 0, function* () {
         const { passport } = yield repos.passport.validatePassportTokenIfExist(params);
         const sellers = yield repos.seller.projectFields({
             limit: 1,
@@ -55,7 +58,7 @@ function start(params) {
             transaction = yield repos.transaction.start(startParams);
             yield authorizePaymentCard({
                 transaction: Object.assign(Object.assign({}, transaction), { object: startParams.object, seller: startParams.seller, agent: startParams.agent, project: startParams.project, typeOf: startParams.typeOf })
-            })(repos, credentials);
+            })(repos);
         }
         catch (error) {
             throw error;
@@ -65,7 +68,11 @@ function start(params) {
 }
 exports.start = start;
 function authorizePaymentCard(params) {
-    return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // credentials: {
+    //     jwt: JWTCredentials;
+    // }
+    ) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const transaction = params.transaction;
         const fromLocation = transaction.object.fromLocation;
@@ -96,7 +103,7 @@ function authorizePaymentCard(params) {
                             : String((_a = transaction.seller.name) === null || _a === void 0 ? void 0 : _a.ja)
                     }, price: 0, priceCurrency: factory.priceCurrency.JPY }, (typeof transaction.object.description === 'string') ? { description: transaction.object.description } : undefined),
                 purpose: { typeOf: transaction.typeOf, id: transaction.id }
-            })(repos, credentials);
+            })(repos);
         }
         else {
             throw new factory.errors.NotImplemented('Withdraw transaction not implemented');
@@ -161,7 +168,11 @@ function fixToLocation(params) {
  * 口座取引は、出金取引あるいは転送取引のどちらかを選択できます
  */
 function processAuthorizePaymentCard(params) {
-    return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // credentials: {
+    //     jwt: JWTCredentials;
+    // }
+    ) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const transaction = yield repos.transaction.projectFieldsInProgressById({
             typeOf: factory.transactionType.MoneyTransfer,
@@ -196,7 +207,7 @@ function processAuthorizePaymentCard(params) {
                 recipient: recipient,
                 transaction: transaction,
                 transactionNumber
-            })(repos, credentials);
+            })(repos);
             // アクションにchevre取引情報を保管
             yield repos.action.findByIdAndUpdate({
                 id: action.id,
@@ -277,7 +288,11 @@ function createAuthorizeMoneyTransferOfferActionAttributes(params) {
 }
 function processMoneyTransferTransaction(params) {
     // tslint:disable-next-line:max-func-body-length
-    return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // credentials: {
+    //     jwt: JWTCredentials;
+    // }
+    ) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         let pendingTransaction;
         const transaction = params.transaction;
@@ -305,7 +320,7 @@ function processMoneyTransferTransaction(params) {
             throw new factory.errors.NotImplemented('Withdraw transaction not implemented');
         }
         else if (params.object.fromLocation !== undefined && params.object.itemOffered.toLocation !== undefined) {
-            const { fromLocation } = yield validateFromLocation({ id: params.project.id }, params.object.fromLocation, { id: issuedThroughId })(repos, credentials);
+            const { fromLocation } = yield validateFromLocation({ id: params.project.id }, params.object.fromLocation, { id: issuedThroughId })(repos);
             const { toLocation } = yield validateToLocation({ id: params.project.id }, {
                 typeOf: factory.permit.PermitType.Permit,
                 identifier: params.object.itemOffered.toLocation.identifier,
@@ -371,34 +386,40 @@ function processMoneyTransferTransaction(params) {
 }
 // tslint:disable-next-line:max-func-body-length
 function validateFromLocation(project, fromLocationBeforeStart, issuedThrough) {
-    return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+    return (repos
+    // credentials: {
+    //     jwt: JWTCredentials;
+    // }
+    ) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
         let fromLocation = fromLocationBeforeStart;
-        // トークン化されたペイメントカード情報でリクエストされた場合、実ペイメントカード情報へ変換する
+        // discontinue token as fromLocation(ticketTokenへ移行するべき)(2024-12-18~)
         if (typeof fromLocation === 'string') {
-            const { authorizedObject } = yield CodeService.verifyToken({
-                project: { id: project.id },
-                agent: { id: 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');
-            }
-            if (((_a = paymentCardOwnershipInfo.typeOfGood.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf) !== factory.product.ProductType.PaymentCard) {
-                throw new factory.errors.Argument('fromLocation', 'must be issued through PaymentCard');
-            }
-            fromLocation = {
-                typeOf: paymentCardOwnershipInfo.typeOfGood.typeOf,
-                identifier: paymentCardOwnershipInfo.typeOfGood.identifier,
-                issuedThrough: { id: paymentCardOwnershipInfo.typeOfGood.issuedThrough.id }
-            };
+            throw new factory.errors.NotImplemented('fromLocation as string not implemented');
+            // トークン化されたペイメントカード情報でリクエストされた場合、実ペイメントカード情報へ変換する
+            // const { authorizedObject } = await CodeService.verifyToken({
+            //     project: { id: project.id },
+            //     agent: { id: 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');
+            // }
+            // if (paymentCardOwnershipInfo.typeOfGood.issuedThrough?.typeOf !== factory.product.ProductType.PaymentCard) {
+            //     throw new factory.errors.Argument('fromLocation', 'must be issued through PaymentCard');
+            // }
+            // fromLocation = {
+            //     typeOf: paymentCardOwnershipInfo.typeOfGood.typeOf,
+            //     identifier: paymentCardOwnershipInfo.typeOfGood.identifier,
+            //     issuedThrough: { id: paymentCardOwnershipInfo.typeOfGood.issuedThrough.id }
+            // };
         }
         else {
             // fromLocationが注文の場合に対応
@@ -423,7 +444,7 @@ function validateFromLocation(project, fromLocationBeforeStart, issuedThrough) {
                     throw new factory.errors.Argument('fromLocation', `Invalid order status '${order.orderStatus}''`);
                 }
                 let awardAccounts = [];
-                const awardAccounsValue = (_c = (_b = order.identifier) === null || _b === void 0 ? void 0 : _b.find((i) => i.name === order_1.AWARD_ACCOUNTS_IDENTIFIER_NAME)) === null || _c === void 0 ? void 0 : _c.value;
+                const awardAccounsValue = (_b = (_a = order.identifier) === null || _a === void 0 ? void 0 : _a.find((i) => i.name === order_1.AWARD_ACCOUNTS_IDENTIFIER_NAME)) === null || _b === void 0 ? void 0 : _b.value;
                 if (typeof awardAccounsValue === 'string' && awardAccounsValue.length > 0) {
                     awardAccounts = JSON.parse(awardAccounsValue);
                 }

package/package.json

@@ -11,9 +11,9 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.390.0",
-    "@cinerino/sdk": "10.19.0-alpha.0",
-    "@motionpicture/coa-service": "9.6.0-alpha.0",
+    "@chevre/factory": "4.391.0",
+    "@cinerino/sdk": "10.19.0-alpha.2",
+    "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
     "@surfrock/sdk": "1.4.0-alpha.1",
@@ -32,6 +32,7 @@
   },
   "description": "Chevre Domain Library for Node.js",
   "devDependencies": {
+    "@eslint/js": "9.16.0",
     "@types/debug": "0.0.30",
     "@types/google-libphonenumber": "^7.4.19",
     "@types/http-status": "^0.2.30",
@@ -49,6 +50,7 @@
     "@types/uuid": "^3.4.10",
     "coveralls": "^3.1.0",
     "csvtojson": "^2.0.10",
+    "eslint": "9.16.0",
     "googleapis": "^85.0.0",
     "json2csv": "4.5.4",
     "mocha": "10.6.0",
@@ -62,7 +64,8 @@
     "ts-node": "^10.9.1",
     "tslint": "^6.1.3",
     "tslint-microsoft-contrib": "^6.2.0",
-    "typescript": "5.0.3"
+    "typescript": "5.0.3",
+    "typescript-eslint": "8.18.0"
   },
   "peerDependencies": {
     "mongoose": "^7.4.0",
@@ -103,10 +106,11 @@
     "coverage": "npm run nyc && nyc report --reporter=text-lcov | coveralls",
     "test": "npm run check && npm run coverage",
     "tslint": "tslint --project tsconfig.json -c tslint.json --exclude \"**/*.spec.ts\" \"src/**/*.ts\"",
+    "eslint": "eslint src/**/*.ts",
     "preversion": "npm run clean && npm run build && npm test && npm run doc",
     "version": "git add -A",
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.7.0-alpha.8"
+  "version": "22.7.0"
 }

package/example/src/chevre/findValidAuthorization.ts

@@ -1,56 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-const project = { id: String(process.env.PROJECT_ID) };
-const CODE = '85de7dc1-3761-4317-80d6-b36bf0b2788f';
-// const ID = '6631d754c20be0772c217b90';
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const authorizationRepo = await chevre.repository.Authorization.createInstance(mongoose.connection);
-    const ticketRepo = await chevre.repository.Ticket.createInstance(mongoose.connection);
-
-    const result = await authorizationRepo.findValidOneByCode({
-        project,
-        code: CODE
-    });
-    console.log('result:', result);
-
-    // const result = await authorizationRepo.findValidOneById({
-    //     project,
-    //     id: ID
-    // });
-    // console.log('result:', result);
-
-    const token = await (await chevre.service.code.createService()).getToken({
-        agent: { id: 'xxx', typeOf: chevre.factory.personType.Person },
-        project,
-        code: CODE,
-        expiresIn: 18000,
-        issuer: 'https://example.com',
-        audience: 'https://example.com'
-    })(
-        {
-            authorization: authorizationRepo,
-            ticket: ticketRepo
-        },
-        {
-            jwt: await chevre.credentials.JWT.createInstance({
-                secret: <string>process.env.TOKEN_SECRET,
-                issuers: (typeof process.env.TOKEN_ISSUERS_BY_AUTHORIZATION === 'string')
-                    ? process.env.TOKEN_ISSUERS_BY_AUTHORIZATION.split(' ')
-                    : [],
-                version: (typeof process.env.TOKEN_VERSION === 'string') ? process.env.TOKEN_VERSION : '2024-05-02',
-                payloadTypPrefix: (typeof process.env.TOKEN_PAYLOAD_TYP_PREFIX === 'string') ? process.env.TOKEN_PAYLOAD_TYP_PREFIX : 'chevre'
-            })
-        }
-    );
-    console.log('token:', token);
-}
-
-main()
-    .then(console.log)
-    .catch(console.error);

package/example/src/chevre/saveAggregateReservation.ts

@@ -1,43 +0,0 @@
-// tslint:disable:no-console
-import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-import { chevre } from '../../../lib/index';
-
-const PROJECT_ID = String(process.env.PROJECT_ID);
-
-async function main() {
-    // const now = new Date();
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const aggregateReservationRepo = await chevre.repository.AggregateReservation.createInstance(mongoose.connection);
-
-    const result = await aggregateReservationRepo.save(
-        {
-            project: { id: PROJECT_ID, typeOf: chevre.factory.organizationType.Project },
-            reservationFor: {
-                id: 'blxonxv24',
-                typeOf: chevre.factory.eventType.ScreeningEvent,
-                startDate: moment('2024-08-07T10:10:00.000+00:00')
-                    .toDate()
-            }
-        },
-        {
-            $set: {
-                // aggregateOffer: {
-                //     typeOf: chevre.factory.offerType.AggregateOffer,
-                //     aggregateDate: now
-                // },
-                // aggregateEntranceGate: {
-                //     typeOf: chevre.factory.placeType.AggregatePlace,
-                //     aggregateDate: now,
-                //     places: []
-                // }
-            }
-        }
-    );
-    console.log(result);
-}
-
-main()
-    .then(console.log)
-    .catch(console.error);

package/lib/chevre/credentials/jwt.d.ts

@@ -1,23 +0,0 @@
-interface IOptions {
-    secret: string;
-    /**
-     * トークン検証時の発行者リスト
-     */
-    issuers: string[];
-    version: string;
-    payloadTypPrefix: string;
-}
-/**
- * トークン認証情報
- */
-declare class JWTCredentials {
-    readonly secret: string;
-    /**
-     * トークン検証時の発行者リスト
-     */
-    readonly issuers: string[];
-    readonly version: string;
-    readonly payloadTypPrefix: string;
-    constructor(options: IOptions);
-}
-export { JWTCredentials };