@chevre/domain 24.1.0-alpha.41 → 24.1.0-alpha.42
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.
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { Connection } from 'mongoose';
|
|
2
2
|
import { factory } from '../../factory';
|
|
3
3
|
type ISubReservationAsFindResult = Pick<factory.reservation.eventReservation.IReservation, 'underName' | 'id'> & {
|
|
4
|
-
reservedTicket?: Pick<factory.
|
|
4
|
+
reservedTicket?: Pick<factory.assetTransaction.reserve.ISubReservationReservedTicket, 'ticketType'>;
|
|
5
5
|
reservationFor?: factory.assetTransaction.reserve.IReservationFor;
|
|
6
6
|
};
|
|
7
7
|
/**
|
|
@@ -7,8 +7,8 @@ import type { IKeyOfProjection, ReservationRepo } from '../../repo/reservation';
|
|
|
7
7
|
*/
|
|
8
8
|
type IReservationAsFindResult = Omit<factory.reservation.eventReservation.IReservation, 'underName' | 'reservedTicket' | 'reservationFor'> & {
|
|
9
9
|
underName?: factory.assetTransaction.reserve.IUnderName;
|
|
10
|
-
reservedTicket?: factory.
|
|
11
|
-
reservationFor?: factory.
|
|
10
|
+
reservedTicket?: factory.reservation.eventReservation.IReservedTicket;
|
|
11
|
+
reservationFor?: factory.reservation.eventReservation.IReservationForMinimized;
|
|
12
12
|
price?: never;
|
|
13
13
|
};
|
|
14
14
|
/**
|
|
@@ -15,10 +15,6 @@ function findReservations(params, options) {
|
|
|
15
15
|
const requireUnderName = Object.keys(inclusion).includes('underName');
|
|
16
16
|
const requireReservedTicket = Object.keys(inclusion).includes('reservedTicket');
|
|
17
17
|
const requireReservationFor = Object.keys(inclusion).includes('reservationFor');
|
|
18
|
-
// const requirePrice = Object.keys(inclusion).includes('price');
|
|
19
|
-
// const requirePriceCurrency = Object.keys(inclusion).includes('priceCurrency');
|
|
20
|
-
// const requireIssuedThrough = Object.keys(inclusion).includes('issuedThrough');
|
|
21
|
-
// const requireNumSeats = Object.keys(inclusion).includes('numSeats');
|
|
22
18
|
const reservationIds = rawReservations.map(({ id }) => id);
|
|
23
19
|
const subReservations = await repos.assetTransaction.reserve.findSubReservationsById({
|
|
24
20
|
ids: reservationIds
|
|
@@ -26,34 +22,29 @@ function findReservations(params, options) {
|
|
|
26
22
|
return rawReservations.map((reservation) => {
|
|
27
23
|
const subReservationByTransaction = subReservations.find((s) => s.id === reservation.id);
|
|
28
24
|
const underNameByTransaction = subReservationByTransaction?.underName;
|
|
29
|
-
const ticketTypeByTransaction = subReservationByTransaction?.reservedTicket?.ticketType;
|
|
30
|
-
const reservationForByTransaction = subReservationByTransaction?.reservationFor;
|
|
31
|
-
|
|
32
|
-
// const issuedThroughByTransaction = subReservationByTransaction?.issuedThrough;
|
|
33
|
-
// const numSeatsByTransaction = subReservationByTransaction?.numSeats;
|
|
34
|
-
const { reservationFor: _reservationFor, issuedThrough: _issuedThrough, priceCurrency: _priceCurrency, numSeats: _numSeats, reservedTicket, ...rawReservation4result } = reservation;
|
|
25
|
+
// const ticketTypeByTransaction = subReservationByTransaction?.reservedTicket?.ticketType;
|
|
26
|
+
// const reservationForByTransaction = subReservationByTransaction?.reservationFor;
|
|
27
|
+
const { reservationFor, issuedThrough: _issuedThrough, priceCurrency: _priceCurrency, numSeats: _numSeats, reservedTicket, ...rawReservation4result } = reservation;
|
|
35
28
|
return {
|
|
36
29
|
...rawReservation4result, // 予約ドキュメントはそのまま返す
|
|
37
30
|
...(requireUnderName && underNameByTransaction !== undefined) ? { underName: underNameByTransaction } : undefined, // underNameがあれば上書き
|
|
38
|
-
...(requireReservedTicket
|
|
39
|
-
? {
|
|
40
|
-
reservedTicket: {
|
|
41
|
-
...reservedTicket, // 予約ドキュメントのreservedTicketはそのまま返す
|
|
42
|
-
ticketType: ticketTypeByTransaction
|
|
43
|
-
}
|
|
44
|
-
}
|
|
31
|
+
...(requireReservedTicket)
|
|
32
|
+
? { reservedTicket } // 予約検索レスポンスからticketTypeは廃止(2026-06-01~)
|
|
45
33
|
: undefined,
|
|
46
|
-
...(requireReservationFor
|
|
47
|
-
? { reservationFor
|
|
48
|
-
: undefined,
|
|
49
|
-
// ...(
|
|
50
|
-
//
|
|
51
|
-
//
|
|
52
|
-
//
|
|
53
|
-
//
|
|
54
|
-
//
|
|
55
|
-
//
|
|
56
|
-
// : undefined,
|
|
34
|
+
...(requireReservationFor)
|
|
35
|
+
? { reservationFor } // 予約検索レスポンスのreservationForはそのまま返す(2026-06-01~)
|
|
36
|
+
: undefined,
|
|
37
|
+
// ...(requireReservedTicket && ticketTypeByTransaction !== undefined) // ticketTypeがあれば上書き
|
|
38
|
+
// ? {
|
|
39
|
+
// reservedTicket: {
|
|
40
|
+
// ...reservedTicket, // 予約ドキュメントのreservedTicketはそのまま返す
|
|
41
|
+
// ticketType: ticketTypeByTransaction
|
|
42
|
+
// }
|
|
43
|
+
// }
|
|
44
|
+
// : undefined,
|
|
45
|
+
// ...(requireReservationFor && reservationForByTransaction !== undefined)
|
|
46
|
+
// ? { reservationFor: reservationForByTransaction }
|
|
47
|
+
// : undefined, // reservationForがあれば上書き(2026-04-06~)
|
|
57
48
|
};
|
|
58
49
|
});
|
|
59
50
|
}
|
package/package.json
CHANGED