@chevre/domain 21.33.0-alpha.3 → 21.33.0-alpha.5

package/example/src/chevre/findTransactionInProgressById.ts

@@ -0,0 +1,23 @@
+// 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.findInProgressById(
+        {
+            typeOf: chevre.factory.transactionType.PlaceOrder,
+            id: '6656d35dd1f13f8c658be102'
+        }
+        // ['_id']
+    );
+    console.log('transaction:', transaction);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

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

@@ -58,7 +58,9 @@ export declare class MongoRepository {
     readonly taskModel: typeof Model;
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: factory.task.ISearchConditions): any[];
-    saveOne(savingTask: factory.task.IAttributes<factory.taskName>, options: IOptionOnCreate): Promise<import("mongodb").InsertManyResult<any>>;
+    saveOne(savingTask: factory.task.IAttributes<factory.taskName>, options: IOptionOnCreate): Promise<{
+        id: string;
+    }>;
     saveMany(taskAttributes: factory.task.IAttributes<factory.taskName>[], options: IOptionOnCreate): Promise<{
         id: string;
     }[]>;

package/lib/chevre/repo/task.js

@@ -144,18 +144,18 @@ class MongoRepository {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const result = yield this.taskModel.insertMany(savingTask, { rawResult: true });
-            const taskId = (_b = (_a = result.insertedIds) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.toHexString();
-            if (typeof taskId !== 'string') {
+            const id = (_b = (_a = result.insertedIds) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.toHexString();
+            if (typeof id !== 'string') {
                 throw new factory.errors.ServiceUnavailable('task not saved');
             }
             const { emitImmediately } = options;
             if (emitImmediately) {
                 task_2.taskEventEmitter.emitTaskStatusChanged({
-                    id: taskId,
+                    id,
                     status: factory.taskStatus.Ready
                 });
             }
-            return result;
+            return { id };
         });
     }
     saveMany(taskAttributes, options) {

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

@@ -48,6 +48,8 @@ interface IStatus {
 export interface IAggregatePlaceOrder {
     statuses: IStatus[];
 }
+type IOmittedFieldsInProgress = 'tasksExportAction' | 'tasksExportedAt' | 'tasksExportationStatus';
+type ITransactionInProgress<T extends factory.transactionType> = T extends factory.transactionType.MoneyTransfer ? Omit<factory.transaction.moneyTransfer.ITransaction, IOmittedFieldsInProgress> : T extends factory.transactionType.PlaceOrder ? Omit<factory.transaction.placeOrder.ITransaction, IOmittedFieldsInProgress> : T extends factory.transactionType.ReturnOrder ? Omit<factory.transaction.returnOrder.ITransaction, IOmittedFieldsInProgress> : never;
 /**
  * 取引リポジトリ
  */
@@ -74,7 +76,7 @@ export declare class MongoRepository {
     findInProgressById<T extends factory.transactionType>(params: {
         typeOf: T;
         id: string;
-    }): Promise<factory.transaction.ITransaction<T>>;
+    }, inclusion?: IKeyOfProjection<T>[]): Promise<ITransactionInProgress<T>>;
     /**
      * 取引の注文番号を検索する
      */

package/lib/chevre/repo/transaction.js

@@ -293,15 +293,33 @@ class MongoRepository {
     /**
      * 進行中の取引を取得する
      */
-    findInProgressById(params) {
+    findInProgressById(params, inclusion) {
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.transactionModel.findOne({
+            let projection = {};
+            if (Array.isArray(inclusion) && inclusion.length > 0) {
+                inclusion.forEach((field) => {
+                    projection[field] = 1;
+                });
+            }
+            else {
+                // minimize(2024-05-29~)
+                projection = {
+                    __v: 0,
+                    createdAt: 0,
+                    updatedAt: 0,
+                    tasksExportAction: 0,
+                    tasksExportedAt: 0,
+                    tasksExportationStatus: 0
+                };
+            }
+            const filter = {
                 _id: { $eq: params.id },
                 typeOf: { $eq: params.typeOf },
                 status: { $eq: factory.transactionStatusType.InProgress },
                 // expiresを条件に追加(2023-05-12~),
                 expires: { $gt: new Date() }
-            })
+            };
+            const doc = yield this.transactionModel.findOne(filter, projection)
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.transactionModel.modelName);

package/lib/chevre/service/offer/event/factory.d.ts

@@ -10,14 +10,14 @@ export declare function createReserveTransactionStartParams(params: {
         id: string;
     };
     broker?: factory.reservation.IBroker<factory.reservationType>;
-    transaction: factory.transaction.ITransaction<factory.transactionType>;
+    transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'agent' | 'expires' | 'id' | 'project' | 'seller' | 'typeOf'>;
     transactionNumber: string;
 }): factory.assetTransaction.reserve.IStartParamsWithoutDetail;
 export declare function createAuthorizeSeatReservationActionAttributes(params: {
     acceptedOffers: factory.action.authorize.offer.eventService.IAcceptedOffer4chevre[];
     event: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>;
     pendingTransaction: factory.action.authorize.offer.eventService.IChevrePendingTransaction;
-    transaction: factory.transaction.ITransaction<factory.transactionType.PlaceOrder>;
+    transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'agent' | 'id' | 'project' | 'seller' | 'typeOf'>;
     broker?: factory.reservation.IBroker<factory.reservationType.EventReservation>;
 }): factory.action.authorize.offer.eventService.IAttributes<factory.service.webAPI.Identifier.Chevre>;
 export declare function acceptedOffers2amount(params: {

package/lib/chevre/service/offer/event/processStartReserve4chevre.d.ts

@@ -22,7 +22,7 @@ declare function processStartReserve4chevre(params: {
     event: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>;
     broker?: factory.reservation.IBroker<factory.reservationType>;
     transactionNumber?: string;
-    transaction: factory.transaction.ITransaction<factory.transactionType.PlaceOrder>;
+    transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'agent' | 'expires' | 'id' | 'project' | 'seller' | 'typeOf'>;
     availableAtOrFrom: {
         id: string;
     };

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

@@ -5,7 +5,7 @@ export type IAcceptedOffer4COA = factory.action.authorize.offer.eventService.IAc
 export declare function createAuthorizeSeatReservationActionAttributes(params: {
     acceptedOffers: factory.action.authorize.offer.eventService.IAcceptedOffer<factory.service.webAPI.Identifier.COA>[];
     event: Pick<IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>, 'id' | 'typeOf'>;
-    transaction: factory.transaction.ITransaction<factory.transactionType.PlaceOrder>;
+    transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'agent' | 'id' | 'project' | 'seller' | 'typeOf'>;
     pendingTransaction: factory.action.authorize.offer.eventService.ICOAPendingTransaction;
 }): factory.action.authorize.offer.eventService.IAttributes<WebAPIIdentifier.COA>;
 /**

package/lib/chevre/service/offer/product/factory.d.ts

@@ -5,12 +5,12 @@ export declare function createRegisterServiceStartParams(params: {
         typeOf: factory.organizationType.Project;
     };
     object: factory.action.authorize.offer.product.IObject;
-    transaction: factory.transaction.ITransaction<factory.transactionType>;
+    transaction: Pick<factory.transaction.ITransaction<factory.transactionType>, 'seller' | 'expires'>;
     transactionNumber: string;
 }): factory.assetTransaction.registerService.IStartParamsWithoutDetail;
 export declare function createActionAttributes(params: {
     acceptedOffer: factory.action.authorize.offer.product.IObject;
-    transaction: factory.transaction.ITransaction<factory.transactionType.PlaceOrder>;
+    transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'agent' | 'id' | 'project' | 'seller' | 'typeOf'>;
     transactionNumber: string;
 }): factory.action.authorize.offer.product.IAttributes;
 export declare function acceptedOffers2amount(params: {

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

@@ -14,7 +14,7 @@ export declare function creatPayTransactionStartParams(params: {
     accountId?: string;
     object: factory.action.authorize.paymentMethod.any.IObject;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
-    transaction: factory.transaction.ITransaction<factory.transactionType>;
+    transaction: Omit<factory.transaction.ITransaction<factory.transactionType>, 'tasksExportAction' | 'tasksExportedAt' | 'tasksExportationStatus'>;
     transactionNumber: string;
     location?: factory.action.trade.pay.ILocation;
 }): factory.assetTransaction.pay.IStartParamsWithoutDetail;

package/package.json

@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.33.0-alpha.3"
+  "version": "21.33.0-alpha.5"
 }