@chevre/domain 22.2.0-alpha.8 → 22.2.0

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

@@ -39,7 +39,7 @@ function createDeleteTransactionTasksByAgentId(params) {
         // agentIdによる全取引についてDeleteTransactionタスクを作成する
         if (typeof agentIdSpecified === 'string' && agentIdSpecified.length > 0) {
             const transactionTypeOf = params.object.typeOf;
-            const transactions = yield repos.transaction.search({
+            const transactions = yield repos.transaction.projectFields({
                 project: { id: { $eq: params.object.project.id } },
                 agent: {
                     ids: [agentIdSpecified],
@@ -128,7 +128,7 @@ function deleteTransactionById(params) {
         if (typeof deletingTransactionId !== 'string' || deletingTransactionId.length === 0) {
             throw new factory.errors.ArgumentNull('object.id');
         }
-        const transaction = (yield repos.transaction.search({
+        const transaction = (yield repos.transaction.projectFields({
             ids: [deletingTransactionId],
             typeOf: params.object.typeOf,
             inclusion: ['typeOf', 'project', 'status', 'result']

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

@@ -28,7 +28,7 @@ const CodeService = require("../code");
 function start(params) {
     return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
         const { passport } = yield repos.passport.validatePassportTokenIfExist(params);
-        const sellers = yield repos.seller.search({
+        const sellers = yield repos.seller.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: params.seller.id }
@@ -162,7 +162,7 @@ function fixToLocation(params) {
 function processAuthorizePaymentCard(params) {
     return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const transaction = yield repos.transaction.findInProgressById({
+        const transaction = yield repos.transaction.projectFieldsInProgressById({
             typeOf: factory.transactionType.MoneyTransfer,
             id: params.purpose.id
         }, ['agent', 'project', 'recipient', 'seller', 'typeOf', 'object']);
@@ -504,7 +504,7 @@ function validateToLocation(project, toLocationBeforeStart, issuedThrough) {
 function confirm(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const now = new Date();
-        const transaction = yield repos.transaction.findById({
+        const transaction = yield repos.transaction.projectFieldsById({
             typeOf: factory.transactionType.MoneyTransfer,
             id: params.id
         }, ['typeOf', 'status', 'project']);
@@ -562,7 +562,7 @@ function searchAuthorizeActions(params) {
  */
 function exportTasksById(params) {
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        const transaction = yield repos.transaction.findById({
+        const transaction = yield repos.transaction.projectFieldsById({
             typeOf: factory.transactionType.MoneyTransfer,
             id: params.id
         }, ['endDate', 'status', 'project', 'startDate', 'typeOf', 'object', 'potentialActions']);

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

@@ -59,7 +59,7 @@ function confirm(params, options) {
             status: { $in: [factory.transactionStatusType.Confirmed, factory.transactionStatusType.InProgress] },
             object: { orderDate: params.result.order.orderDate }
         })(repos);
-        const transaction = yield repos.transaction.findById({ typeOf: factory.transactionType.PlaceOrder, id: params.id }, ['typeOf', 'project', 'status', 'agent', 'seller', 'object', 'result']);
+        const transaction = yield repos.transaction.projectFieldsById({ typeOf: factory.transactionType.PlaceOrder, id: params.id }, ['typeOf', 'project', 'status', 'agent', 'seller', 'object', 'result']);
         const confirmResult = yield processTransactionNotInProgress(transaction)(repos);
         if (confirmResult !== undefined) {
             return confirmResult;

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

@@ -18,7 +18,7 @@ const factory_1 = require("./exportTasks/factory");
  */
 function exportTasksById(params) {
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        const transaction = yield repos.transaction.findById({
+        const transaction = yield repos.transaction.projectFieldsById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.id
         }, ['endDate', 'object', 'project', 'seller', 'startDate', 'status', 'typeOf']);

package/lib/chevre/service/transaction/placeOrder/start/validateStartRequest.d.ts

@@ -1,8 +1,8 @@
 import type { MemberRepo } from '../../../../repo/member';
 import type { ProjectMakesOfferRepo } from '../../../../repo/projectMakesOffer';
-import type { SellerRepo } from '../../../../repo/seller';
+import type { ISellerWithId, SellerRepo } from '../../../../repo/seller';
 import * as factory from '../../../../factory';
-type ISeller = Pick<factory.seller.ISeller, 'id' | 'name' | 'project' | 'typeOf' | 'makesOffer' | 'additionalProperty'>;
+type ISeller = Pick<ISellerWithId, 'id' | 'name' | 'project' | 'typeOf' | 'makesOffer' | 'additionalProperty'>;
 declare function validateStartRequest(params: {
     project: {
         id: string;

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

@@ -67,7 +67,7 @@ function validateStartRequest(params) {
         if (projectMakesOffer === undefined) {
             throw new factory.errors.Argument('project', 'project makes no offers');
         }
-        const seller = (yield repos.seller.search({
+        const seller = (yield repos.seller.projectFields({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },

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

@@ -35,7 +35,7 @@ function start(params, options) {
             }
             catch (error) {
                 // in case already locked
-                const alreadyStartedTransaction = (yield repos.transaction.search({
+                const alreadyStartedTransaction = (yield repos.transaction.projectFields({
                     limit: 1, page: 1,
                     typeOf: factory.transactionType.PlaceOrder,
                     project: { id: { $eq: startParams.project.id } },

package/lib/chevre/service/transaction/returnOrder/preStart.d.ts

@@ -7,7 +7,7 @@ import type { OfferItemConditionRepo } from '../../../repo/offerItemCondition';
 import type { OrderRepo } from '../../../repo/order';
 import type { ProjectRepo } from '../../../repo/project';
 import type { ReservationRepo } from '../../../repo/reservation';
-import type { SellerRepo } from '../../../repo/seller';
+import type { ISellerWithId, SellerRepo } from '../../../repo/seller';
 interface IPreStartOperationRepos {
     acceptedOffer: AcceptedOfferRepo;
     event: EventRepo;
@@ -20,7 +20,7 @@ interface IPreStartOperationRepos {
     seller: SellerRepo;
 }
 type IPreStartOperation<T> = (repos: IPreStartOperationRepos) => Promise<T>;
-type IFixedSeller = Pick<factory.seller.ISeller, 'id' | 'name' | 'project' | 'hasMerchantReturnPolicy' | 'typeOf'>;
+type IFixedSeller = Pick<ISellerWithId, 'id' | 'name' | 'project' | 'hasMerchantReturnPolicy' | 'typeOf'>;
 /**
  * 返品取引開始前処理
  */

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

@@ -36,7 +36,7 @@ function preStart(params) {
         const now = new Date();
         const { acceptedOffers, eventIds, offerIds, orders } = yield fixOrders(params)(repos);
         // sellerはorderから自動取得
-        const sellers = yield repos.seller.search({
+        const sellers = yield repos.seller.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: String(orders[0].seller.id) }

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

@@ -83,7 +83,7 @@ function saveMessagesIfNeeded(params) {
 function confirm(params) {
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const transaction = yield repos.transaction.findById({ typeOf: factory.transactionType.ReturnOrder, id: params.id }, ['typeOf', 'status', 'project', 'agent', 'object', 'result']);
+        const transaction = yield repos.transaction.projectFieldsById({ typeOf: factory.transactionType.ReturnOrder, id: params.id }, ['typeOf', 'status', 'project', 'agent', 'object', 'result']);
         if (transaction.status === factory.transactionStatusType.Confirmed) {
             // すでに確定済の場合
             return transaction.result;
@@ -148,7 +148,7 @@ exports.confirm = confirm;
  */
 function exportTasksById(params) {
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        const transaction = yield repos.transaction.findById({ typeOf: factory.transactionType.ReturnOrder, id: params.id }, ['typeOf', 'status', 'project', 'endDate', 'startDate', 'object', 'potentialActions']);
+        const transaction = yield repos.transaction.projectFieldsById({ typeOf: factory.transactionType.ReturnOrder, id: params.id }, ['typeOf', 'status', 'project', 'endDate', 'startDate', 'object', 'potentialActions']);
         // タスク実行日時バッファの指定があれば調整
         let taskRunsAt = new Date();
         if (typeof params.runsTasksAfterInSeconds === 'number') {

package/lib/chevre/service/transaction.js

@@ -39,7 +39,7 @@ function fixCustomer(params) {
         catch (error) {
             throw new factory.errors.Argument('telephone', error.message);
         }
-        const transaction = yield repos.transaction.findInProgressById({
+        const transaction = yield repos.transaction.projectFieldsInProgressById({
             typeOf: params.typeOf,
             id: params.id
         }, ['agent', 'object', 'typeOf', 'project']);

package/package.json

@@ -9,9 +9,9 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.381.0-alpha.7",
-    "@cinerino/sdk": "10.5.0-alpha.2",
-    "@motionpicture/coa-service": "9.4.0",
+    "@chevre/factory": "4.382.0",
+    "@cinerino/sdk": "10.8.0",
+    "@motionpicture/coa-service": "9.5.0-alpha.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
     "@surfrock/sdk": "1.3.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.2.0-alpha.8"
+  "version": "22.2.0"
 }

package/example/src/chevre/findTransactionById.ts

@@ -1,23 +0,0 @@
-// 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: '666e59edbf16a7761d26f8f4'
-        },
-        ['status']
-    );
-    console.log('transaction:', transaction);
-}
-
-main()
-    .then(console.log)
-    .catch(console.error);

package/example/src/chevre/findTransactionInProgressById.ts

@@ -1,23 +0,0 @@
-// 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'
-        },
-        ['status']
-    );
-    console.log('transaction:', transaction);
-}
-
-main()
-    .then(console.log)
-    .catch(console.error);

package/example/src/chevre/migrateTransactionObjectPaymentMethods.ts

@@ -1,154 +0,0 @@
-// tslint:disable:no-console
-import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-// const project = { id: String(process.env.PROJECT_ID) };
-
-type IAcceptPayAction = chevre.factory.action.accept.pay.IAction;
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const actionRepo = await chevre.repository.Action.createInstance(mongoose.connection);
-    const transactionRepo = await chevre.repository.Transaction.createInstance(mongoose.connection);
-
-    const cursor = transactionRepo.getCursor(
-        {
-            // 'project.id': { $eq: project.id },
-            typeOf: { $eq: chevre.factory.transactionType.PlaceOrder },
-            status: { $eq: chevre.factory.transactionStatusType.Confirmed },
-            startDate: {
-                $gte: moment()
-                    // tslint:disable-next-line:no-magic-numbers
-                    .add(-30, 'days')
-                    .toDate()
-            }
-        },
-        {
-            startDate: 1,
-            project: 1,
-            object: 1
-        }
-    );
-    console.log('transactions found');
-
-    let i = 0;
-    let updateCount = 0;
-    let saveRecipeCount = 0;
-    // tslint:disable-next-line:max-func-body-length
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const placeOrder: Pick<
-            chevre.factory.transaction.placeOrder.ITransaction,
-            'startDate' | 'project' | 'object' | 'id'
-        > = doc.toObject();
-
-        const paymentMethodsByTransaction = placeOrder.object.paymentMethods;
-        const paymentMethodId4paymentUrl = paymentMethodsByTransaction?.paymentMethodId;
-        const alreadyMigrated =
-            typeof paymentMethodId4paymentUrl !== 'string'
-            || (typeof paymentMethodId4paymentUrl === 'string' && (<any>paymentMethodsByTransaction).entryTranArgs === undefined);
-
-        if (alreadyMigrated) {
-            console.log('already migrated.', placeOrder.project.id, placeOrder.id, placeOrder.startDate, i);
-        } else {
-            const acceptPayAction = (<Pick<IAcceptPayAction, 'object' | 'result' | 'id' | 'typeOf' | 'endDate'>[]>await actionRepo.search(
-                {
-                    limit: 1,
-                    page: 1,
-                    project: { id: { $eq: placeOrder.project.id } },
-                    typeOf: { $eq: chevre.factory.actionType.AcceptAction },
-                    actionStatus: { $in: [chevre.factory.actionStatusType.CompletedActionStatus] },
-                    purpose: { id: { $in: [placeOrder.id] } },
-                    object: {
-                        transactionNumber: { $eq: paymentMethodId4paymentUrl },
-                        typeOf: { $eq: chevre.factory.assetTransactionType.Pay }
-                    }
-                },
-                ['object', 'result', 'typeOf', 'endDate'],
-                []
-            )).shift();
-
-            if (acceptPayAction !== undefined) {
-                const actionRecipe = await actionRepo.findRecipeByAction({
-                    project: { id: placeOrder.project.id },
-                    recipeFor: { id: acceptPayAction.id }
-                });
-                if (actionRecipe !== null) {
-                    console.log(
-                        'actionRecipe already exists. step:',
-                        actionRecipe.step.length, placeOrder.project.id, placeOrder.id, placeOrder.startDate, i);
-
-                    // 取引から冗長な属性を削除
-                    if ((<any>paymentMethodsByTransaction).entryTranArgs !== undefined) {
-                        await transactionRepo.findByIdAndUpdate4migrate({
-                            id: placeOrder.id,
-                            update: {
-                                $set: { 'object.paymentMethods': { paymentMethodId: paymentMethodId4paymentUrl } }
-                            }
-                        });
-                        updateCount += 1;
-                    }
-                } else {
-                    const recipe: chevre.factory.action.accept.pay.IRecipe & {
-                        recipeFor: { id: string; typeOf: chevre.factory.actionType };
-                        dateCreated: Date;
-                        dateModified: Date;
-                    } = {
-                        project: { id: placeOrder.project.id, typeOf: chevre.factory.organizationType.Project },
-                        typeOf: 'Recipe',
-                        recipeCategory: chevre.factory.recipe.RecipeCategory.publishPaymentUrl,
-                        recipeFor: { id: acceptPayAction.id, typeOf: acceptPayAction.typeOf },
-                        step: [{
-                            typeOf: 'HowToSection',
-                            itemListElement: [
-                                {
-                                    typeOf: 'HowToStep',
-                                    identifier: chevre.factory.recipe.StepIdentifier.entryTran,
-                                    itemListElement: [{
-                                        typeOf: 'HowToDirection',
-                                        beforeMedia: (<any>paymentMethodsByTransaction).entryTranArgs,
-                                        afterMedia: (<any>paymentMethodsByTransaction).entryTranResult
-                                    }]
-                                },
-                                {
-                                    typeOf: 'HowToStep',
-                                    identifier: chevre.factory.recipe.StepIdentifier.execTran,
-                                    itemListElement: [{
-                                        typeOf: 'HowToDirection',
-                                        beforeMedia: (<any>paymentMethodsByTransaction).execTranArgs,
-                                        afterMedia: (<any>paymentMethodsByTransaction).execTranResult
-                                    }]
-                                }
-                            ]
-                        }],
-                        dateCreated: moment(acceptPayAction.endDate)
-                            .toDate(),
-                        dateModified: moment(acceptPayAction.endDate)
-                            .toDate()
-                    };
-                    console.log(
-                        'saving recipe...',
-                        placeOrder.project.id, placeOrder.id, placeOrder.startDate, i);
-                    // console.dir(recipe, { depth: null });
-                    await actionRepo.saveRecipeWithDateCreated(recipe);
-                    saveRecipeCount += 1;
-                    console.log('recipe saved.', placeOrder.project.id, placeOrder.id, placeOrder.startDate, i);
-                }
-            } else {
-                console.log('acceptPayAction does not exist.', placeOrder.project.id, placeOrder.id, placeOrder.startDate, i);
-            }
-        }
-    });
-
-    console.log(i, 'transactions checked');
-    console.log(updateCount, 'transactions updated');
-    console.log(saveRecipeCount, 'recipe saved');
-}
-
-main()
-    .then()
-    .catch(console.error);

package/example/src/chevre/projectReservationFields.ts

@@ -1,31 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-const project = { id: String(process.env.PROJECT_ID) };
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const reservationRepo = await chevre.repository.Reservation.createInstance(mongoose.connection);
-
-    const reservations = await reservationRepo.projectFields<chevre.factory.reservationType.EventReservation>(
-        {
-            limit: 1,
-            page: 1,
-            typeOf: chevre.factory.reservationType.EventReservation,
-            project: { id: { $eq: project.id } }
-        },
-        {
-            id: 1
-        }
-    );
-    // tslint:disable-next-line:no-null-keyword
-    console.dir(reservations, { depth: null });
-    console.log(reservations.length, 'reservations found');
-}
-
-main()
-    .then()
-    .catch(console.error);

package/example/src/chevre/searchActions.ts

@@ -1,40 +0,0 @@
-// tslint:disable:no-implicit-dependencies no-console
-import { chevre } from '../../../lib/index';
-
-import * as  mongoose from 'mongoose';
-
-// const project = { id: String(process.env.PROJECT_ID) };
-
-mongoose.Model.on('index', (...args) => {
-    console.error('******** index event emitted. ********\n', args);
-});
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const actionRepo = await chevre.repository.Action.createInstance(mongoose.connection);
-    const actions = await actionRepo.search(
-        {
-            limit: 1,
-            // typeOf: { $eq: chevre.factory.actionType.CheckAction },
-            // project: { id: { $eq: project.id } },
-            // object: {
-            //     movieTickets: {
-            //         identifier: { $eq: '0947524082' },
-            //         serviceOutput: { reservationFor: { id: { $eq: 'clhvvbpyn' } } }
-            //     }
-            // }
-            // instrument: { transactionNumber: { $eq: 'x' } },
-            sameAs: { id: { $eq: '66275034ae5d4c3e8997808c' } }
-        },
-        ['_id'],
-        []
-    );
-    console.log('actions:', actions);
-}
-
-main()
-    .then(() => {
-        console.log('success!');
-    })
-    .catch(console.error);

package/example/src/chevre/searchProducts.ts

@@ -1,28 +0,0 @@
-// tslint:disable:no-implicit-dependencies no-console
-import { chevre } from '../../../lib/index';
-
-import * as  mongoose from 'mongoose';
-
-const project = { id: String(process.env.PROJECT_ID) };
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const productRepo = await chevre.repository.Product.createInstance(mongoose.connection);
-    const products = await productRepo.searchProducts(
-        {
-            project: { id: { $eq: project.id } }
-        },
-        // ['_id', 'typeOf'],
-        [],
-        []
-    );
-    console.log('products:', products);
-    console.log(products.length, 'products found');
-}
-
-main()
-    .then(() => {
-        console.log('success!');
-    })
-    .catch(console.error);