@chevre/domain 21.32.0-alpha.21 → 21.32.0-alpha.23

package/example/src/chevre/transaction/acceptCOAOffer.ts

@@ -49,10 +49,8 @@ async function main() {
         //     typeOf: chevre.factory.creativeWorkType.WebApplication
         // },
         purpose: { id: '664e80c79801179aabb0476f', typeOf: chevre.factory.transactionType.PlaceOrder },
-        sameAs: { id: 'xxx', typeOf: 'Task' },
+        sameAs: { id: 'xxx' },
         potentialActions: { typeOf: chevre.factory.actionType.AuthorizeAction }
-        // typeOf: chevre.factory.actionType.AcceptAction,
-        // project: { id: project.id, typeOf: chevre.factory.organizationType.Project }
     })({
         action: await chevre.repository.Action.createInstance(mongoose.connection),
         event: await chevre.repository.Event.createInstance(mongoose.connection),

package/example/src/chevre/unsetUnnecessaryFields.ts

@@ -1,4 +1,5 @@
 // tslint:disable:no-console
+import * as moment from 'moment';
 import * as mongoose from 'mongoose';
 
 import { chevre } from '../../../lib/index';
@@ -8,10 +9,10 @@ async function main() {
 
     let updateResult: any;
 
-    const messageRepo = await chevre.repository.Message.createInstance(mongoose.connection);
-    const paymentServiceRepo = await chevre.repository.PaymentService.createInstance(mongoose.connection);
+    const aggregationRepo = await chevre.repository.Aggregation.createInstance(mongoose.connection);
+    const taskRepo = await chevre.repository.Task.createInstance(mongoose.connection);
 
-    updateResult = await messageRepo.unsetUnnecessaryFields({
+    updateResult = await aggregationRepo.unsetUnnecessaryFields({
         filter: {
             _id: { $exists: true }
         },
@@ -23,9 +24,14 @@ async function main() {
     });
     console.log('unset processed.', updateResult);
 
-    updateResult = await paymentServiceRepo.unsetUnnecessaryFields({
+    updateResult = await taskRepo.unsetUnnecessaryFields({
         filter: {
-            _id: { $exists: true }
+            // _id: { $exists: true },
+            runsAt: {
+                $gte: moment()
+                    .add(-1, 'days')
+                    .toDate()
+            }
         },
         $unset: {
             __v: 1,

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

@@ -38,4 +38,8 @@ export declare class MongoRepository {
     readonly aggregationModel: typeof Model;
     constructor(connection: Connection);
     saveAggregation(params: IAggregation): Promise<any>;
+    unsetUnnecessaryFields(params: {
+        filter: any;
+        $unset: any;
+    }): Promise<import("mongodb").UpdateResult>;
 }

package/lib/chevre/repo/aggregation.js

@@ -67,5 +67,11 @@ class MongoRepository {
             return doc.toObject();
         });
     }
+    unsetUnnecessaryFields(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.aggregationModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
+                .exec();
+        });
+    }
 }
 exports.MongoRepository = MongoRepository;

package/lib/chevre/repo/mongoose/schemas/aggregation.js

@@ -16,10 +16,8 @@ const schemaOptions = {
     writeConcern: writeConcern_1.writeConcern,
     strict: false,
     strictQuery: false,
-    timestamps: {
-        createdAt: 'createdAt',
-        updatedAt: 'updatedAt'
-    },
+    timestamps: false,
+    versionKey: false,
     toJSON: {
         getters: false,
         virtuals: false,
@@ -44,14 +42,5 @@ function createSchema() {
     return schema;
 }
 exports.createSchema = createSchema;
-const indexes = [
-    [
-        { createdAt: 1 },
-        { name: 'searchByCreatedAt' }
-    ],
-    [
-        { updatedAt: 1 },
-        { name: 'searchByUpdatedAt' }
-    ]
-];
+const indexes = [];
 exports.indexes = indexes;

package/lib/chevre/repo/mongoose/schemas/task.js

@@ -33,10 +33,8 @@ const schemaOptions = {
     writeConcern: writeConcern_1.writeConcern,
     strict: true,
     strictQuery: false,
-    timestamps: {
-        createdAt: 'createdAt',
-        updatedAt: 'updatedAt'
-    },
+    timestamps: false,
+    versionKey: false,
     toJSON: {
         getters: false,
         virtuals: false,
@@ -51,14 +49,6 @@ const schemaOptions = {
     }
 };
 const indexes = [
-    [
-        { createdAt: 1 },
-        { name: 'searchByCreatedAt' }
-    ],
-    [
-        { updatedAt: 1 },
-        { name: 'searchByUpdatedAt' }
-    ],
     [
         { 'project.id': 1, runsAt: -1 },
         { name: 'searchByProjectId-v20220721' }

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

@@ -168,6 +168,10 @@ export declare class MongoRepository {
         };
     }): Promise<number>;
     getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
+    unsetUnnecessaryFields(params: {
+        filter: any;
+        $unset: any;
+    }): Promise<import("mongodb").UpdateResult>;
     aggregateTask(params: {
         project?: {
             id?: {

package/lib/chevre/repo/task.js

@@ -645,6 +645,12 @@ class MongoRepository {
             .sort({ runsAt: factory.sortType.Ascending })
             .cursor();
     }
+    unsetUnnecessaryFields(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.taskModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
+                .exec();
+        });
+    }
     aggregateTask(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const statuses = yield Promise.all([

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

@@ -82,12 +82,12 @@ function processVoidTransaction4coa(params) {
 }
 exports.processVoidTransaction4coa = processVoidTransaction4coa;
 function processVoidTransactionByAcceptAction4coa(params) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     return __awaiter(this, void 0, void 0, function* () {
-        // COAの場合、objectあるいはresultに連携内容情報が記録されているので、その情報を元に仮予約を取り消す
+        // instrument,resultに連携内容情報が保管されているので、その情報を元に仮予約を取り消す
         let delTmpReserveParams;
-        const coaRequestBody = (_b = (_a = params.action.result) === null || _a === void 0 ? void 0 : _a.result) === null || _b === void 0 ? void 0 : _b.requestBody;
-        const coaResponseBody = (_d = (_c = params.action.result) === null || _c === void 0 ? void 0 : _c.result) === null || _d === void 0 ? void 0 : _d.responseBody;
+        const coaRequestBody = (_a = params.action.instrument) === null || _a === void 0 ? void 0 : _a.requestBody;
+        const coaResponseBody = (_c = (_b = params.action.result) === null || _b === void 0 ? void 0 : _b.result) === null || _c === void 0 ? void 0 : _c.responseBody;
         if (coaRequestBody !== undefined && coaResponseBody !== undefined) {
             delTmpReserveParams = {
                 theaterCode: coaRequestBody.theaterCode,

package/lib/chevre/service/offer/eventServiceByCOA/acceptOffer.d.ts

@@ -10,7 +10,7 @@ interface IAcceptRepos {
     reserveService: COA.service.Reserve;
     masterService: COA.service.Master;
 }
-type IAccepteOfferParams = Pick<factory.task.acceptCOAOffer.IData, 'object' | 'potentialActions' | 'purpose' | 'sameAs'> & {
+type IAccepteOfferParams = Pick<factory.task.acceptCOAOffer.IData, 'object' | 'potentialActions' | 'purpose'> & {
     sameAs: {
         id: string;
     };
@@ -18,7 +18,7 @@ type IAccepteOfferParams = Pick<factory.task.acceptCOAOffer.IData, 'object' | 'p
 /**
  * COA興行オファー採用
  */
-declare function acceptOffer(params: IAccepteOfferParams): (repos: IAcceptRepos) => Promise<import("@chevre/factory/lib/action").IAction<import("@chevre/factory/lib/action").IAttributes<factory.actionType.AcceptAction, any, any>>>;
+declare function acceptOffer(params: IAccepteOfferParams): (repos: IAcceptRepos) => Promise<void>;
 /**
  * COA興行オファー採用変更
  */
@@ -29,5 +29,5 @@ declare function reAcceptOffer(params: IAccepteOfferParams & {
          */
         id: string;
     };
-}): (repos: IAcceptRepos) => Promise<import("@chevre/factory/lib/action").IAction<import("@chevre/factory/lib/action").IAttributes<factory.actionType.AcceptAction, any, any>>>;
+}): (repos: IAcceptRepos) => Promise<void>;
 export { acceptOffer, reAcceptOffer };

package/lib/chevre/service/offer/eventServiceByCOA/acceptOffer.js

@@ -50,6 +50,8 @@ function acceptOffer(params) {
             id: params.object.event.id,
             project: { id: transaction.project.id }
         })(repos);
+        let requestBody;
+        requestBody = (0, factory_1.createUpdTmpReserveSeatArgs)({ object: params.object, coaInfo });
         const actionAttributes = {
             project: transaction.project,
             typeOf: factory.actionType.AcceptAction,
@@ -57,10 +59,10 @@ function acceptOffer(params) {
             agent: { id: transaction.agent.id, typeOf: transaction.agent.typeOf },
             purpose: { id: transaction.id, typeOf: transaction.typeOf },
             sameAs: { id: params.sameAs.id, typeOf: 'Task' },
-            potentialActions: params.potentialActions
+            potentialActions: params.potentialActions,
+            instrument: { typeOf: 'COAReserveTransaction', requestBody }
         };
         let acceptedOffer;
-        let requestBody;
         let responseBody;
         const action = yield repos.action.start(actionAttributes);
         try {
@@ -77,7 +79,6 @@ function acceptOffer(params) {
                 reserveService: repos.reserveService,
                 masterService: repos.masterService
             });
-            requestBody = (0, factory_1.createUpdTmpReserveSeatArgs)({ object: params.object, coaInfo });
             try {
                 responseBody = yield repos.reserveService.updTmpReserveSeat(requestBody);
             }
@@ -99,10 +100,10 @@ function acceptOffer(params) {
                 acceptedOffer,
                 event: { id: params.object.event.id }
             },
-            result: { requestBody, responseBody },
+            result: { responseBody },
             typeOf: factory.actionType.AuthorizeAction
         };
-        return repos.action.complete({ typeOf: action.typeOf, id: action.id, result });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result });
     });
 }
 exports.acceptOffer = acceptOffer;
@@ -135,7 +136,11 @@ function reAcceptOffer(params) {
             agent: { id: transaction.agent.id, typeOf: transaction.agent.typeOf },
             purpose: { id: transaction.id, typeOf: transaction.typeOf },
             sameAs: { id: params.sameAs.id, typeOf: 'Task' },
-            potentialActions: params.potentialActions
+            potentialActions: params.potentialActions,
+            instrument: {
+                typeOf: 'COAReserveTransaction'
+                // requestBody: {}
+            }
         };
         let acceptedOffer;
         const action = yield repos.action.start(actionAttributes);
@@ -171,7 +176,7 @@ function reAcceptOffer(params) {
             },
             typeOf: factory.actionType.AuthorizeAction
         };
-        return repos.action.complete({ typeOf: action.typeOf, id: action.id, result });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result });
     });
 }
 exports.reAcceptOffer = reAcceptOffer;

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

@@ -55,7 +55,7 @@ function call(params) {
                     object,
                     purpose,
                     potentialActions: Object.assign(Object.assign({}, potentialActions), { id: potentialActions.id }),
-                    sameAs: { id: params.id, typeOf: 'Task' }
+                    sameAs: { id: params.id }
                 })({
                     action: actionRepo,
                     event: new event_1.MongoRepository(settings.connection),
@@ -69,7 +69,7 @@ function call(params) {
                     object,
                     potentialActions,
                     purpose,
-                    sameAs: { id: params.id, typeOf: 'Task' }
+                    sameAs: { id: params.id }
                 })({
                     action: actionRepo,
                     event: new event_1.MongoRepository(settings.connection),

package/package.json

@@ -10,8 +10,8 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.371.0-alpha.5",
-    "@cinerino/sdk": "7.0.0-alpha.9",
+    "@chevre/factory": "4.371.0-alpha.6",
+    "@cinerino/sdk": "7.0.0-alpha.10",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.32.0-alpha.21"
+  "version": "21.32.0-alpha.23"
 }