@chevre/domain 20.4.0-alpha.2 → 20.4.0-alpha.21

package/example/src/chevre/aggregateEventReservation.ts

@@ -16,7 +16,7 @@ async function main() {
 
     // const now = new Date();
     await chevre.service.aggregation.event.aggregateScreeningEvent({
-        id: 'alb35u7m4'
+        id: 'blaqxj0ak'
     })({
         event: new chevre.repository.Event(mongoose.connection),
         eventAvailability: new chevre.repository.itemAvailability.ScreeningEvent(client),

package/example/src/chevre/createManyEventsIfNotExist.ts

@@ -31,16 +31,16 @@ async function main() {
                     .toDate(),
                 endDate: moment('2023-02-01T06:00:00.000Z')
                     .toDate(),
-                workPerformed: {
-                    typeOf: chevre.factory.creativeWorkType.Movie,
-                    identifier: '1622100',
-                    id: '5bfb841d5a78d7948369980a',
-                    name: {
-                        en: 'Pet',
-                        ja: 'ペット'
-                    },
-                    duration: 'PT2H3M'
-                },
+                // workPerformed: {
+                //     typeOf: chevre.factory.creativeWorkType.Movie,
+                //     identifier: '1622100',
+                //     id: '5bfb841d5a78d7948369980a',
+                //     name: {
+                //         en: 'Pet',
+                //         ja: 'ペット'
+                //     },
+                //     duration: 'PT2H3M'
+                // },
                 location: {
                     typeOf: chevre.factory.placeType.ScreeningRoom,
                     branchCode: '10',

package/example/src/chevre/deleteMovieTicketCategoryChargePriceSpecs.ts

@@ -0,0 +1,21 @@
+// 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);
+
+    const priceSpecificationRepo = new chevre.repository.PriceSpecification(mongoose.connection);
+
+    const result = await priceSpecificationRepo.deleteUnnecessaryMovieTicketTypeChargePriceSpecs({
+        // project: { id: 'cinerino' }
+    });
+    console.log('deleted', result);
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/migrateMoneyTransferPendingTransactionIdentifier.ts

@@ -0,0 +1,96 @@
+// 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) };
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const accountTransactionRepo = new chevre.repository.AccountTransaction(mongoose.connection);
+    const assetTransactionRepo = new chevre.repository.AssetTransaction(mongoose.connection);
+
+    const cursor = assetTransactionRepo.getCursor(
+        {
+            'project.id': { $eq: project.id },
+            typeOf: { $eq: chevre.factory.assetTransactionType.MoneyTransfer },
+            startDate: {
+                $gte: moment('2023-02-17T15:00:00Z')
+                    .toDate()
+            }
+            // _id: { $eq: 'al6aff83w' }
+        },
+        {
+            // _id: 1,
+        }
+    );
+    console.log('assetTransactions found');
+
+    let i = 0;
+    let updateCount = 0;
+    // tslint:disable-next-line:max-func-body-length
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const moneyTransferTransaction: chevre.factory.assetTransaction.moneyTransfer.ITransaction = doc.toObject();
+
+        const description = moneyTransferTransaction.object.description;
+        if (description !== '鑑賞' && description !== '受け取り') {
+            console.log(
+                'no operation needed',
+                description,
+                moneyTransferTransaction.project.id,
+                moneyTransferTransaction.transactionNumber,
+                moneyTransferTransaction.startDate
+            );
+        } else {
+            const pendingTransactionIdentifier = moneyTransferTransaction.object.pendingTransaction?.identifier;
+            if (typeof pendingTransactionIdentifier === 'string' && pendingTransactionIdentifier.length > 0) {
+                console.log(
+                    'pendingTransactionIdentifier found',
+                    description,
+                    moneyTransferTransaction.project.id,
+                    moneyTransferTransaction.transactionNumber,
+                    moneyTransferTransaction.startDate
+                );
+            } else {
+                // 口座取引からidentifierを取得
+                const accountTransaction =
+                    await accountTransactionRepo.findByTransactionNumber({ transactionNumber: moneyTransferTransaction.transactionNumber });
+                console.log(
+                    'updating identifier...',
+                    accountTransaction.identifier,
+                    description,
+                    moneyTransferTransaction.project.id,
+                    moneyTransferTransaction.transactionNumber,
+                    moneyTransferTransaction.startDate
+                );
+                if (typeof accountTransaction.identifier === 'string') {
+                    await assetTransactionRepo.findByIdAndUpdate({
+                        id: moneyTransferTransaction.id,
+                        update: {
+                            'object.pendingTransaction.identifier': accountTransaction.identifier
+                        }
+                    });
+                }
+                console.log(
+                    'ientifier updated',
+                    accountTransaction.identifier,
+                    description,
+                    moneyTransferTransaction.project.id,
+                    moneyTransferTransaction.transactionNumber,
+                    moneyTransferTransaction.startDate
+                );
+                updateCount += 1;
+            }
+        }
+    });
+    console.log(i, 'assetTransactions checked');
+    console.log(updateCount, 'assetTransactions updated');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/searchEventTicketOffers.ts

@@ -22,11 +22,13 @@ async function main() {
     const productRepo = new chevre.repository.Product(mongoose.connection);
 
     const { ticketOffers } = await chevre.service.offer.event.searchEventTicketOffers({
-        event: { id: 'al9ew43f5' },
+        event: { id: 'ale6qiedi' },
         onlyValid: true,
-        sort: true,
-        validateOfferRateLimit: true
-        // ...(typeof sellerId === 'string') ? { seller: { id: sellerId } } : undefined,
+        sort: false,
+        validateOfferRateLimit: true,
+        addSortIndex: true,
+        limit: 100,
+        page: 1
         // ...(typeof availableAtId === 'string') ? { store: { id: availableAtId } } : undefined
     })({
         event: eventRepo,
@@ -35,6 +37,7 @@ async function main() {
         priceSpecification: priceSpecificationRepo,
         product: productRepo
     });
+    console.log(ticketOffers.map((o) => o.sortIndex));
     console.log(ticketOffers.length);
 }
 

package/example/src/chevre/searchOffersByCatalog.ts

@@ -9,13 +9,14 @@ async function main() {
 
     const offerRepo = new chevre.repository.Offer(mongoose.connection);
 
-    const offers = await offerRepo.findOffersByOfferCatalogId({
+    const { offers } = await offerRepo.findOffersByOfferCatalogId({
         ids: ['al96nqj7z', 'xxx', '1001'],
         // ids: ['xx', 'xxx'],
         offerCatalog: {
             id: '0001'
             // id: 'xxx'
         },
+        excludeAppliesToMovieTicket: false,
         sort: true
     });
     console.log(offers.map((o) => o.id));

package/example/src/chevre/unsetUnnecessaryFields.ts

@@ -0,0 +1,21 @@
+// 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 offerRepo = new chevre.repository.Offer(mongoose.connection);
+
+    let updateResult: any;
+    updateResult = await offerRepo.unsetUnnecessaryFields({
+        filter: { 'category.project': { $exists: true } },
+        $unset: { 'category.project': 1 }
+    });
+    console.log('offers unset', updateResult);
+}
+
+main()
+    .then()
+    .catch(console.error);

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

@@ -45,16 +45,6 @@ export declare class MongoRepository {
     /**
      * 口座を解約する
      */
-    close(params: {
-        /**
-         * 口座番号
-         */
-        accountNumber: string;
-        /**
-         * 解約日時
-         */
-        closeDate: Date;
-    }): Promise<void>;
     /**
      * 口座番号で検索する
      */
@@ -134,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

@@ -10,11 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = exports.modelName = void 0;
-const createDebug = require("debug");
 const account_1 = require("./mongoose/model/account");
 Object.defineProperty(exports, "modelName", { enumerable: true, get: function () { return account_1.modelName; } });
 const factory = require("../factory");
-const debug = createDebug('chevre-domain:repository');
 /**
  * 口座リポジトリ
  */
@@ -93,11 +91,11 @@ class MongoRepository {
         }
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
-        if (Array.isArray(params.statuses) && params.statuses.length > 0) {
-            andConditions.push({
-                status: { $in: params.statuses }
-            });
-        }
+        // if (Array.isArray(params.statuses) && params.statuses.length > 0) {
+        //     andConditions.push({
+        //         status: { $in: params.statuses }
+        //     });
+        // }
         const nameRegex = (_d = params.name) === null || _d === void 0 ? void 0 : _d.$regex;
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
@@ -159,8 +157,8 @@ class MongoRepository {
                         balance: p.initialBalance,
                         availableBalance: p.initialBalance,
                         pendingTransactions: [],
-                        openDate: p.openDate,
-                        status: factory.account.AccountStatusType.Opened
+                        openDate: p.openDate
+                        // status: factory.account.AccountStatusType.Opened
                     };
                 });
                 // const doc = await this.accountModel.create(account);
@@ -179,39 +177,47 @@ class MongoRepository {
     /**
      * 口座を解約する
      */
-    close(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            debug('closing account...');
-            const doc = yield this.accountModel.findOneAndUpdate({
-                accountNumber: params.accountNumber,
-                pendingTransactions: { $size: 0 },
-                status: factory.account.AccountStatusType.Opened
-            }, {
-                closeDate: params.closeDate,
-                status: factory.account.AccountStatusType.Closed
-            }, {
-                new: true
-            })
-                .exec();
-            // NotFoundであれば口座状態確認
-            if (doc === null) {
-                const account = yield this.findByAccountNumber({
-                    accountNumber: params.accountNumber
-                });
-                if (account.status === factory.account.AccountStatusType.Closed) {
-                    // すでに口座解約済の場合
-                    return;
-                }
-                else if (Array.isArray(account.pendingTransactions) && account.pendingTransactions.length > 0) {
-                    // 進行中取引が存在する場合の場合
-                    throw new factory.errors.Argument('accountNumber', 'Pending transactions exist');
-                }
-                else {
-                    throw new factory.errors.NotFound(this.accountModel.modelName);
-                }
-            }
-        });
-    }
+    // public async close(params: {
+    //     /**
+    //      * 口座番号
+    //      */
+    //     accountNumber: string;
+    //     /**
+    //      * 解約日時
+    //      */
+    //     closeDate: Date;
+    // }) {
+    //     const doc = await this.accountModel.findOneAndUpdate(
+    //         {
+    //             accountNumber: params.accountNumber,
+    //             pendingTransactions: { $size: 0 },
+    //             status: factory.account.AccountStatusType.Opened
+    //         },
+    //         {
+    //             closeDate: params.closeDate,
+    //             status: factory.account.AccountStatusType.Closed
+    //         },
+    //         {
+    //             new: true
+    //         }
+    //     )
+    //         .exec();
+    //     // NotFoundであれば口座状態確認
+    //     if (doc === null) {
+    //         const account = await this.findByAccountNumber({
+    //             accountNumber: params.accountNumber
+    //         });
+    //         if (account.status === factory.account.AccountStatusType.Closed) {
+    //             // すでに口座解約済の場合
+    //             return;
+    //         } else if (Array.isArray(account.pendingTransactions) && account.pendingTransactions.length > 0) {
+    //             // 進行中取引が存在する場合の場合
+    //             throw new factory.errors.Argument('accountNumber', 'Pending transactions exist');
+    //         } else {
+    //             throw new factory.errors.NotFound(this.accountModel.modelName);
+    //         }
+    //     }
+    // }
     /**
      * 口座番号で検索する
      */
@@ -233,7 +239,7 @@ class MongoRepository {
      */
     authorizeAmount(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.accountModel.findOneAndUpdate(Object.assign({ accountNumber: params.accountNumber, status: factory.account.AccountStatusType.Opened }, (params.force === true) ? undefined : { availableBalance: { $gte: params.amount } } // 利用可能金額確認
+            const doc = yield this.accountModel.findOneAndUpdate(Object.assign({ accountNumber: params.accountNumber }, (params.force === true) ? undefined : { availableBalance: { $gte: params.amount } } // 利用可能金額確認
             ), {
                 $inc: { availableBalance: -params.amount },
                 $push: { pendingTransactions: params.transaction } // 進行中取引追加
@@ -244,11 +250,11 @@ class MongoRepository {
                 const account = yield this.findByAccountNumber({
                     accountNumber: params.accountNumber
                 });
-                if (account.status === factory.account.AccountStatusType.Closed) {
-                    // 口座解約済の場合
-                    throw new factory.errors.Argument('accountNumber', 'Account already closed');
-                }
-                else if (typeof account.availableBalance === 'number' && account.availableBalance < params.amount) {
+                // if (account.status === factory.account.AccountStatusType.Closed) {
+                //     // 口座解約済の場合
+                //     throw new factory.errors.Argument('accountNumber', 'Account already closed');
+                // } else
+                if (typeof account.availableBalance === 'number' && account.availableBalance < params.amount) {
                     // 残高不足の場合
                     throw new factory.errors.Argument('accountNumber', 'Insufficient balance');
                 }
@@ -264,22 +270,22 @@ class MongoRepository {
     startTransaction(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.accountModel.findOneAndUpdate({
-                accountNumber: params.accountNumber,
-                status: factory.account.AccountStatusType.Opened // 開いている口座
+                accountNumber: params.accountNumber
+                // status: factory.account.AccountStatusType.Opened // 開いている口座
             }, { $push: { pendingTransactions: params.transaction } })
                 .exec();
             // NotFoundであれば口座状態確認
             if (doc === null) {
-                const account = yield this.findByAccountNumber({
-                    accountNumber: params.accountNumber
-                });
-                if (account.status === factory.account.AccountStatusType.Closed) {
-                    // 口座解約済の場合
-                    throw new factory.errors.Argument('accountNumber', 'Account already closed');
-                }
-                else {
-                    throw new factory.errors.NotFound(this.accountModel.modelName);
-                }
+                // const account = await this.findByAccountNumber({
+                //     accountNumber: params.accountNumber
+                // });
+                // if (account.status === factory.account.AccountStatusType.Closed) {
+                //     // 口座解約済の場合
+                //     throw new factory.errors.Argument('accountNumber', 'Account already closed');
+                // } else {
+                //     throw new factory.errors.NotFound(this.accountModel.modelName);
+                // }
+                throw new factory.errors.NotFound(this.accountModel.modelName);
             }
         });
     }
@@ -419,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/assetTransaction.d.ts

@@ -144,6 +144,7 @@ export declare class MongoRepository {
     findByIdAndDelete(params: {
         id: string;
     }): Promise<void>;
+    getCursor(conditions: any, projection: any): import("mongoose").QueryCursor<any>;
     aggregateAssetTransaction(params: {
         project?: {
             id?: {

package/lib/chevre/repo/assetTransaction.js

@@ -536,6 +536,11 @@ class MongoRepository {
                 .exec();
         });
     }
+    getCursor(conditions, projection) {
+        return this.transactionModel.find(conditions, projection)
+            .sort({ startDate: factory.sortType.Ascending })
+            .cursor();
+    }
     aggregateAssetTransaction(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const statuses = yield Promise.all([

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

@@ -10,7 +10,7 @@ export interface IUpdateAggregateReservationParams {
     $set: {
         updatedAt: Date;
         aggregateReservation: factory.event.screeningEvent.IAggregateReservation;
-        aggregateOffer: factory.event.screeningEvent.IAggregateOffer;
+        aggregateOffer?: factory.event.screeningEvent.IAggregateOffer;
         maximumAttendeeCapacity?: number;
         remainingAttendeeCapacity?: number;
         checkInCount?: number;
@@ -141,9 +141,10 @@ export declare class MongoRepository {
     }, update: IUpdateAggregateReservationParams | IUpdateAggregateUseActionsParams): Promise<factory.event.IEvent<T>>;
     bulkWrite(bulkWriteOps: any[]): Promise<BulkWriteOpResultObject>;
     getCursor(conditions: any, projection: any): import("mongoose").QueryCursor<any>;
-    deleteUnnecessaryProjectAttributesById(params: {
-        id: string;
-    }): Promise<void>;
+    unsetUnnecessaryFields(params: {
+        filter: any;
+        $unset: any;
+    }): Promise<import("mongoose").UpdateWriteOpResult>;
     aggregateEvent(params: {
         project?: {
             id?: {

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
                         }
@@ -647,14 +638,14 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
             const positiveProjectionExists = (projection !== undefined && projection !== null)
-                ? Object.keys(projection)
-                    .some((key) => projection[key] !== 0)
+                ? Object.values(projection)
+                    .some((value) => value !== 0)
                 : false;
             const query = this.eventModel.find({ $and: conditions }, 
             // :1対応(2023-01-25~)
             (positiveProjectionExists)
                 ? projection
-                : Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection));
+                : Object.assign(Object.assign({}, projection), { __v: 0, createdAt: 0, updatedAt: 0 }));
             if (typeof params.limit === 'number') {
                 const page = (typeof params.page === 'number') ? params.page : 1;
                 query.limit(params.limit)
@@ -689,14 +680,14 @@ class MongoRepository {
     findById(params, projection) {
         return __awaiter(this, void 0, void 0, function* () {
             const positiveProjectionExists = (projection !== undefined && projection !== null)
-                ? Object.keys(projection)
-                    .some((key) => projection[key] !== 0)
+                ? Object.values(projection)
+                    .some((value) => value !== 0)
                 : false;
             const doc = yield this.eventModel.findOne({ _id: params.id }, 
             // :1対応(2023-01-25~)
             (positiveProjectionExists)
                 ? projection
-                : Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection))
+                : Object.assign(Object.assign({}, projection), { __v: 0, createdAt: 0, updatedAt: 0 }))
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.eventModel.modelName);
@@ -760,18 +751,9 @@ class MongoRepository {
             .sort({ startDate: factory.sortType.Descending })
             .cursor();
     }
-    deleteUnnecessaryProjectAttributesById(params) {
+    unsetUnnecessaryFields(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.eventModel.updateOne({
-                _id: { $eq: params.id }
-            }, {
-                $unset: {
-                    'location.project': 1,
-                    'workPerformed.project': 1,
-                    'superEvent.location.project': 1,
-                    'superEvent.workPerformed.project': 1
-                }
-            })
+            return this.eventModel.updateMany(params.filter, { $unset: params.$unset })
                 .exec();
         });
     }

package/lib/chevre/repo/mongoose/model/comments.d.ts

@@ -1,5 +1,5 @@
 import * as mongoose from 'mongoose';
-declare const modelName = "CreativeWork";
+declare const modelName = "Comment";
 /**
  * コメントスキーマ
  */

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.schema = exports.modelName = void 0;
 const mongoose = require("mongoose");
-const modelName = 'CreativeWork';
+const modelName = 'Comment';
 exports.modelName = modelName;
 const writeConcern = { j: true, w: 'majority', wtimeout: 10000 };
 /**

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

@@ -196,6 +196,18 @@ schema.index({ additionalProperty: 1, 'priceSpecification.price': 1 }, {
         additionalProperty: { $exists: true }
     }
 });
+schema.index({ validFrom: 1, 'priceSpecification.price': 1 }, {
+    name: 'searchByValidFrom',
+    partialFilterExpression: {
+        validFrom: { $exists: true }
+    }
+});
+schema.index({ validThrough: 1, 'priceSpecification.price': 1 }, {
+    name: 'searchByValidThrough',
+    partialFilterExpression: {
+        validThrough: { $exists: true }
+    }
+});
 mongoose.model(modelName, schema)
     .on('index', 
 // tslint:disable-next-line:no-single-line-block-comment