@chevre/domain 20.1.0-alpha.0 → 20.1.0-alpha.1

package/lib/chevre/repo/assetTransaction.js

@@ -243,7 +243,7 @@ class MongoRepository {
      */
     start(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.transactionModel.create(Object.assign(Object.assign({ typeOf: params.typeOf }, params), { status: factory.transactionStatusType.InProgress, startDate: new Date(), endDate: undefined, tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported }))
+            return this.transactionModel.create(Object.assign(Object.assign({}, params), { typeOf: params.typeOf, status: factory.transactionStatusType.InProgress, startDate: new Date(), endDate: undefined, tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported }))
                 .then((doc) => doc.toObject());
         });
     }

package/lib/chevre/repo/mongoose/model/action.js

@@ -24,7 +24,9 @@ const schema = new mongoose.Schema({
     amount: mongoose.SchemaTypes.Mixed,
     fromLocation: mongoose.SchemaTypes.Mixed,
     toLocation: mongoose.SchemaTypes.Mixed,
-    instrument: mongoose.SchemaTypes.Mixed
+    instrument: mongoose.SchemaTypes.Mixed,
+    // add location(2022-11-11~)
+    location: mongoose.SchemaTypes.Mixed
 }, {
     collection: 'actions',
     id: true,

package/lib/chevre/repo/mongoose/model/assetTransaction.js

@@ -24,7 +24,9 @@ const schema = new mongoose.Schema({
     endDate: Date,
     tasksExportedAt: Date,
     tasksExportationStatus: String,
-    potentialActions: mongoose.SchemaTypes.Mixed
+    potentialActions: mongoose.SchemaTypes.Mixed,
+    // add location(2022-11-11~)
+    location: mongoose.SchemaTypes.Mixed
 }, {
     collection: 'assetTransactions',
     id: true,

package/lib/chevre/service/assetTransaction/pay/factory.d.ts

@@ -7,4 +7,5 @@ export declare function createStartParams(params: factory.assetTransaction.pay.I
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
     amount: number;
     paymentService?: factory.service.paymentService.IService;
+    location?: factory.action.trade.pay.ILocation;
 }): factory.assetTransaction.IStartParams<factory.assetTransactionType.Pay>;

package/lib/chevre/service/assetTransaction/pay/factory.js

@@ -6,7 +6,7 @@ exports.createStartParams = void 0;
  */
 const factory = require("../../../factory");
 function createStartParams(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
     const paymentServiceId = (params.paymentService !== undefined)
         ? String(params.paymentService.id)
         : '';
@@ -48,13 +48,7 @@ function createStartParams(params) {
     }
     const informPaymentParams = createInformPaymentParams({ paymentService: params.paymentService });
     const accountId = (_e = params.object.paymentMethod) === null || _e === void 0 ? void 0 : _e.accountId;
-    return {
-        project: { typeOf: factory.organizationType.Project, id: params.project.id },
-        transactionNumber: params.transactionNumber,
-        typeOf: factory.assetTransactionType.Pay,
-        agent: params.agent,
-        recipient: params.recipient,
-        object: {
+    return Object.assign({ project: { typeOf: factory.organizationType.Project, id: params.project.id }, transactionNumber: params.transactionNumber, typeOf: factory.assetTransactionType.Pay, agent: params.agent, recipient: params.recipient, object: {
             // パラメータから必要なもののみ取り込む
             accountId: (typeof accountId === 'string') ? accountId : '',
             paymentMethodId: params.transactionNumber,
@@ -76,9 +70,9 @@ function createStartParams(params) {
                 : undefined), (Array.isArray((_q = params.object.paymentMethod) === null || _q === void 0 ? void 0 : _q.movieTickets))
                 ? { movieTickets: (_r = params.object.paymentMethod) === null || _r === void 0 ? void 0 : _r.movieTickets }
                 : undefined)
-        },
-        expires: params.expires
-    };
+        }, expires: params.expires }, (typeof ((_s = params.location) === null || _s === void 0 ? void 0 : _s.typeOf) === 'string')
+        ? { location: params.location }
+        : undefined);
 }
 exports.createStartParams = createStartParams;
 function createInformPaymentParams(params) {

package/lib/chevre/service/payment/any/factory.d.ts

@@ -16,6 +16,7 @@ export declare function creatPayTransactionStartParams(params: {
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
     transaction: factory.transaction.ITransaction<factory.transactionType>;
     transactionNumber: string;
+    location?: factory.action.trade.pay.ILocation;
 }): factory.assetTransaction.pay.IStartParamsWithoutDetail;
 export declare function createAuthorizeResult(params: {
     object: factory.action.authorize.paymentMethod.any.IObject;

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

@@ -4,7 +4,7 @@ exports.optimizeAction4inform = exports.createAuthorizeResult = exports.creatPay
 const moment = require("moment");
 const factory = require("../../../factory");
 function creatPayTransactionStartParams(params) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const expires = moment(params.transaction.expires)
         .add(1, 'month')
         .toDate(); // 余裕を持って
@@ -13,18 +13,13 @@ function creatPayTransactionStartParams(params) {
     const accountId = (typeof params.accountId === 'string')
         ? params.accountId
         : (typeof params.object.accountId === 'string') ? params.object.accountId : undefined;
-    return Object.assign({ project: { id: params.transaction.project.id, typeOf: factory.organizationType.Project }, typeOf: factory.assetTransactionType.Pay, transactionNumber: params.transactionNumber, agent: {
+    return Object.assign(Object.assign({ project: { id: params.transaction.project.id, typeOf: factory.organizationType.Project }, typeOf: factory.assetTransactionType.Pay, transactionNumber: params.transactionNumber, agent: {
             // Sellerに変更(2022-05-30~)
             typeOf: params.transaction.seller.typeOf,
             id: String(params.transaction.seller.id),
             name: (typeof params.transaction.seller.name === 'string')
                 ? params.transaction.seller.name
                 : String((_b = params.transaction.seller.name) === null || _b === void 0 ? void 0 : _b.ja),
-            // typeOf: params.transaction.agent.typeOf,
-            // id: params.transaction.agent.id,
-            // name: (typeof params.transaction.agent.name === 'string' && params.transaction.agent.name.length > 0)
-            //     ? params.transaction.agent.name
-            //     : params.transaction.agent.id
             identifier: [
                 { name: 'transaction', value: params.transaction.id },
                 {
@@ -51,6 +46,8 @@ function creatPayTransactionStartParams(params) {
                 confirmationNumber: confirmationNumber
             }
         }
+        : undefined), (typeof ((_d = params.location) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string')
+        ? { location: params.location }
         : undefined);
 }
 exports.creatPayTransactionStartParams = creatPayTransactionStartParams;

package/lib/chevre/service/payment/any.d.ts

@@ -87,6 +87,7 @@ declare function publishPaymentUrl(params: {
     object: factory.action.authorize.paymentMethod.any.IObject;
     purpose: factory.action.authorize.paymentMethod.any.IPurpose;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
+    location: factory.action.trade.pay.ILocation;
 }): IPublishPaymentUrlOperation<PayTransactionService.IPublishPaymentUrlResult>;
 /**
  * 決済承認
@@ -101,5 +102,6 @@ declare function authorize(params: {
     object: factory.action.authorize.paymentMethod.any.IObject;
     purpose: factory.action.authorize.paymentMethod.any.IPurpose;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
+    location?: factory.action.trade.pay.ILocation;
 }): IAuthorizeOperation<IAuthorizePaymentAction>;
 export { onPaymentStatusChanged, authorize, invalidatePaymentUrl, voidPayTransaction, person2username, processVoidPayTransaction, publishPaymentUrl };

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

@@ -175,7 +175,8 @@ function publishPaymentUrl(params) {
             object: params.object,
             paymentServiceType,
             transaction: transaction,
-            transactionNumber: transactionNumber
+            transactionNumber: transactionNumber,
+            location: params.location
         });
         // result = await repos.payTransaction.publishPaymentUrl({ ...startParams, iss: params.iss });
         result = yield PayTransactionService.publishPaymentUrl(startParams)(repos);
@@ -253,7 +254,8 @@ function authorize(params) {
                 object: params.object,
                 paymentServiceType,
                 transaction: transaction,
-                transactionNumber: transactionNumber
+                transactionNumber: transactionNumber,
+                location: params.location
             });
             // payTransaction = await repos.payTransaction.start({ ...startParams, iss: params.iss });
             payTransaction = yield PayTransactionService.start(startParams)(repos);

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.276.0-alpha.0",
+    "@chevre/factory": "4.276.0-alpha.1",
     "@cinerino/sdk": "3.132.0-alpha.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.1.0-alpha.0"
+  "version": "20.1.0-alpha.1"
 }