@chevre/domain 22.14.0-alpha.14 → 22.14.0-alpha.15

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 (11) hide show
  1. package/example/src/chevre/findReservationByCode.ts +0 -1
  2. package/lib/chevre/repo/action.d.ts +1 -1
  3. package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/factory.js +1 -1
  4. package/lib/chevre/service/reserve/useReservation.js +2 -3
  5. package/lib/chevre/service/reserve/verifyToken4reservation.d.ts +0 -2
  6. package/lib/chevre/service/task/checkResource.d.ts +2 -2
  7. package/lib/chevre/service/task/checkResource.js +8 -6
  8. package/lib/chevre/service/task/useReservation.js +1 -2
  9. package/lib/chevre/service/taskHandler.js +1 -0
  10. package/lib/chevre/service/transaction/returnOrder/potentialActions/returnPointAward.d.ts +0 -1
  11. package/package.json +2 -2
package/example/src/chevre/findReservationByCode.ts CHANGED
@@ -22,7 +22,6 @@ async function main() {
22
22
 
23
23
  await (await chevre.service.reserve.createService()).verifyToken4reservation({
24
24
  project: { id: project.id },
25
- agent: { id: project.id, typeOf: chevre.factory.organizationType.Project },
26
25
  reservationId: RESERVATION_ID,
27
26
  ticket: {
28
27
  ticketToken: CODE
package/lib/chevre/repo/action.d.ts CHANGED
@@ -2,7 +2,7 @@ import { factory as surfrockFactory } from '@surfrock/sdk';
2
2
  import { Connection, FilterQuery, UpdateQuery } from 'mongoose';
3
3
  import * as factory from '../factory';
4
4
  export type IAction4transaction<T extends factory.actionType.AcceptAction | factory.actionType.AuthorizeAction> = T extends factory.actionType.AcceptAction ? factory.action.accept.coaOffer.IAction | factory.action.accept.pay.IAction : T extends factory.actionType.AuthorizeAction ? (factory.action.authorize.offer.eventService.IAction | factory.action.authorize.offer.moneyTransfer.IAction | factory.action.authorize.offer.product.IAction | factory.action.authorize.paymentMethod.any.IAction) : never;
5
- export type IAction<T extends factory.actionType> = T extends factory.actionType.OrderAction ? factory.action.trade.order.IAction : T extends factory.actionType.AcceptAction ? IAction4transaction<factory.actionType.AcceptAction> : T extends factory.actionType.AuthorizeAction ? factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>> : T extends factory.actionType.CheckAction ? (factory.action.check.paymentMethod.movieTicket.IAction | factory.action.check.token.IAction) : T extends factory.actionType.CreateAction ? factory.action.create.IAction : T extends factory.actionType.MoneyTransfer ? factory.action.transfer.moneyTransfer.IAction : T extends factory.actionType.AddAction ? factory.action.update.add.IAction : T extends factory.actionType.ReplaceAction ? factory.action.update.replace.IAction : T extends factory.actionType.UpdateAction ? factory.action.update.update.IAction : T extends factory.actionType.InformAction ? factory.action.interact.inform.IAction<factory.action.interact.inform.IAttributes<factory.action.interact.inform.IObject>> & {
5
+ export type IAction<T extends factory.actionType> = T extends factory.actionType.OrderAction ? factory.action.trade.order.IAction : T extends factory.actionType.AcceptAction ? IAction4transaction<factory.actionType.AcceptAction> : T extends factory.actionType.AuthorizeAction ? factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>> : T extends factory.actionType.CheckAction ? (factory.action.check.paymentMethod.movieTicket.IAction | factory.action.check.thing.IAction) : T extends factory.actionType.CreateAction ? factory.action.create.IAction : T extends factory.actionType.MoneyTransfer ? factory.action.transfer.moneyTransfer.IAction : T extends factory.actionType.AddAction ? factory.action.update.add.IAction : T extends factory.actionType.ReplaceAction ? factory.action.update.replace.IAction : T extends factory.actionType.UpdateAction ? factory.action.update.update.IAction : T extends factory.actionType.InformAction ? factory.action.interact.inform.IAction<factory.action.interact.inform.IAttributes<factory.action.interact.inform.IObject>> & {
6
6
  error?: any;
7
7
  purpose?: never;
8
8
  } : factory.action.IAction<factory.action.IAttributes<T, any, any>>;
package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/factory.js CHANGED
@@ -127,7 +127,7 @@ function createCheckResourceTask(order) {
127
127
  orderNumber: order.orderNumber,
128
128
  typeOf: order.typeOf
129
129
  },
130
- project: order.project,
130
+ // project: order.project,
131
131
  typeOf: factory.actionType.CheckAction
132
132
  };
133
133
  const taskIdentifier = util.format('%s:%s:%s:%s', order.project.id, factory.taskName.CheckResource, order.typeOf, order.orderNumber);
package/lib/chevre/service/reserve/useReservation.js CHANGED
@@ -28,8 +28,7 @@ function useReservation(params) {
28
28
  // const ticketToken = params?.instrument?.ticketToken;
29
29
  if (Array.isArray(params.instrument)) {
30
30
  for (const eachInstrument of params.instrument) {
31
- if (eachInstrument.typeOf === factory.action.check.token.ObjectType.Ticket
32
- && typeof eachInstrument.ticketToken === 'string') {
31
+ if (eachInstrument.typeOf === 'Ticket' && typeof eachInstrument.ticketToken === 'string') {
33
32
  ticketToken = eachInstrument.ticketToken;
34
33
  break;
35
34
  }
@@ -62,7 +61,7 @@ function useReservation(params) {
62
61
  };
63
62
  // extend instrument to array(2025-02-18~)
64
63
  const instrument = [
65
- Object.assign(Object.assign({}, (typeof ticketToken === 'string') ? { ticketToken } : undefined), { typeOf: factory.action.check.token.ObjectType.Ticket }),
64
+ Object.assign(Object.assign({}, (typeof ticketToken === 'string') ? { ticketToken } : undefined), { typeOf: 'Ticket' }),
66
65
  // support orderAsInstrument(2025-02-18~)
67
66
  ...(Array.isArray(params.instrument))
68
67
  ? params.instrument.filter(({ typeOf }) => typeOf === factory.order.OrderType.Order)
package/lib/chevre/service/reserve/verifyToken4reservation.d.ts CHANGED
@@ -1,4 +1,3 @@
1
- import * as factory from '../../factory';
2
1
  import type { AuthorizationRepo } from '../../repo/authorization';
3
2
  import type { OrderRepo } from '../../repo/order';
4
3
  import type { TicketRepo } from '../../repo/ticket';
@@ -12,7 +11,6 @@ export declare function verifyToken4reservation(params: {
12
11
  seller?: {
13
12
  id?: string;
14
13
  };
15
- agent: factory.action.check.token.IAgent;
16
14
  reservationId: string;
17
15
  ticket: {
18
16
  /**
package/lib/chevre/service/task/checkResource.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import * as factory from '../../factory';
2
- import type { IOperationExecute } from '../taskHandler';
2
+ import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
3
3
  /**
4
4
  * タスク実行関数
5
5
  */
6
- export declare function call(data: factory.task.checkResource.IData): IOperationExecute<void>;
6
+ export declare function call(params: Pick<factory.task.checkResource.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;
package/lib/chevre/service/task/checkResource.js CHANGED
@@ -24,17 +24,19 @@ const validateOrder_1 = require("../validation/validateOrder");
24
24
  /**
25
25
  * タスク実行関数
26
26
  */
27
- function call(data) {
27
+ function call(params) {
28
28
  return (_a) => __awaiter(this, [_a], void 0, function* ({ connection, redisClient }) {
29
29
  if (redisClient === undefined) {
30
30
  throw new factory.errors.Argument('settings', 'redisClient required');
31
31
  }
32
32
  const actionRepo = new action_1.ActionRepo(connection);
33
+ const { data } = params;
33
34
  const actionAttributes = {
34
- agent: { id: data.project.id, typeOf: factory.organizationType.Project },
35
+ agent: { id: params.project.id, typeOf: factory.organizationType.Project },
35
36
  object: data.object,
36
- project: { id: data.project.id, typeOf: factory.organizationType.Project },
37
- typeOf: factory.actionType.CheckAction
37
+ project: { id: params.project.id, typeOf: factory.organizationType.Project },
38
+ typeOf: factory.actionType.CheckAction,
39
+ sameAs: { id: params.id, typeOf: 'Task' } // add sameAs(2025-09-22~)
38
40
  };
39
41
  const action = yield actionRepo.start(actionAttributes);
40
42
  const objectTypeOf = data.object.typeOf;
@@ -43,7 +45,7 @@ function call(data) {
43
45
  case factory.order.OrderType.Order:
44
46
  yield (0, validateOrder_1.validateOrder)({
45
47
  orderNumber: data.object.orderNumber,
46
- project: { id: data.project.id }
48
+ project: { id: params.project.id }
47
49
  })({
48
50
  acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
49
51
  assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
@@ -56,7 +58,7 @@ function call(data) {
56
58
  case factory.eventType.ScreeningEvent:
57
59
  yield (0, validateEvent_1.validateEvent)({
58
60
  id: data.object.id,
59
- project: { id: data.project.id }
61
+ project: { id: params.project.id }
60
62
  })({
61
63
  event: new event_1.EventRepo(connection),
62
64
  stockHolder: new stockHolder_1.StockHolderRepo({ connection })
package/lib/chevre/service/task/useReservation.js CHANGED
@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
10
10
  };
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.call = call;
13
- const factory = require("../../factory");
14
13
  const action_1 = require("../../repo/action");
15
14
  const assetTransaction_1 = require("../../repo/assetTransaction");
16
15
  const authorization_1 = require("../../repo/authorization");
@@ -31,7 +30,7 @@ function call(data) {
31
30
  instrument = data.instrument;
32
31
  }
33
32
  else {
34
- if (((_b = data.instrument) === null || _b === void 0 ? void 0 : _b.typeOf) === factory.action.check.token.ObjectType.Ticket) {
33
+ if (((_b = data.instrument) === null || _b === void 0 ? void 0 : _b.typeOf) === 'Ticket') {
35
34
  instrument = [data.instrument];
36
35
  }
37
36
  }
package/lib/chevre/service/taskHandler.js CHANGED
@@ -50,6 +50,7 @@ function executeTask(task, next) {
50
50
  case factory.taskName.AuthorizePayment:
51
51
  case factory.taskName.CancelPendingReservation:
52
52
  case factory.taskName.CheckMovieTicket:
53
+ case factory.taskName.CheckResource:
53
54
  case factory.taskName.CreateAccountingReport:
54
55
  case factory.taskName.DeletePerson:
55
56
  case factory.taskName.HandleNotification:
package/lib/chevre/service/transaction/returnOrder/potentialActions/returnPointAward.d.ts CHANGED
@@ -1,5 +1,4 @@
1
1
  import * as factory from '../../../../factory';
2
- export type IAction = factory.action.IAction<factory.action.IAttributes<factory.actionType, any, any>>;
3
2
  /**
4
3
  * ポイント特典返却アクションを作成する
5
4
  */
package/package.json CHANGED
@@ -11,7 +11,7 @@
11
11
  "dependencies": {
12
12
  "@aws-sdk/client-cognito-identity-provider": "3.600.0",
13
13
  "@aws-sdk/credential-providers": "3.600.0",
14
- "@chevre/factory": "4.399.0-alpha.15",
14
+ "@chevre/factory": "4.399.0-alpha.16",
15
15
  "@cinerino/sdk": "12.2.0",
16
16
  "@motionpicture/coa-service": "9.6.0",
17
17
  "@motionpicture/gmo-service": "5.4.0-alpha.1",
@@ -115,5 +115,5 @@
115
115
  "postversion": "git push origin --tags",
116
116
  "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
117
117
  },
118
- "version": "22.14.0-alpha.14"
118
+ "version": "22.14.0-alpha.15"
119
119
  }