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

package/lib/chevre/repository.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OwnershipInfo = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.NoteAboutOrder = exports.Note = exports.MovieTicketType = exports.Message = exports.MerchantReturnPolicy = exports.MemberProgram = exports.Member = exports.Issuer = exports.IdentityProvider = exports.Identity = exports.EventSeries = exports.EventSellerMakesOffer = exports.EventOffer = exports.Event = exports.EmailMessage = exports.CustomerType = exports.Customer = exports.Credentials = exports.CreativeWork = exports.ConfirmationNumber = exports.Authorization = exports.CategoryCode = exports.assetTransaction = exports.AssetTransaction = exports.Aggregation = exports.AggregateReservation = exports.AggregateOrder = exports.AggregateOffer = exports.AggregateAssetTransaction = exports.AggregateTask = exports.AggregateScheduledTask = exports.AggregateAction = exports.AdminTask = exports.AdminScheduledTask = exports.AdminAsyncAction = exports.AdminAssetTransaction = exports.AdditionalProperty = exports.action = exports.Action = exports.AccountTitle = exports.AccountingReport = exports.AcceptedOffer = void 0;
-exports.WebSite = exports.rateLimit = exports.TransactionProcess = exports.TransactionNumber = exports.transaction = exports.Transaction = exports.Ticket = exports.AsyncAction = exports.TaskDelayed = exports.Task = exports.ScheduledTask = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceAvailableHour = exports.SellerReturnPolicy = exports.SellerPaymentAccepted = exports.SellerMakesOffer = exports.Seller = exports.Schedule = exports.Role = exports.ReserveInterface = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductHasOfferCatalog = exports.Product = exports.PriceSpecification = exports.PotentialAction = exports.place = exports.Person = exports.PendingReservation = exports.PaymentServiceProvider = exports.PaymentServiceChannel = exports.PaymentService = exports.Passport = void 0;
+exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.NoteAboutOrder = exports.Note = exports.MovieTicketType = exports.Message = exports.MerchantReturnPolicy = exports.MemberProgram = exports.Member = exports.Issuer = exports.IdentityProvider = exports.Identity = exports.EventSeries = exports.EventSellerMakesOffer = exports.EventOffer = exports.Event = exports.EmailMessage = exports.CustomerType = exports.Customer = exports.Credentials = exports.CreativeWork = exports.ConfirmationNumber = exports.Authorization = exports.CategoryCode = exports.assetTransaction = exports.AssetTransaction = exports.Aggregation = exports.AggregateReservation = exports.AggregateOrder = exports.AggregateOffer = exports.AggregateAssetTransaction = exports.AggregateTransaction = exports.AggregateTask = exports.AggregateScheduledTask = exports.AggregateAction = exports.AdminTransaction = exports.AdminTask = exports.AdminScheduledTask = exports.AdminAsyncAction = exports.AdminAssetTransaction = exports.AdditionalProperty = exports.action = exports.Action = exports.AccountTitle = exports.AccountingReport = exports.AcceptedOffer = void 0;
+exports.WebSite = exports.rateLimit = exports.TransactionProcess = exports.TransactionNumber = exports.transaction = exports.Transaction = exports.Ticket = exports.AsyncAction = exports.TaskDelayed = exports.Task = exports.ScheduledTask = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceAvailableHour = exports.SellerReturnPolicy = exports.SellerPaymentAccepted = exports.SellerMakesOffer = exports.Seller = exports.Schedule = exports.Role = exports.ReserveInterface = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductHasOfferCatalog = exports.Product = exports.PriceSpecification = exports.PotentialAction = exports.place = exports.Person = exports.PendingReservation = exports.PaymentServiceProvider = exports.PaymentServiceChannel = exports.PaymentService = exports.Passport = exports.OrderNumber = void 0;
 var AcceptedOffer;
 (function (AcceptedOffer) {
     let repo;
@@ -214,6 +214,17 @@ var AdminTask;
     }
     AdminTask.createInstance = createInstance;
 })(AdminTask || (exports.AdminTask = AdminTask = {}));
+var AdminTransaction;
+(function (AdminTransaction) {
+    let repo;
+    async function createInstance(...params) {
+        if (repo === undefined) {
+            repo = (await import('./repo/adminTransaction.js')).AdminTransactionRepo;
+        }
+        return new repo(...params);
+    }
+    AdminTransaction.createInstance = createInstance;
+})(AdminTransaction || (exports.AdminTransaction = AdminTransaction = {}));
 var AggregateAction;
 (function (AggregateAction) {
     let repo;
@@ -247,6 +258,17 @@ var AggregateTask;
     }
     AggregateTask.createInstance = createInstance;
 })(AggregateTask || (exports.AggregateTask = AggregateTask = {}));
+var AggregateTransaction;
+(function (AggregateTransaction) {
+    let repo;
+    async function createInstance(...params) {
+        if (repo === undefined) {
+            repo = (await import('./repo/aggregateTransaction.js')).AggregateTransactionRepo;
+        }
+        return new repo(...params);
+    }
+    AggregateTransaction.createInstance = createInstance;
+})(AggregateTransaction || (exports.AggregateTransaction = AggregateTransaction = {}));
 var AggregateAssetTransaction;
 (function (AggregateAssetTransaction) {
     let repo;
@@ -646,17 +668,6 @@ var OrderNumber;
     }
     OrderNumber.createInstance = createInstance;
 })(OrderNumber || (exports.OrderNumber = OrderNumber = {}));
-var OwnershipInfo;
-(function (OwnershipInfo) {
-    let repo;
-    async function createInstance(...params) {
-        if (repo === undefined) {
-            repo = (await import('./repo/ownershipInfo.js')).OwnershipInfoRepo;
-        }
-        return new repo(...params);
-    }
-    OwnershipInfo.createInstance = createInstance;
-})(OwnershipInfo || (exports.OwnershipInfo = OwnershipInfo = {}));
 var Passport;
 (function (Passport) {
     let repo;

package/lib/chevre/service/aggregation/system.d.ts

@@ -2,10 +2,10 @@ import type { AggregateActionRepo } from '../../repo/aggregateAction';
 import type { AggregateAssetTransactionRepo } from '../../repo/aggregateAssetTransaction';
 import type { AggregateScheduledTaskRepo } from '../../repo/aggregateScheduledTask';
 import type { AggregateTaskRepo } from '../../repo/aggregateTask';
+import type { AggregateTransactionRepo } from '../../repo/aggregateTransaction';
 import type { AggregationRepo } from '../../repo/aggregation';
 import type { EventRepo } from '../../repo/event';
 import type { OrderRepo } from '../../repo/order';
-import type { TransactionRepo } from '../../repo/transaction';
 type AggregateDurationUnit = 'days' | 'hours';
 interface IAggregateParams {
     aggregateDate: Date;
@@ -37,7 +37,7 @@ declare function aggregatePlaceOrder(params: IAggregateParams & {
     clientIds?: string[];
 }): (repos: {
     agregation: AggregationRepo;
-    transaction: TransactionRepo;
+    aggregateTransaction: AggregateTransactionRepo;
 }) => Promise<{
     aggregationCount: number;
     aggregateDuration: string;

package/lib/chevre/service/aggregation/system.js

@@ -134,7 +134,7 @@ function aggregatePlaceOrder(params) {
                 .add(-i, params.aggregateDurationUnit)
                 .endOf(params.aggregateDurationUnit)
                 .toDate();
-            const aggregateResult = await repos.transaction.aggregatePlaceOrder({
+            const aggregateResult = await repos.aggregateTransaction.aggregatePlaceOrder({
                 project: { id: { $ne: params.excludedProjectId } },
                 startFrom,
                 startThrough,
@@ -144,7 +144,7 @@ function aggregatePlaceOrder(params) {
             const aggregateResultsByClientId = [];
             if (Array.isArray(params.clientIds)) {
                 for (const clientId of params.clientIds) {
-                    const aggregateResultByClientId = await repos.transaction.aggregatePlaceOrder({
+                    const aggregateResultByClientId = await repos.aggregateTransaction.aggregatePlaceOrder({
                         project: { id: { $ne: params.excludedProjectId } },
                         startFrom,
                         startThrough,

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/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.27"
 }

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

@@ -1,13 +0,0 @@
-import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
-import { IVirtuals } from '../virtuals';
-import { factory } from '../../../factory';
-type IDocType = Omit<factory.ownershipInfo.IOwnershipInfo<factory.ownershipInfo.IGood>, 'id'> & {
-    _id: string;
-};
-type IModel = Model<IDocType, Record<string, never>, Record<string, never>, IVirtuals>;
-type ISchemaDefinition = SchemaDefinition<IDocType>;
-type ISchema = Schema<IDocType, IModel, Record<string, never>, Record<string, never>, IVirtuals, Record<string, never>, ISchemaDefinition, IDocType>;
-declare const modelName = "OwnershipInfo";
-declare const indexes: [d: IndexDefinition, o: IndexOptions][];
-declare function createSchema(): ISchema;
-export { createSchema, IDocType, IModel, indexes, modelName };

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;