@chevre/domain 21.20.0-alpha.38 → 21.20.0-alpha.39

package/example/src/chevre/findTransactionById.ts

@@ -0,0 +1,21 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const transactionRepo = await chevre.repository.Transaction.createInstance(mongoose.connection);
+
+    const transaction = await transactionRepo.findById({
+        typeOf: chevre.factory.transactionType.PlaceOrder,
+        id: '65ab04d5206595479469f50c',
+        inclusion: ['endDate', 'id', 'object', 'project', 'seller', 'startDate', 'status', 'typeOf']
+    });
+    console.log('transaction:', transaction);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/lib/chevre/repo/orderInTransaction.d.ts

@@ -32,5 +32,8 @@ export declare class MongoRepository {
             };
         };
     }): Promise<import("mongodb").UpdateResult>;
+    deleteByOrderNumber(params: {
+        orderNumber: string;
+    }): Promise<import("mongodb").DeleteResult>;
 }
 export {};

package/lib/chevre/repo/orderInTransaction.js

@@ -107,5 +107,14 @@ class MongoRepository {
                 .exec();
         });
     }
+    deleteByOrderNumber(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.orderModel.deleteOne({
+                typeOf: { $eq: factory.transactionType.PlaceOrder },
+                orderNumber: { $eq: params.orderNumber }
+            })
+                .exec();
+        });
+    }
 }
 exports.MongoRepository = MongoRepository;

package/lib/chevre/service/notification.js

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.triggerWebhook = exports.report2developers = exports.sendEmailMessage = void 0;
 const sgMail = require("@sendgrid/mail");
 const http_status_1 = require("http-status");
-const request = require("request");
+// import * as request from 'request';
 const util = require("util");
 const credentials_1 = require("../credentials");
 const settings_1 = require("../settings");
@@ -179,31 +179,37 @@ ${content}`;
             }
         }
         else {
+            throw new factory.errors.NotImplemented('only useFetchAPI implemented');
             // LINE通知APIにPOST
-            const formData = Object.assign(Object.assign({ message: message }, (typeof imageThumbnail === 'string') ? { imageThumbnail } : undefined), (typeof imageFullsize === 'string') ? { imageFullsize } : undefined);
-            return new Promise((resolve, reject) => {
-                var _a;
-                request.post({
-                    url: LINE_NOTIFY_URL,
-                    auth: { bearer: repos.accessToken },
-                    form: formData,
-                    json: true,
-                    timeout: (_a = settings_1.settings.webhook) === null || _a === void 0 ? void 0 : _a.timeout
-                }, (error, response, body) => {
-                    if (error !== null) {
-                        reject(error);
-                    }
-                    else {
-                        switch (response.statusCode) {
-                            case http_status_1.OK:
-                                resolve();
-                                break;
-                            default:
-                                reject(new Error(body.message));
-                        }
-                    }
-                });
-            });
+            // const formData: any = {
+            //     message: message,
+            //     ...(typeof imageThumbnail === 'string') ? { imageThumbnail } : undefined,
+            //     ...(typeof imageFullsize === 'string') ? { imageFullsize } : undefined
+            // };
+            // return new Promise<void>((resolve, reject) => {
+            //     request.post(
+            //         {
+            //             url: LINE_NOTIFY_URL,
+            //             auth: { bearer: repos.accessToken },
+            //             form: formData,
+            //             json: true,
+            //             timeout: settings.webhook?.timeout
+            //         },
+            //         (error, response, body) => {
+            //             if (error !== null) {
+            //                 reject(error);
+            //             } else {
+            //                 switch (response.statusCode) {
+            //                     case OK:
+            //                         resolve();
+            //                         break;
+            //                     default:
+            //                         reject(new Error(body.message));
+            //                 }
+            //             }
+            //         }
+            //     );
+            // });
         }
     });
 }
@@ -292,57 +298,59 @@ function processInformAction(params) {
                     catch (err) {
                         if (err.name === 'TimeoutError') {
                             // tslint:disable-next-line:no-console
-                            console.error('report2developers: Timeout: It took more than 5 seconds to get the result!', err);
+                            console.error('processInformAction: Timeout: It took more than 5 seconds to get the result!', err);
                         }
                         else if (err.name === 'AbortError') {
                             // tslint:disable-next-line:no-console
-                            console.error('report2developers: Fetch aborted by user action (browser stop button, closing tab, etc.', err);
+                            console.error('processInformAction: Fetch aborted by user action (browser stop button, closing tab, etc.', err);
                         }
                         else if (err.name === 'TypeError') {
                             // tslint:disable-next-line:no-console
-                            console.error('report2developers: AbortSignal.timeout() method is not supported', err);
+                            console.error('processInformAction: AbortSignal.timeout() method is not supported', err);
                         }
                         else {
                             // A network error, or some other problem.
                             // tslint:disable-next-line:no-console
-                            console.error(`report2developers: Error: type: ${err.name}, message: ${err.message}`, err);
+                            console.error(`processInformAction: Error: type: ${err.name}, message: ${err.message}`, err);
                         }
                         throw err;
                     }
                 }
                 else {
-                    yield new Promise((resolve, reject) => {
-                        var _a;
-                        request.post({
-                            url: url,
-                            body: {
-                                data: params.object
-                            },
-                            json: true,
-                            timeout: (_a = settings_1.settings.webhook) === null || _a === void 0 ? void 0 : _a.timeout
-                        }, (error, response, body) => {
-                            if (error instanceof Error) {
-                                reject(error);
-                            }
-                            else {
-                                switch (response.statusCode) {
-                                    case http_status_1.OK:
-                                    case http_status_1.CREATED:
-                                    case http_status_1.ACCEPTED:
-                                    case http_status_1.NO_CONTENT:
-                                        result = {
-                                            statusCode: response.statusCode,
-                                            useFetchAPI: repos.useFetchAPI
-                                            // body: body
-                                        };
-                                        resolve();
-                                        break;
-                                    default:
-                                        reject(new Error(`statusCode: ${response.statusCode} body: ${body}`));
-                                }
-                            }
-                        });
-                    });
+                    throw new factory.errors.NotImplemented('only useFetchAPI implemented');
+                    // await new Promise<void>((resolve, reject) => {
+                    //     request.post(
+                    //         {
+                    //             url: url,
+                    //             body: {
+                    //                 data: params.object
+                    //             },
+                    //             json: true,
+                    //             timeout: settings.webhook?.timeout
+                    //         },
+                    //         (error, response, body) => {
+                    //             if (error instanceof Error) {
+                    //                 reject(error);
+                    //             } else {
+                    //                 switch (response.statusCode) {
+                    //                     case OK:
+                    //                     case CREATED:
+                    //                     case ACCEPTED:
+                    //                     case NO_CONTENT:
+                    //                         result = {
+                    //                             statusCode: response.statusCode,
+                    //                             useFetchAPI: repos.useFetchAPI
+                    //                             // body: body
+                    //                         };
+                    //                         resolve();
+                    //                         break;
+                    //                     default:
+                    //                         reject(new Error(`statusCode: ${response.statusCode} body: ${body}`));
+                    //                 }
+                    //             }
+                    //         }
+                    //     );
+                    // });
                 }
             }
         }

package/lib/chevre/service/offer/event/voidTransaction.js

@@ -61,10 +61,18 @@ function voidTransaction(params) {
         // USE_CREATE_ORDER_ON_OFFER_ACCEPTEDの場合、orderNumber発行済のはず
         const orderNumberByTransaction = transaction.object.orderNumber;
         if (typeof orderNumberByTransaction === 'string') {
-            yield (0, any_1.voidAcceptedOffer)({
-                authorizeActions,
-                orderNumber: orderNumberByTransaction
-            })(repos);
+            switch (transaction.status) {
+                case factory.transactionStatusType.Confirmed:
+                    // 確定取引の場合、不要なオファーのみ除外
+                    yield (0, any_1.voidAcceptedOffer)({
+                        authorizeActions,
+                        orderNumber: orderNumberByTransaction
+                    })(repos);
+                    break;
+                default:
+                    // orderInTransaction自体を削除
+                    yield repos.orderInTransaction.deleteByOrderNumber({ orderNumber: orderNumberByTransaction });
+            }
         }
         yield Promise.all(authorizeActions.map((action) => __awaiter(this, void 0, void 0, function* () {
             yield repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id });

package/lib/chevre/service/transaction/placeOrder/exportTasks/factory.d.ts

@@ -1,9 +1,9 @@
 import * as factory from '../../../../factory';
-export type IPlaceOrderTransactionAsInformObject = Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'id' | 'typeOf' | 'agent' | 'endDate' | 'expires' | 'project' | 'seller' | 'result' | 'startDate' | 'status'>;
+export type IPlaceOrderTransactionAsInformObject = Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'id' | 'typeOf' | 'endDate' | 'project' | 'seller' | 'startDate' | 'status'>;
 /**
  * 取引のタスクを作成する
  */
 export declare function createTasks(params: {
-    transaction: factory.transaction.ITransaction<factory.transactionType.PlaceOrder>;
+    transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'endDate' | 'id' | 'object' | 'project' | 'seller' | 'startDate' | 'status' | 'typeOf'>;
     runsAt: Date;
 }): factory.task.IAttributes<factory.taskName>[];

package/lib/chevre/service/transaction/placeOrder/exportTasks/factory.js

@@ -9,7 +9,6 @@ const settings_1 = require("../../../../settings");
  */
 // tslint:disable-next-line:max-func-body-length
 function createTasks(params) {
-    var _a;
     const taskAttributes = [];
     const transaction = params.transaction;
     const taskRunsAt = params.runsAt;
@@ -18,12 +17,9 @@ function createTasks(params) {
         const informObject = {
             id: transaction.id,
             typeOf: transaction.typeOf,
-            agent: transaction.agent,
             endDate: transaction.endDate,
-            expires: transaction.expires,
             project: transaction.project,
             seller: transaction.seller,
-            result: transaction.result,
             startDate: transaction.startDate,
             status: transaction.status
         };
@@ -121,25 +117,26 @@ function createTasks(params) {
     taskAttributes.push(...triggerWebhookTaskAttributes, deleteTransactionTask, voidPaymentTaskAttributes, voidReserveTaskAttributes);
     switch (transaction.status) {
         case factory.transactionStatusType.Confirmed:
-            const potentialActions = transaction.potentialActions;
-            if (potentialActions === undefined) {
-                throw new factory.errors.NotFound('Transaction PotentialActions');
+            // const potentialActions = transaction.potentialActions;
+            // if (potentialActions === undefined) {
+            //     throw new factory.errors.NotFound('Transaction PotentialActions');
+            // }
+            // const orderFromTransaction = transaction.result?.order;
+            // if (orderFromTransaction === undefined) {
+            //     throw new factory.errors.NotFound('Transaction Result');
+            // }
+            const confirmationNumber = transaction.object.confirmationNumber;
+            if (typeof confirmationNumber !== 'string' || confirmationNumber.length === 0) {
+                throw new factory.errors.NotFound('transaction.object.confirmationNumber');
             }
-            const orderFromTransaction = (_a = transaction.result) === null || _a === void 0 ? void 0 : _a.order;
-            if (orderFromTransaction === undefined) {
-                throw new factory.errors.NotFound('Transaction Result');
+            const orderNumber = transaction.object.orderNumber;
+            if (typeof orderNumber !== 'string' || orderNumber.length === 0) {
+                throw new factory.errors.NotFound('transaction.object.orderNumber');
             }
-            const orderActionAttributes = potentialActions.order;
+            // const orderActionAttributes = potentialActions.order;
             const placeOrderTaskData = {
-                project: orderActionAttributes.project,
-                object: {
-                    confirmationNumber: orderFromTransaction.confirmationNumber,
-                    orderNumber: orderActionAttributes.object.orderNumber
-                }
-                // 廃止(2023-08-21~)
-                // ...(orderActionAttributes.potentialActions !== undefined)
-                //     ? { potentialActions: orderActionAttributes.potentialActions }
-                //     : undefined
+                project: transaction.project,
+                object: { confirmationNumber, orderNumber }
             };
             const placeOrderTaskAttributes = {
                 project: transaction.project,

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

@@ -23,7 +23,8 @@ function exportTasksById(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const transaction = yield repos.transaction.findById({
             typeOf: factory.transactionType.PlaceOrder,
-            id: params.id
+            id: params.id,
+            inclusion: ['endDate', 'id', 'object', 'project', 'seller', 'startDate', 'status', 'typeOf']
         });
         // タスク実行日時バッファの指定があれば調整
         let taskRunsAt = new Date();

package/lib/chevre/service/transaction/returnOrder/preStart.js

@@ -24,7 +24,7 @@ exports.preStart = void 0;
 const createDebug = require("debug");
 const http_status_1 = require("http-status");
 const moment = require("moment-timezone");
-const request = require("request");
+// import * as request from 'request';
 const factory = require("../../../factory");
 const debug = createDebug('chevre-domain:service');
 /**
@@ -287,53 +287,80 @@ function createOrder4returnPolicy(params) {
     };
 }
 const TIMEOUT = 5000;
+// tslint:disable-next-line:max-func-body-length
 function getReturnPolicyByProject(params) {
+    var _a;
     return __awaiter(this, void 0, void 0, function* () {
-        return new Promise((resolve, reject) => {
-            request.post({
-                url: params.sameAs,
-                body: {
-                    order: createOrder4returnPolicy({ order: params.order })
+        // implement with fetch(2024-01-20~)
+        try {
+            const res = yield fetch(params.sameAs, {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json'
                 },
-                json: true,
-                timeout: TIMEOUT
-            }, (error, response, body) => {
-                var _a;
-                if (error instanceof Error) {
-                    reject(error);
-                }
-                else {
-                    switch (response.statusCode) {
-                        case http_status_1.OK:
-                        case http_status_1.CREATED:
-                        case http_status_1.ACCEPTED:
-                        case http_status_1.NO_CONTENT:
-                            if (typeof ((_a = body.restockingFee) === null || _a === void 0 ? void 0 : _a.value) !== 'number') {
-                                reject(new Error('invalid return policy'));
-                            }
-                            else {
-                                resolve({
-                                    typeOf: 'MerchantReturnPolicy',
-                                    restockingFee: {
-                                        currency: factory.priceCurrency.JPY,
-                                        typeOf: 'MonetaryAmount',
-                                        value: body.restockingFee.value
-                                    }
-                                });
+                body: JSON.stringify({
+                    order: createOrder4returnPolicy({ order: params.order })
+                }),
+                // body data type must match "Content-Type" header
+                signal: AbortSignal.timeout(TIMEOUT)
+            });
+            let body;
+            try {
+                body = yield res.json();
+            }
+            catch (error) {
+                // no op
+            }
+            let returnPolicy;
+            switch (res.status) {
+                case http_status_1.OK:
+                case http_status_1.CREATED:
+                case http_status_1.ACCEPTED:
+                case http_status_1.NO_CONTENT:
+                    if (typeof ((_a = body === null || body === void 0 ? void 0 : body.restockingFee) === null || _a === void 0 ? void 0 : _a.value) !== 'number') {
+                        throw new Error('invalid return policy');
+                    }
+                    else {
+                        returnPolicy = {
+                            typeOf: 'MerchantReturnPolicy',
+                            restockingFee: {
+                                currency: factory.priceCurrency.JPY,
+                                typeOf: 'MonetaryAmount',
+                                value: body.restockingFee.value
                             }
-                            break;
-                        case http_status_1.NOT_FOUND:
-                            reject(new factory.errors.Argument('Seller', 'has no applicable return policies'));
-                            break;
-                        default:
-                            reject({
-                                statusCode: response.statusCode,
-                                body: body
-                            });
+                        };
                     }
-                }
-            });
-        });
+                    break;
+                case http_status_1.NOT_FOUND:
+                    throw new factory.errors.Argument('Seller', 'has no applicable return policies');
+                // break;
+                default:
+                    // tslint:disable-next-line:no-console
+                    console.error('custom return policy temporarily unavailable.', res.status, body);
+                    throw new factory.errors.ServiceUnavailable(`custom return policy temporarily unavailable. statusCode: ${res.status} body: ${body}`);
+            }
+            return returnPolicy;
+        }
+        catch (err) {
+            if (err.name === 'TimeoutError') {
+                // tslint:disable-next-line:no-console
+                console.error('getReturnPolicyByProject: Timeout: It took more than 5 seconds to get the result!', err);
+            }
+            else if (err.name === 'AbortError') {
+                // tslint:disable-next-line:no-console
+                console.error('getReturnPolicyByProject: Fetch aborted by user action (browser stop button, closing tab, etc.', err);
+            }
+            else if (err.name === 'TypeError') {
+                // tslint:disable-next-line:no-console
+                console.error('getReturnPolicyByProject: AbortSignal.timeout() method is not supported', err);
+            }
+            else {
+                // A network error, or some other problem.
+                // tslint:disable-next-line:no-console
+                console.error(`getReturnPolicyByProject: Error: type: ${err.name}, message: ${err.message}`, err);
+            }
+            throw err;
+        }
     });
 }
 /**

package/package.json

@@ -28,7 +28,6 @@
     "moment-timezone": "^0.5.33",
     "node-fpe": "1.0.0",
     "pug": "^2.0.4",
-    "request": "^2.88.2",
     "uniqid": "^5.4.0",
     "uuid": "^3.4.0"
   },
@@ -46,8 +45,6 @@
     "@types/node": "18.19.2",
     "@types/power-assert": "^1.5.3",
     "@types/pug": "^2.0.4",
-    "@types/request": "^2.48.5",
-    "@types/request-promise-native": "^1.0.18",
     "@types/sinon": "^4.3.3",
     "@types/sinon-mongoose": "^1.3.11",
     "@types/uniqid": "^4.1.3",
@@ -115,5 +112,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.20.0-alpha.38"
+  "version": "21.20.0-alpha.39"
 }