@chevre/domain 26.0.0-alpha.26 → 26.0.0-alpha.28

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

@@ -2,7 +2,7 @@
  * マスターデータ同期サービス
  */
 import type { COA } from '@motionpicture/coa-service';
-import type { ActionRepo } from '../repo/action';
+import type { UpdateActionRepo } from '../repo/updateAction';
 import type { CategoryCodeRepo } from '../repo/categoryCode';
 import type { CreativeWorkRepo } from '../repo/creativeWork';
 import type { EventRepo } from '../repo/event';
@@ -17,7 +17,7 @@ import { saveScreeningEventSeries } from './event/saveScreeningEventSeries';
  * イベントをインポートする
  */
 declare function importFromCOA(params: IImportFromCOAParams): (repos: {
-    action: ActionRepo;
+    updateAction: UpdateActionRepo;
     categoryCode: CategoryCodeRepo;
     creativeWork: CreativeWorkRepo;
     event: EventRepo;

package/lib/chevre/service/event.js

@@ -70,7 +70,7 @@ function importFromCOA(params) {
             instrument,
             targetCollection: { typeOf: factory_1.factory.eventType.ScreeningEvent }
         };
-        const action = await repos.action.start(actionAttributes);
+        const action = await repos.updateAction.startUpdateAction(actionAttributes);
         let savedScreeningEventsCount = 0;
         let savedScreeningEventSeriesCount = 0;
         let cancelledIds = [];
@@ -131,7 +131,7 @@ function importFromCOA(params) {
         }
         catch (error) {
             try {
-                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                await repos.updateAction.giveUpUpdateAction({ typeOf: action.typeOf, id: action.id, error });
             }
             catch (__) {
                 // 失敗したら仕方ない
@@ -144,7 +144,7 @@ function importFromCOA(params) {
             savedScreeningEventSeriesCount,
             ...(processTime !== undefined) ? { processTime } : undefined
         };
-        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        await repos.updateAction.completeUpdateAction({ typeOf: action.typeOf, id: action.id, result: actionResult });
     };
 }
 function cancelDeletedEvents(params) {

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

@@ -37,12 +37,11 @@ exports.call = call;
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
+const adminTransaction_1 = require("../../repo/adminTransaction");
 const assetTransaction_1 = require("../../repo/assetTransaction");
-// import { MessageRepo } from '../../repo/message';
 const note_1 = require("../../repo/note");
 const order_1 = require("../../repo/order");
 const reservation_1 = require("../../repo/reservation");
-const transaction_1 = require("../../repo/transaction");
 const placeOrder_1 = require("../../repo/transaction/placeOrder");
 const returnOrder_1 = require("../../repo/transaction/returnOrder");
 const TransactionService = __importStar(require("../transaction"));
@@ -56,12 +55,11 @@ function call(params) {
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
             accountingReport: new accountingReport_1.AccountingReportRepo(connection),
             action: new action_1.ActionRepo(connection),
+            adminTransaction: new adminTransaction_1.AdminTransactionRepo(connection),
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
-            // message: new MessageRepo(connection),
             note: new note_1.NoteRepo(connection),
             order: new order_1.OrderRepo(connection),
             reservation: new reservation_1.ReservationRepo(connection),
-            transaction: new transaction_1.TransactionRepo(connection),
             placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
             returnOrder: new returnOrder_1.ReturnOrderRepo(connection),
         });

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

@@ -35,7 +35,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const coa_service_1 = require("@motionpicture/coa-service");
-const action_1 = require("../../repo/action");
+const updateAction_1 = require("../../repo/updateAction");
 const categoryCode_1 = require("../../repo/categoryCode");
 const creativeWork_1 = require("../../repo/creativeWork");
 const event_1 = require("../../repo/event");
@@ -71,7 +71,7 @@ function call(params) {
             ...params.data,
             project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project }
         })({
-            action: new action_1.ActionRepo(connection),
+            updateAction: new updateAction_1.UpdateActionRepo(connection),
             categoryCode: new categoryCode_1.CategoryCodeRepo(connection),
             creativeWork: new creativeWork_1.CreativeWorkRepo(connection),
             event: new event_1.EventRepo(connection),

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

@@ -7,7 +7,7 @@ exports.call = call;
 const coa_service_1 = require("@motionpicture/coa-service");
 const moment_timezone_1 = __importDefault(require("moment-timezone"));
 const factory_1 = require("../../factory");
-const action_1 = require("../../repo/action");
+const updateAction_1 = require("../../repo/updateAction");
 const categoryCode_1 = require("../../repo/categoryCode");
 const creativeWork_1 = require("../../repo/creativeWork");
 const credentials_1 = require("../../repo/credentials");
@@ -53,7 +53,7 @@ function call(params) {
                 ...(credentialsRepo !== undefined) ? { credentialsRepo } : undefined
             });
         }
-        const actionRepo = new action_1.ActionRepo(connection);
+        const updateActionRepo = new updateAction_1.UpdateActionRepo(connection);
         try {
             const masterService = new coa_service_1.COA.service.Master({
                 endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
@@ -67,7 +67,7 @@ function call(params) {
                     object,
                     sameAs: { id: params.id }
                 })({
-                    action: actionRepo,
+                    updateAction: updateActionRepo,
                     categoryCode: new categoryCode_1.CategoryCodeRepo(connection),
                     creativeWork: new creativeWork_1.CreativeWorkRepo(connection),
                     eventSeries: new eventSeries_1.EventSeriesRepo(connection),
@@ -82,7 +82,7 @@ function call(params) {
                     object,
                     sameAs: { id: params.id }
                 })({
-                    action: actionRepo,
+                    updateAction: updateActionRepo,
                     categoryCode: new categoryCode_1.CategoryCodeRepo(connection),
                     creativeWork: new creativeWork_1.CreativeWorkRepo(connection),
                     event: new event_1.EventRepo(connection),
@@ -96,7 +96,7 @@ function call(params) {
         catch (error) {
             let throwsError = true;
             // アクションが存在すればタスクを実行済扱いにする
-            const action = (await actionRepo.searchBySameAs({
+            const action = (await updateActionRepo.searchBySameAs({
                 sameAs: { id: { $eq: params.id } },
                 typeOf: { $eq: factory_1.factory.actionType.ReplaceAction }
             })).shift();
@@ -129,7 +129,7 @@ function syncEventSeries(params) {
             targetCollection: { typeOf: factory_1.factory.eventType.ScreeningEventSeries },
             sameAs: { id: params.sameAs.id, typeOf: 'Task' }
         };
-        const action = await repos.action.start(actionAttributes);
+        const action = await repos.updateAction.startUpdateAction(actionAttributes);
         let saveResult;
         try {
             const movieTheater = (await repos.movieTheater.projectFields({
@@ -165,7 +165,7 @@ function syncEventSeries(params) {
         }
         catch (error) {
             try {
-                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                await repos.updateAction.giveUpUpdateAction({ typeOf: action.typeOf, id: action.id, error });
             }
             catch (__) {
                 // no op
@@ -178,7 +178,7 @@ function syncEventSeries(params) {
                 typeOf: eventSeries.typeOf
             };
         });
-        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result });
+        await repos.updateAction.completeUpdateAction({ typeOf: action.typeOf, id: action.id, result });
     };
 }
 function syncEvents(params) {
@@ -198,7 +198,7 @@ function syncEvents(params) {
             targetCollection: { typeOf: factory_1.factory.eventType.ScreeningEvent },
             sameAs: { id: params.sameAs.id, typeOf: 'Task' }
         };
-        const action = await repos.action.start(actionAttributes);
+        const action = await repos.updateAction.startUpdateAction(actionAttributes);
         let saveResult;
         try {
             const movieTheater = (await repos.movieTheater.projectFields({
@@ -280,7 +280,7 @@ function syncEvents(params) {
         }
         catch (error) {
             try {
-                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                await repos.updateAction.giveUpUpdateAction({ typeOf: action.typeOf, id: action.id, error });
             }
             catch (__) {
                 // no op
@@ -293,6 +293,6 @@ function syncEvents(params) {
                 typeOf: event.typeOf
             };
         });
-        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result });
+        await repos.updateAction.completeUpdateAction({ typeOf: action.typeOf, id: action.id, result });
     };
 }

package/lib/chevre/service/transaction/deleteTransaction.d.ts

@@ -2,22 +2,22 @@ import { factory } from '../../factory';
 import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { AccountingReportRepo } from '../../repo/accountingReport';
 import type { ActionRepo } from '../../repo/action';
+import type { AdminTransactionRepo } from '../../repo/adminTransaction';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { NoteRepo } from '../../repo/note';
 import type { OrderRepo } from '../../repo/order';
 import type { ReservationRepo } from '../../repo/reservation';
-import type { TransactionRepo } from '../../repo/transaction';
 import type { PlaceOrderRepo } from '../../repo/transaction/placeOrder';
 import type { ReturnOrderRepo } from '../../repo/transaction/returnOrder';
 interface IDeleteTransactionRepos {
     acceptedOffer: AcceptedOfferRepo;
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
+    adminTransaction: AdminTransactionRepo;
     assetTransaction: AssetTransactionRepo;
     note: NoteRepo;
     order: OrderRepo;
     reservation: ReservationRepo;
-    transaction: TransactionRepo;
     placeOrder: PlaceOrderRepo;
     returnOrder: ReturnOrderRepo;
 }

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

@@ -132,13 +132,13 @@ function deleteTransactionById(params) {
                     // })(repos);
                     // deleteMessagessResult = deleteMessagesByPlaceOrderResult.deleteResult;
                     // 取引削除
-                    await repos.transaction.findByIdAndDelete({ id: transaction.id });
+                    await repos.adminTransaction.findByIdAndDelete({ id: transaction.id });
                     break;
                 }
                 // implemented(2022-06-09~)
                 case factory_1.factory.transactionType.ReturnOrder:
                     // 取引削除
-                    await repos.transaction.findByIdAndDelete({ id: transaction.id });
+                    await repos.adminTransaction.findByIdAndDelete({ id: transaction.id });
                     break;
                 default:
                     throw new factory_1.factory.errors.NotImplemented(`${transactionTypeOf} not implemented`);

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.1090.0",
     "@aws-sdk/credential-providers": "3.1090.0",
-    "@chevre/factory": "10.3.0-alpha.3",
+    "@chevre/factory": "10.3.0-alpha.4",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "26.0.0-alpha.26"
+  "version": "26.0.0-alpha.28"
 }

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

@@ -1,82 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.modelName = exports.indexes = void 0;
-exports.createSchema = createSchema;
-const mongoose_1 = require("mongoose");
-const writeConcern_1 = require("../writeConcern");
-const settings_1 = require("../../../settings");
-const modelName = 'OwnershipInfo';
-exports.modelName = modelName;
-const schemaDefinition = {
-    project: { type: mongoose_1.SchemaTypes.Mixed, required: true },
-    _id: String,
-    typeOf: { type: String, required: true },
-    identifier: { type: String, required: true },
-    ownedBy: mongoose_1.SchemaTypes.Mixed,
-    acquiredFrom: mongoose_1.SchemaTypes.Mixed,
-    ownedFrom: { type: Date, required: true },
-    ownedThrough: { type: Date, required: true },
-    typeOfGood: mongoose_1.SchemaTypes.Mixed
-};
-const schemaOptions = {
-    autoIndex: settings_1.MONGO_AUTO_INDEX,
-    autoCreate: false,
-    collection: 'ownershipInfos',
-    id: true,
-    read: 'primary',
-    writeConcern: writeConcern_1.writeConcern,
-    strict: true,
-    strictQuery: false,
-    timestamps: false,
-    versionKey: false,
-    toJSON: {
-        getters: false,
-        virtuals: false,
-        minimize: false,
-        versionKey: false
-    },
-    toObject: {
-        getters: false,
-        virtuals: true,
-        minimize: false,
-        versionKey: false
-    }
-};
-const indexes = [
-    [
-        // 識別子はユニークな前提
-        { identifier: 1 },
-        {
-            unique: true,
-            name: 'uniqueIdentifier'
-        }
-    ],
-    [
-        { ownedFrom: -1 },
-        { name: 'searchByOwnedFrom-v3' }
-    ],
-    [
-        { 'project.id': 1, ownedFrom: -1 },
-        { name: 'searchByProjectId-v20220721' }
-    ],
-    [
-        { ownedThrough: 1, ownedFrom: -1 },
-        { name: 'ownedThrough' }
-    ]
-];
-exports.indexes = indexes;
-/**
- * 所有権スキーマ
- */
-let schema;
-function createSchema() {
-    if (schema === undefined) {
-        schema = new mongoose_1.Schema(schemaDefinition, schemaOptions);
-        if (settings_1.MONGO_AUTO_INDEX) {
-            indexes.forEach((indexParams) => {
-                schema?.index(...indexParams);
-            });
-        }
-    }
-    return schema;
-}

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

@@ -1,20 +0,0 @@
-import type { Connection, FilterQuery } from 'mongoose';
-import { IDocType } from './mongoose/schemas/ownershipInfo';
-import { factory } from '../factory';
-type IOwnershipInfoWithId = factory.ownershipInfo.IOwnershipInfo<factory.ownershipInfo.IGood> & {
-    id: string;
-};
-type IFindParams = factory.ownershipInfo.ISearchConditions;
-/**
- * 所有権リポジトリ
- */
-export declare class OwnershipInfoRepo {
-    private readonly ownershipInfoModel;
-    constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: Pick<IFindParams, 'ownedFromGte' | 'ownedFromLte' | 'project'>): FilterQuery<IDocType>[];
-    /**
-     * 所有権を検索する
-     */
-    findOwnershipInfos(params: IFindParams, inclusion?: (keyof IOwnershipInfoWithId)[]): Promise<IOwnershipInfoWithId[]>;
-}
-export {};

package/lib/chevre/repo/ownershipInfo.js

@@ -1,130 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OwnershipInfoRepo = void 0;
-// import { v4 } from 'uuid';
-const ownershipInfo_1 = require("./mongoose/schemas/ownershipInfo");
-const settings_1 = require("../settings");
-/**
- * 所有権リポジトリ
- */
-class OwnershipInfoRepo {
-    ownershipInfoModel;
-    constructor(connection) {
-        this.ownershipInfoModel = connection.model(ownershipInfo_1.modelName, (0, ownershipInfo_1.createSchema)());
-    }
-    static CREATE_MONGO_CONDITIONS(params) {
-        const andConditions = [];
-        const projectIdEq = params.project?.id?.$eq;
-        if (typeof projectIdEq === 'string') {
-            andConditions.push({ 'project.id': { $eq: projectIdEq } });
-        }
-        const ownedFromGte = params.ownedFromGte;
-        if (ownedFromGte instanceof Date) {
-            andConditions.push({
-                ownedFrom: { $gte: ownedFromGte }
-            });
-        }
-        const ownedFromLte = params.ownedFromLte;
-        if (ownedFromLte instanceof Date) {
-            andConditions.push({
-                ownedFrom: { $lte: ownedFromLte }
-            });
-        }
-        return andConditions;
-    }
-    // /**
-    //  * なければ作成する
-    //  */
-    // public async createIfNotExistByIdentifier(ownershipInfo: Omit<IOwnershipInfoWithId, 'id'>): Promise<{ id: string }> {
-    //     let doc: { id: string } | undefined | null;
-    //     let duplicate = false;
-    //     try {
-    //         doc = await this.ownershipInfoModel.findOneAndUpdate(
-    //             { identifier: { $eq: ownershipInfo.identifier } },
-    //             {
-    //                 // insert時以外は何もしなくてもよい
-    //                 $setOnInsert: {
-    //                     ...ownershipInfo,
-    //                     _id: v4() // 新規作成時は所有権ID発行
-    //                 }
-    //             },
-    //             {
-    //                 new: true,
-    //                 upsert: true,
-    //                 projection: {
-    //                     _id: 0,
-    //                     id: { $toString: '$_id' }
-    //                 }
-    //             }
-    //         )
-    //             .lean<{ id: string }>()
-    //             .exec();
-    //     } catch (error) {
-    //         if (await isMongoDuplicateError(error)) {
-    //             // すでに所有権が存在する場合ok
-    //             duplicate = true;
-    //         }
-    //         if (!duplicate) {
-    //             throw error;
-    //         }
-    //     }
-    //     if (duplicate) {
-    //         // 重複の場合、再度取得
-    //         doc = await this.ownershipInfoModel.findOne(
-    //             { identifier: { $eq: ownershipInfo.identifier } },
-    //             {
-    //                 _id: 0,
-    //                 id: { $toString: '$_id' }
-    //             }
-    //         )
-    //             .lean<{ id: string }>()
-    //             .exec();
-    //     }
-    //     if (doc === undefined || doc === null) {
-    //         throw new factory.errors.NotFound(this.ownershipInfoModel.modelName);
-    //     }
-    //     return { id: doc.id };
-    // }
-    /**
-     * 所有権を検索する
-     */
-    async findOwnershipInfos(params, inclusion) {
-        const conditions = OwnershipInfoRepo.CREATE_MONGO_CONDITIONS(params);
-        let projection = {
-            _id: 0,
-            id: { $toString: '$_id' },
-            project: 1,
-            typeOf: 1,
-            identifier: 1,
-            ownedBy: 1,
-            acquiredFrom: 1,
-            ownedFrom: 1,
-            ownedThrough: 1,
-            typeOfGood: 1
-        };
-        const positiveProjectionFields = (Array.isArray(inclusion))
-            ? inclusion.filter((key) => key !== 'id' && String(key) !== '_id')
-            : undefined;
-        if (Array.isArray(positiveProjectionFields)) {
-            projection = {
-                _id: 0,
-                id: { $toString: '$_id' },
-                ...Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1])))
-            };
-        }
-        const query = this.ownershipInfoModel.find((conditions.length > 0) ? { $and: conditions } : {}, projection);
-        if (typeof params.limit === 'number' && params.limit > 0) {
-            const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
-            query.limit(params.limit)
-                .skip(params.limit * (page - 1));
-        }
-        /* istanbul ignore else */
-        if (params.sort?.ownedFrom !== undefined) {
-            query.sort({ ownedFrom: params.sort.ownedFrom });
-        }
-        return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-            .lean() // lean(2024-08-19~)
-            .exec();
-    }
-}
-exports.OwnershipInfoRepo = OwnershipInfoRepo;