@chevre/domain 20.4.0-alpha.0 → 20.4.0-alpha.10

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/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/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

@@ -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/accountTransaction.d.ts

@@ -34,7 +34,6 @@ export declare class MongoRepository {
     confirm<T extends factory.account.transactionType>(params: {
         typeOf?: T;
         id: string;
-        result: factory.account.transaction.IResult;
         potentialActions: factory.account.transaction.IPotentialActions;
     }): Promise<factory.account.transaction.ITransaction<T>>;
     /**

package/lib/chevre/repo/accountTransaction.js

@@ -154,7 +154,7 @@ class MongoRepository {
             const doc = yield this.transactionModel.findOneAndUpdate(Object.assign({ _id: params.id, status: factory.transactionStatusType.InProgress }, (typeof params.typeOf === 'string') ? { typeOf: params.typeOf } : undefined), {
                 status: factory.transactionStatusType.Confirmed,
                 endDate: new Date(),
-                result: params.result,
+                // result: params.result, // resultを更新
                 potentialActions: params.potentialActions
             }, { new: true })
                 .exec();

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/comment.d.ts

@@ -0,0 +1,31 @@
+import { Connection } from 'mongoose';
+import * as factory from '../factory';
+/**
+ * コメントリポジトリ
+ */
+export declare class MongoRepository {
+    private readonly commentModel;
+    constructor(connection: Connection);
+    static CREATE_MONGO_CONDITIONS(params: factory.creativeWork.comment.ISearchConditions): any[];
+    /**
+     * 検索
+     */
+    search(params: factory.creativeWork.comment.ISearchConditions): Promise<factory.creativeWork.comment.IComment[]>;
+    findById(params: {
+        id: string;
+    }): Promise<factory.creativeWork.comment.IComment>;
+    create(params: factory.creativeWork.comment.IComment): Promise<factory.creativeWork.comment.IComment>;
+    updateById(params: {
+        id?: string;
+        attributes: {
+            text: string;
+        };
+    }): Promise<void>;
+    /**
+     * 削除する
+     */
+    deleteById(params: {
+        id: string;
+    }): Promise<void>;
+    getCursor(conditions: any, projection: any): import("mongoose").QueryCursor<any>;
+}

package/lib/chevre/repo/comment.js

@@ -0,0 +1,113 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MongoRepository = void 0;
+const comments_1 = require("./mongoose/model/comments");
+const factory = require("../factory");
+/**
+ * コメントリポジトリ
+ */
+class MongoRepository {
+    constructor(connection) {
+        this.commentModel = connection.model(comments_1.modelName);
+    }
+    static CREATE_MONGO_CONDITIONS(params) {
+        var _a, _b, _c, _d, _e, _f;
+        const andConditions = [];
+        const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
+        if (typeof projectIdEq === 'string') {
+            andConditions.push({ 'project.id': { $eq: projectIdEq } });
+        }
+        const aboutIdEq = (_d = (_c = params.about) === null || _c === void 0 ? void 0 : _c.id) === null || _d === void 0 ? void 0 : _d.$eq;
+        if (typeof aboutIdEq === 'string') {
+            andConditions.push({ 'about.id': { $exists: true, $eq: aboutIdEq } });
+        }
+        const aboutIdIn = (_f = (_e = params.about) === null || _e === void 0 ? void 0 : _e.id) === null || _f === void 0 ? void 0 : _f.$in;
+        if (Array.isArray(aboutIdIn)) {
+            andConditions.push({ 'about.id': { $exists: true, $in: aboutIdIn } });
+        }
+        return andConditions;
+    }
+    /**
+     * 検索
+     */
+    search(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
+            const query = this.commentModel.find((conditions.length > 0) ? { $and: conditions } : {}, {
+                __v: 0,
+                createdAt: 0,
+                updatedAt: 0
+            });
+            if (typeof params.limit === 'number') {
+                const page = (typeof params.page === 'number') ? params.page : 1;
+                query.limit(params.limit)
+                    .skip(params.limit * (page - 1));
+            }
+            // tslint:disable-next-line:no-single-line-block-comment
+            /* istanbul ignore else */
+            if (params.sort !== undefined) {
+                query.sort(params.sort);
+            }
+            return query.setOptions({ maxTimeMS: 10000 })
+                .exec()
+                .then((docs) => docs.map((doc) => doc.toObject()));
+        });
+    }
+    findById(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const doc = yield this.commentModel.findOne({ _id: params.id }, {
+                __v: 0,
+                createdAt: 0,
+                updatedAt: 0
+            })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(this.commentModel.modelName);
+            }
+            return doc.toObject();
+        });
+    }
+    create(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const creatingDoc = Object.assign({ about: params.about, author: params.author, dateCreated: new Date(), project: params.project, text: params.text, typeOf: factory.creativeWorkType.Comment }, (Array.isArray(params.additionalProperty)) ? { additionalProperty: params.additionalProperty } : undefined);
+            const doc = yield this.commentModel.create(creatingDoc);
+            return doc.toObject();
+        });
+    }
+    updateById(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const updateFields = {
+                $set: Object.assign({ dateModified: new Date() }, (typeof params.attributes.text === 'string') ? { text: params.attributes.text } : undefined)
+            };
+            const doc = yield this.commentModel.findOneAndUpdate({ _id: params.id }, updateFields, { upsert: false, new: true })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(this.commentModel.modelName);
+            }
+        });
+    }
+    /**
+     * 削除する
+     */
+    deleteById(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.commentModel.findOneAndRemove({ _id: params.id })
+                .exec();
+        });
+    }
+    getCursor(conditions, projection) {
+        return this.commentModel.find(conditions, projection)
+            .sort({ codeValue: factory.sortType.Ascending })
+            .cursor();
+    }
+}
+exports.MongoRepository = MongoRepository;

package/lib/chevre/repo/event.js

@@ -466,10 +466,14 @@ class MongoRepository {
             if (Array.isArray(params)) {
                 params.forEach((creatingEventParams) => {
                     var _a, _b;
+                    if (creatingEventParams.attributes.typeOf !== factory.eventType.ScreeningEvent) {
+                        throw new factory.errors.NotImplemented(`${factory.eventType.ScreeningEventSeries} not implemented`);
+                    }
                     const additionalPropertyValue = (_b = (_a = creatingEventParams.attributes.additionalProperty) === null || _a === void 0 ? void 0 : _a.find((property) => property.name === creatingEventParams.filter.name)) === null || _b === void 0 ? void 0 : _b.value;
                     if (typeof additionalPropertyValue !== 'string') {
                         throw new factory.errors.NotFound('additionalProperty.value');
                     }
+                    const _c = creatingEventParams.attributes, { eventStatus } = _c, setOnInsertFields = __rest(_c, ["eventStatus"]);
                     bulkWriteOps.push({
                         updateOne: {
                             filter: {
@@ -481,7 +485,9 @@ class MongoRepository {
                                 }
                             },
                             update: {
-                                $setOnInsert: Object.assign({ _id: uniqid() }, creatingEventParams.attributes)
+                                $setOnInsert: Object.assign(Object.assign({}, setOnInsertFields), { _id: uniqid() }),
+                                // 変更可能な属性のみ上書き
+                                $set: { eventStatus }
                             },
                             upsert: true
                         }

package/lib/chevre/repo/mongoose/model/{accountAction.d.ts → comments.d.ts}

@@ -1,7 +1,7 @@
 import * as mongoose from 'mongoose';
-declare const modelName = "AccountAction";
+declare const modelName = "Comment";
 /**
- * アクションスキーマ
+ * コメントスキーマ
  */
 declare const schema: mongoose.Schema<mongoose.Document<any, any, any>, mongoose.Model<mongoose.Document<any, any, any>, any, any>, undefined, {}>;
 export { modelName, schema };