@chevre/domain 25.2.0-alpha.12 → 25.2.0-alpha.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/lib/chevre/repo/action.d.ts +16 -9
  2. package/lib/chevre/repo/action.js +99 -180
  3. package/lib/chevre/service/order/deleteOrder.d.ts +5 -1
  4. package/lib/chevre/service/order/deleteOrder.js +8 -1
  5. package/lib/chevre/service/transaction/deleteTransaction.js +5 -3
  6. package/package.json +1 -1
package/lib/chevre/repo/action.d.ts CHANGED
@@ -9,6 +9,10 @@ export { ICancelActionAction };
9
9
  */
10
10
  type StartableActionType = Exclude<factory.actionType, factory.actionType.AcceptAction | factory.actionType.CheckAction | factory.actionType.AuthorizeAction | factory.actionType.PayAction | factory.actionType.RefundAction>;
11
11
  type IAvailableActionRecipe = IActionRecipe<Exclude<factory.recipe.RecipeCategory, factory.recipe.RecipeCategory.publishPaymentUrl | factory.recipe.RecipeCategory.checkMovieTicket | factory.recipe.RecipeCategory.acceptCOAOffer | factory.recipe.RecipeCategory.authorizeInvoice | factory.recipe.RecipeCategory.authorizeInvoice3ds | factory.recipe.RecipeCategory.payCreditCard | factory.recipe.RecipeCategory.payMovieTicket | factory.recipe.RecipeCategory.refundCreditCard | factory.recipe.RecipeCategory.refundMovieTicket>>;
12
+ export interface IDeleteActionResult {
13
+ identifier: string;
14
+ deletedCount?: number;
15
+ }
12
16
  /**
13
17
  * アクションリポジトリ
14
18
  */
@@ -50,15 +54,20 @@ export declare class ActionRepo extends ActionProcessRepo<IAction<StartableActio
50
54
  orderNumber: string;
51
55
  sort?: factory.action.ISortOrder;
52
56
  }): Promise<IAction<factory.actionType>[]>;
57
+ /**
58
+ * 注文番号から、注文に対するアクションを削除する
59
+ */
60
+ deleteActionsByOrderNumber(params: {
61
+ project: {
62
+ id: string;
63
+ };
64
+ orderNumber: string;
65
+ }): Promise<IDeleteActionResult[]>;
53
66
  deleteByProject(params: {
54
67
  project: {
55
68
  id: string;
56
69
  };
57
70
  }): Promise<void>;
58
- /**
59
- * イベントと入場ゲート指定で予約使用アクションを集計する
60
- * discontinue(2024-12-26~)
61
- */
62
71
  /**
63
72
  * 開始日時を一定期間過ぎたアクションを削除する
64
73
  */
@@ -78,20 +87,18 @@ export declare class ActionRepo extends ActionProcessRepo<IAction<StartableActio
78
87
  /**
79
88
  * 取引からアクションを削除する
80
89
  */
81
- deleteByPurpose(params: {
90
+ deleteActionsByTransactionId(params: {
82
91
  project: {
83
92
  id: string;
84
93
  };
85
- purpose: {
94
+ transaction: {
86
95
  typeOf: factory.transactionType;
87
96
  id: string;
88
97
  };
89
98
  typeOf: {
90
99
  $in: factory.actionType[];
91
100
  };
92
- }): Promise<{
93
- deletedCount?: number;
94
- } | null>;
101
+ }): Promise<IDeleteActionResult[]>;
95
102
  getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<import("@chevre/factory/lib/chevre/action").IAction<import("@chevre/factory/lib/chevre/action").IAttributes<factory.actionType, any, any>>, "id"> & {
96
103
  identifier?: string;
97
104
  } & {
package/lib/chevre/repo/action.js CHANGED
@@ -312,130 +312,68 @@ class ActionRepo extends actionProcess_1.ActionProcessRepo {
312
312
  .lean() // 2024-08-26~
313
313
  .exec();
314
314
  }
315
+ /**
316
+ * 注文番号から、注文に対するアクションを削除する
317
+ */
318
+ async deleteActionsByOrderNumber(params) {
319
+ const { project, orderNumber } = params;
320
+ if (typeof project.id !== 'string' || project.id === '') {
321
+ throw new factory_1.factory.errors.ArgumentNull('project.id');
322
+ }
323
+ if (typeof orderNumber !== 'string' || orderNumber === '') {
324
+ throw new factory_1.factory.errors.ArgumentNull('orderNumber');
325
+ }
326
+ const filters = [
327
+ {
328
+ identifier: 'byObject',
329
+ filter: {
330
+ 'project.id': { $eq: project.id },
331
+ 'object.orderNumber': { $exists: true, $eq: orderNumber }
332
+ }
333
+ },
334
+ {
335
+ identifier: 'byPurpose',
336
+ filter: {
337
+ 'project.id': { $eq: project.id },
338
+ 'purpose.orderNumber': { $exists: true, $eq: orderNumber }
339
+ }
340
+ },
341
+ {
342
+ identifier: 'byAbout',
343
+ filter: {
344
+ 'project.id': { $eq: project.id },
345
+ 'about.orderNumber': { $exists: true, $eq: orderNumber }
346
+ }
347
+ },
348
+ {
349
+ identifier: 'byInstrument',
350
+ filter: {
351
+ 'project.id': { $eq: project.id },
352
+ 'instrument.orderNumber': { $exists: true, $eq: orderNumber }
353
+ }
354
+ },
355
+ ];
356
+ return Promise.all(filters.map(async ({ identifier, filter }) => {
357
+ return this.actionModel.deleteMany(filter)
358
+ .exec()
359
+ .then((result) => {
360
+ return {
361
+ identifier,
362
+ // n: result?.n,
363
+ // opTime: result.opTime,
364
+ // ok: result?.ok,
365
+ // operationTime,
366
+ deletedCount: result?.deletedCount
367
+ };
368
+ });
369
+ }));
370
+ }
315
371
  async deleteByProject(params) {
316
372
  await this.actionModel.deleteMany({
317
373
  'project.id': { $eq: params.project.id }
318
374
  })
319
375
  .exec();
320
376
  }
321
- // public async reCompleteAuthorizeEventOfferAction(params: {
322
- // id: string;
323
- // object: factory.action.authorize.offer.eventService.IObject;
324
- // result: factory.action.authorize.offer.eventService.IResult;
325
- // }): Promise<void> {
326
- // return this.actionModel.findOneAndUpdate(
327
- // {
328
- // // typeOf: factory.actionType.AuthorizeAction,
329
- // _id: { $eq: params.id },
330
- // // ActiveActionStatus->CompletedActionStatusで再実装(2024-01-15~)
331
- // // actionStatus: factory.actionStatusType.CompletedActionStatus
332
- // actionStatus: { $eq: factory.actionStatusType.ActiveActionStatus }
333
- // },
334
- // {
335
- // $set: {
336
- // actionStatus: factory.actionStatusType.CompletedActionStatus,
337
- // object: params.object,
338
- // result: params.result,
339
- // endDate: new Date()
340
- // }
341
- // },
342
- // { new: true, projection: { _id: 1 } }
343
- // )
344
- // .lean<{ _id: ObjectId }>()
345
- // .exec()
346
- // .then((doc) => {
347
- // if (doc === null) {
348
- // throw new factory.errors.NotFound(this.actionModel.modelName);
349
- // }
350
- // });
351
- // }
352
- // public async updateById(params: {
353
- // id: string;
354
- // update: any;
355
- // }): Promise<void> {
356
- // await this.actionModel.updateOne(
357
- // { _id: { $eq: params.id } },
358
- // params.update
359
- // )
360
- // .exec();
361
- // }
362
- // public async findByIdAndUpdate(params: {
363
- // id: string;
364
- // update: UpdateQuery<IAction<factory.actionType>>;
365
- // }): Promise<void> {
366
- // await this.actionModel.findOneAndUpdate(
367
- // { _id: { $eq: params.id } },
368
- // params.update,
369
- // { projection: { _id: 1 } }
370
- // )
371
- // .lean<{ _id: ObjectId }>()
372
- // .exec()
373
- // .then((doc) => {
374
- // if (doc === null) {
375
- // throw new factory.errors.NotFound(this.actionModel.modelName);
376
- // }
377
- // });
378
- // }
379
- /**
380
- * イベントと入場ゲート指定で予約使用アクションを集計する
381
- * discontinue(2024-12-26~)
382
- */
383
- // public async countUseActionsByEntranceGate(params: {
384
- // event: { id: string };
385
- // entranceGateIdentifier: string;
386
- // }): Promise<IUseActionCountByOffer[]> {
387
- // return this.actionModel.aggregate([
388
- // {
389
- // $match: {
390
- // actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus }
391
- // }
392
- // },
393
- // {
394
- // $match: {
395
- // typeOf: { $eq: factory.actionType.UseAction }
396
- // }
397
- // },
398
- // {
399
- // $match: {
400
- // 'object.typeOf': {
401
- // $exists: true,
402
- // $eq: factory.reservationType.EventReservation
403
- // }
404
- // }
405
- // },
406
- // {
407
- // $match: {
408
- // 'object.reservationFor.id': {
409
- // $exists: true,
410
- // $eq: params.event.id
411
- // }
412
- // }
413
- // },
414
- // {
415
- // $match: {
416
- // 'location.identifier': {
417
- // $exists: true,
418
- // $eq: params.entranceGateIdentifier
419
- // }
420
- // }
421
- // },
422
- // {
423
- // $group: {
424
- // _id: '$object.id',
425
- // object: { $first: '$object' }
426
- // }
427
- // },
428
- // {
429
- // $group: {
430
- // _id: '$object.reservedTicket.ticketType.id',
431
- // useActionCount: {
432
- // $sum: 1
433
- // }
434
- // }
435
- // }
436
- // ])
437
- // .exec();
438
- // }
439
377
  /**
440
378
  * 開始日時を一定期間過ぎたアクションを削除する
441
379
  */
@@ -473,69 +411,50 @@ class ActionRepo extends actionProcess_1.ActionProcessRepo {
473
411
  /**
474
412
  * 取引からアクションを削除する
475
413
  */
476
- async deleteByPurpose(params) {
477
- return this.actionModel.deleteMany({
478
- 'project.id': { $eq: params.project.id },
479
- typeOf: { $in: params.typeOf.$in },
480
- 'purpose.id': { $exists: true, $eq: params.purpose.id },
481
- 'purpose.typeOf': { $exists: true, $eq: params.purpose.typeOf }
482
- })
483
- .exec()
484
- .then((result) => {
485
- return {
486
- // n: result?.n,
487
- // opTime: result.opTime,
488
- // ok: result?.ok,
489
- // operationTime,
490
- deletedCount: result?.deletedCount
491
- };
492
- });
414
+ async deleteActionsByTransactionId(params) {
415
+ const { project, transaction } = params;
416
+ if (typeof project.id !== 'string' || project.id === '') {
417
+ throw new factory_1.factory.errors.ArgumentNull('project.id');
418
+ }
419
+ if (typeof transaction.id !== 'string' || transaction.id === '') {
420
+ throw new factory_1.factory.errors.ArgumentNull('transaction.id ');
421
+ }
422
+ const filters = [
423
+ {
424
+ identifier: 'byPurpose',
425
+ filter: {
426
+ 'project.id': { $eq: project.id },
427
+ typeOf: { $in: params.typeOf.$in },
428
+ 'purpose.id': { $exists: true, $eq: transaction.id },
429
+ 'purpose.typeOf': { $exists: true, $eq: transaction.typeOf }
430
+ }
431
+ },
432
+ // instrumentによるアクション削除にも対応(2026-07-10~)
433
+ {
434
+ identifier: 'byInstrument',
435
+ filter: {
436
+ 'project.id': { $eq: project.id },
437
+ // typeOf: { $in: params.typeOf.$in }, // typOfでフィルターしない
438
+ 'instrument.id': { $exists: true, $eq: transaction.id },
439
+ 'instrument.typeOf': { $exists: true, $eq: transaction.typeOf }
440
+ }
441
+ }
442
+ ];
443
+ return Promise.all(filters.map(async ({ identifier, filter }) => {
444
+ return this.actionModel.deleteMany(filter)
445
+ .exec()
446
+ .then((result) => {
447
+ return {
448
+ identifier,
449
+ // n: result?.n,
450
+ // opTime: result.opTime,
451
+ // ok: result?.ok,
452
+ // operationTime,
453
+ deletedCount: result?.deletedCount
454
+ };
455
+ });
456
+ }));
493
457
  }
494
- // public async saveActionWithEndDate(savingAction: Omit<factory.action.authorize.invoice.IAction, 'id'>) {
495
- // const { sameAs, typeOf, project, agent, object, ...updateFields } = savingAction;
496
- // const filter: FilterQuery<factory.recipe.IRecipe> = {
497
- // 'project.id': { $eq: project.id },
498
- // // 'agent.id': { $exists: true, $eq: agent.id },
499
- // // 'object.typeOf': { $exists: true, $eq: object.typeOf },
500
- // 'object.paymentMethodId': { $exists: true, $eq: object.paymentMethodId },
501
- // typeOf: { $eq: typeOf },
502
- // 'sameAs.id': { $exists: true, $eq: sameAs.id }
503
- // };
504
- // const setOnInsert: AnyKeys<IAction<factory.actionType>> = { typeOf, project, agent, object, sameAs };
505
- // const setKeys: AnyKeys<IAction<factory.actionType>> = updateFields;
506
- // const update: UpdateQuery<IAction<factory.actionType>> = {
507
- // $setOnInsert: setOnInsert,
508
- // $set: setKeys
509
- // };
510
- // return this.actionModel.updateOne<HydratedDocument<IRecipeAsDocument>>(
511
- // filter,
512
- // update,
513
- // {
514
- // upsert: true,
515
- // includeResultMetadata: true
516
- // }
517
- // )
518
- // .exec();
519
- // }
520
- // public async findRecipeByAction<T extends factory.recipe.RecipeCategory>(params: {
521
- // project: { id: string };
522
- // recipeFor: { id: string };
523
- // }): Promise<Pick<IActionRecipe<T>, 'step' | 'recipeCategory'> | null> {
524
- // return this.actionRecipeModel.findOne(
525
- // {
526
- // 'project.id': { $eq: params.project.id },
527
- // 'recipeFor.id': { $eq: params.recipeFor.id }
528
- // },
529
- // { step: 1, recipeCategory: 1 }
530
- // // { lean: true }
531
- // )
532
- // .lean<Pick<IActionRecipe<T>, 'step' | 'recipeCategory'>>()
533
- // .exec();
534
- // // if (result === null) {
535
- // // throw new factory.errors.NotFound(this.actionRecipeModel.modelName);
536
- // // }
537
- // // return result;
538
- // }
539
458
  getCursor(conditions, projection) {
540
459
  return this.actionModel.find(conditions, projection)
541
460
  .sort({ startDate: factory_1.factory.sortType.Descending })
package/lib/chevre/service/order/deleteOrder.d.ts CHANGED
@@ -1,5 +1,6 @@
1
1
  import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
2
2
  import type { AccountingReportRepo } from '../../repo/accountingReport';
3
+ import type { IDeleteActionResult, ActionRepo } from '../../repo/action';
3
4
  import type { NoteRepo } from '../../repo/note';
4
5
  import type { OrderRepo } from '../../repo/order';
5
6
  import type { ReservationRepo } from '../../repo/reservation';
@@ -17,8 +18,11 @@ declare function deleteOrder(params: {
17
18
  }): (repos: {
18
19
  acceptedOffer: AcceptedOfferRepo;
19
20
  accountingReport: AccountingReportRepo;
21
+ action: ActionRepo;
20
22
  note: NoteRepo;
21
23
  order: OrderRepo;
22
24
  reservation: ReservationRepo;
23
- }) => Promise<void>;
25
+ }) => Promise<{
26
+ deleteActionsResult: IDeleteActionResult[];
27
+ }>;
24
28
  export { deleteOrder };
package/lib/chevre/service/order/deleteOrder.js CHANGED
@@ -12,6 +12,7 @@ function deleteOrder(params) {
12
12
  if (typeof params.object.identifier !== 'string' || params.object.identifier === '') {
13
13
  throw new factory_1.factory.errors.ArgumentNull('object.identifier');
14
14
  }
15
+ let deleteActionsResult = [];
15
16
  const orders = await repos.order.projectFields({
16
17
  limit: 1,
17
18
  page: 1,
@@ -21,7 +22,7 @@ function deleteOrder(params) {
21
22
  const order = orders.shift();
22
23
  if (order === undefined) {
23
24
  // すでに削除済
24
- return;
25
+ return { deleteActionsResult: [] };
25
26
  }
26
27
  if (typeof order.id !== 'string') {
27
28
  throw new factory_1.factory.errors.Internal(`order.id undefined. orderNumber: ${order.orderNumber}`);
@@ -43,8 +44,14 @@ function deleteOrder(params) {
43
44
  typeOf: factory_1.factory.order.OrderType.Order
44
45
  }
45
46
  });
47
+ // アクション削除(2026-07-10~)
48
+ deleteActionsResult = await repos.action.deleteActionsByOrderNumber({
49
+ orderNumber: order.orderNumber,
50
+ project: { id: order.project.id },
51
+ });
46
52
  // 注文削除
47
53
  await repos.order.deleteByOrderNumber({ orderNumber: order.orderNumber });
54
+ return { deleteActionsResult };
48
55
  };
49
56
  }
50
57
  function deleteReservationsByOrder(order) {
package/lib/chevre/service/transaction/deleteTransaction.js CHANGED
@@ -70,6 +70,7 @@ function deleteTransactionById(params) {
70
70
  let deleteCancelReservationTransactionResult;
71
71
  let deletedReservationNumbers = [];
72
72
  let deleteActionResult;
73
+ let deleteOrderResult;
73
74
  const action = await repos.action.start(actionAttributes);
74
75
  try {
75
76
  const transactionTypeOf = transaction.typeOf;
@@ -89,7 +90,7 @@ function deleteTransactionById(params) {
89
90
  break;
90
91
  case factory_1.factory.transactionStatusType.Confirmed: {
91
92
  // identifierによる削除に変更(2026-06-28~)
92
- await (0, deleteOrder_1.deleteOrder)({
93
+ deleteOrderResult = await (0, deleteOrder_1.deleteOrder)({
93
94
  object: { identifier: transaction.id }
94
95
  })(repos);
95
96
  break;
@@ -110,9 +111,9 @@ function deleteTransactionById(params) {
110
111
  deleteReservationsByPlaceOrderResult.deleteCancelReservationTransactionResult;
111
112
  deletedReservationNumbers = deleteReservationsByPlaceOrderResult.reserveTransactionNumbers;
112
113
  // アクション削除(2023-05-19~)
113
- deleteActionResult = await repos.action.deleteByPurpose({
114
+ deleteActionResult = await repos.action.deleteActionsByTransactionId({
114
115
  project: { id: transaction.project.id },
115
- purpose: { id: transaction.id, typeOf: transactionTypeOf },
116
+ transaction: { id: transaction.id, typeOf: transactionTypeOf },
116
117
  typeOf: {
117
118
  $in: [
118
119
  factory_1.factory.actionType.AcceptAction, // オファー採用、決済採用
@@ -162,6 +163,7 @@ function deleteTransactionById(params) {
162
163
  deleteCancelReservationTransactionResult,
163
164
  deletedReservationNumbers,
164
165
  deleteActionResult,
166
+ deleteOrderResult // 2026-07-10~
165
167
  // ...(deleteMessagessResult !== undefined) ? { deleteMessagessResult } : undefined
166
168
  };
167
169
  await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
package/package.json CHANGED
@@ -91,5 +91,5 @@
91
91
  "postversion": "git push origin --tags",
92
92
  "prepublishOnly": "npm run clean && npm run build"
93
93
  },
94
- "version": "25.2.0-alpha.12"
94
+ "version": "25.2.0-alpha.14"
95
95
  }