@chevre/domain 20.4.0-alpha.4 → 20.4.0-alpha.6

package/example/src/chevre/unsetUnnecessaryFields.ts

@@ -0,0 +1,26 @@
+// 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);
+
+    const accountRepo = new chevre.repository.Account(mongoose.connection);
+    const permitRepo = new chevre.repository.ServiceOutput(mongoose.connection);
+
+    let updateResult = await accountRepo.unsetUnnecessaryFields({
+        filter: { status: { $exists: true } },
+        $unset: { status: 1 }
+    });
+    console.log('accounts unset.', updateResult);
+    updateResult = await permitRepo.unsetUnnecessaryFields({
+        filter: { 'paymentAccount.accountType': { $exists: true } },
+        $unset: { 'paymentAccount.accountType': 1 }
+    });
+    console.log('permits unset', updateResult);
+}
+
+main()
+    .then()
+    .catch(console.error);

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

@@ -124,4 +124,8 @@ export declare class MongoRepository {
      * 口座を検索する
      */
     search(params: factory.account.ISearchConditions): Promise<factory.account.IAccount[]>;
+    unsetUnnecessaryFields(params: {
+        filter: any;
+        $unset: any;
+    }): Promise<import("mongoose").UpdateWriteOpResult>;
 }

package/lib/chevre/repo/account.js

@@ -425,5 +425,11 @@ class MongoRepository {
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });
     }
+    unsetUnnecessaryFields(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.accountModel.updateMany(params.filter, { $unset: params.$unset })
+                .exec();
+        });
+    }
 }
 exports.MongoRepository = MongoRepository;

package/lib/chevre/repo/event.js

@@ -473,11 +473,11 @@ class MongoRepository {
                     if (typeof additionalPropertyValue !== 'string') {
                         throw new factory.errors.NotFound('additionalProperty.value');
                     }
-                    const _c = creatingEventParams.attributes, { identifier, project, superEvent, workPerformed, typeOf, location, name, remainingAttendeeCapacity, maximumAttendeeCapacity } = _c, updateFields = __rest(_c, ["identifier", "project", "superEvent", "workPerformed", "typeOf", "location", "name", "remainingAttendeeCapacity", "maximumAttendeeCapacity"]);
+                    const _c = creatingEventParams.attributes, { eventStatus } = _c, setOnInsertFields = __rest(_c, ["eventStatus"]);
                     bulkWriteOps.push({
                         updateOne: {
                             filter: {
-                                typeOf,
+                                typeOf: creatingEventParams.attributes.typeOf,
                                 // 追加特性をキーに更新
                                 additionalProperty: {
                                     $exists: true,
@@ -485,18 +485,9 @@ class MongoRepository {
                                 }
                             },
                             update: {
-                                $setOnInsert: {
-                                    _id: uniqid(),
-                                    typeOf,
-                                    project,
-                                    superEvent,
-                                    workPerformed,
-                                    location,
-                                    name
-                                    // ...creatingEventParams.attributes
-                                },
+                                $setOnInsert: Object.assign(Object.assign({}, setOnInsertFields), { _id: uniqid() }),
                                 // 変更可能な属性のみ上書き
-                                $set: updateFields
+                                $set: { eventStatus }
                             },
                             upsert: true
                         }

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

@@ -29,4 +29,8 @@ export declare class MongoRepository {
             id: string;
         };
     }): Promise<void>;
+    unsetUnnecessaryFields(params: {
+        filter: any;
+        $unset: any;
+    }): Promise<import("mongoose").UpdateWriteOpResult>;
 }

package/lib/chevre/repo/serviceOutput.js

@@ -169,5 +169,11 @@ class MongoRepository {
                 .exec();
         });
     }
+    unsetUnnecessaryFields(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.serviceOutputModel.updateMany(params.filter, { $unset: params.$unset })
+                .exec();
+        });
+    }
 }
 exports.MongoRepository = MongoRepository;

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

@@ -220,20 +220,26 @@ function validateSeller(params) {
 }
 function processAuthorizeAccount(params, transaction, paymentServiceId) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const amount = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.amount;
+        if (typeof amount !== 'number') {
+            throw new factory.errors.ArgumentNull('object.paymentMethod?.amount');
+        }
         yield (0, validation_1.validateAccount)(params)(repos);
-        const { pendingTransaction, currency } = yield PaymentCardPayment.authorize(params, paymentServiceId)(repos);
+        const { pendingTransaction, currency, accountNumber } = yield PaymentCardPayment.authorize(params, paymentServiceId)(repos);
         const totalPaymentDue = {
             typeOf: 'MonetaryAmount',
             currency,
-            value: (typeof pendingTransaction.object.amount === 'number')
-                ? pendingTransaction.object.amount
-                : pendingTransaction.object.amount.value
+            value: amount
+            // value: (typeof pendingTransaction.object.amount === 'number')
+            //     ? pendingTransaction.object.amount
+            //     : pendingTransaction.object.amount.value
         };
         const savingPendingTransaction = {
             typeOf: pendingTransaction.typeOf,
             id: pendingTransaction.id,
             transactionNumber: pendingTransaction.transactionNumber,
-            object: { fromLocation: { accountNumber: pendingTransaction.object.fromLocation.accountNumber } }
+            object: { fromLocation: { accountNumber } }
         };
         return saveAuthorizeResult({
             id: transaction.id,

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

@@ -6,13 +6,14 @@ import { MongoRepository as ProductRepo } from '../../repo/product';
 import { MongoRepository as ProjectRepo } from '../../repo/project';
 import { MongoRepository as TaskRepo } from '../../repo/task';
 import { RedisRepository as TransactionNumberRepo } from '../../repo/transactionNumber';
-declare type IPendingTransaction = Pick<factory.account.transaction.withdraw.ITransaction, 'id' | 'object' | 'transactionNumber' | 'typeOf'>;
+declare type IPendingTransaction = Pick<factory.account.transaction.withdraw.ITransaction, 'id' | 'transactionNumber' | 'typeOf'>;
 declare function authorize(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string): (repos: {
     product: ProductRepo;
     project: ProjectRepo;
 }) => Promise<{
     pendingTransaction: IPendingTransaction;
     currency: string;
+    accountNumber: string;
 }>;
 declare function voidTransaction(params: factory.task.voidPayment.IData): (repos: {
     product: ProductRepo;

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

@@ -55,7 +55,7 @@ function authorize(params, paymentServiceId) {
             // PecorinoAPIのエラーをハンドリング
             throw (0, errorHandler_1.handlePecorinoError)(error);
         }
-        return { pendingTransaction, currency };
+        return { pendingTransaction, currency, accountNumber };
     });
 }
 exports.authorize = authorize;

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@chevre/factory": "4.289.0-alpha.6",
-    "@cinerino/sdk": "3.140.0-alpha.7",
+    "@cinerino/sdk": "3.140.0-alpha.8",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.4.0-alpha.4"
+  "version": "20.4.0-alpha.6"
 }