uaxi-shared-entities 1.0.249 → 1.0.251
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.
- package/dist/entities/driver-active-position-history.entity.d.ts +8 -1
- package/dist/entities/driver-active-position-history.entity.d.ts.map +1 -1
- package/dist/entities/driver-active-position-history.entity.js +15 -1
- package/dist/entities/driver-active-position-history.entity.js.map +1 -1
- package/dist/entities/trip-earnings-settlement.entity.d.ts +12 -0
- package/dist/entities/trip-earnings-settlement.entity.d.ts.map +1 -1
- package/dist/entities/trip-earnings-settlement.entity.js +44 -3
- package/dist/entities/trip-earnings-settlement.entity.js.map +1 -1
- package/dist/entities/uaxi-treasury-payout.entity.js +1 -1
- package/dist/entities/uaxi-treasury-payout.entity.js.map +1 -1
- package/dist/enums/driver.enum.d.ts +7 -0
- package/dist/enums/driver.enum.d.ts.map +1 -1
- package/dist/enums/driver.enum.js +9 -1
- package/dist/enums/driver.enum.js.map +1 -1
- package/dist/enums/trip-settlement.enum.d.ts +2 -1
- package/dist/enums/trip-settlement.enum.d.ts.map +1 -1
- package/dist/enums/trip-settlement.enum.js +1 -0
- package/dist/enums/trip-settlement.enum.js.map +1 -1
- package/package.json +1 -1
- package/src/entities/driver-active-position-history.entity.ts +21 -2
- package/src/entities/trip-earnings-settlement.entity.ts +48 -3
- package/src/entities/uaxi-treasury-payout.entity.ts +1 -1
- package/src/enums/driver.enum.ts +8 -0
- package/src/enums/trip-settlement.enum.ts +1 -0
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
import { Model } from "sequelize-typescript";
|
|
2
2
|
import { DriverProfile } from "./driver.entity";
|
|
3
|
+
import { DriverActivePositionSnapshotSource } from "../enums/driver.enum";
|
|
3
4
|
/**
|
|
4
|
-
* Snapshot periódico de la posición de conductores
|
|
5
|
+
* Snapshot periódico de la posición de conductores:
|
|
6
|
+
* - `drivers:active` (online/disponible)
|
|
7
|
+
* - `driver:trip:location:{driverId}` (busy, en viaje/paquete)
|
|
5
8
|
* Lo alimenta un cron cada 30 min en microservice-drivers.
|
|
6
9
|
*/
|
|
7
10
|
export interface DriverActivePositionHistoryAttributes {
|
|
@@ -9,6 +12,8 @@ export interface DriverActivePositionHistoryAttributes {
|
|
|
9
12
|
driverId: string;
|
|
10
13
|
latitude: number;
|
|
11
14
|
longitude: number;
|
|
15
|
+
/** online (active) vs busy (en viaje/paquete). */
|
|
16
|
+
source: DriverActivePositionSnapshotSource;
|
|
12
17
|
/** Momento en que se tomó el snapshot (corrida del cron). */
|
|
13
18
|
recordedAt: Date;
|
|
14
19
|
createdAt: Date;
|
|
@@ -18,6 +23,7 @@ export interface CreateDriverActivePositionHistoryData {
|
|
|
18
23
|
driverId: string;
|
|
19
24
|
latitude: number;
|
|
20
25
|
longitude: number;
|
|
26
|
+
source?: DriverActivePositionSnapshotSource;
|
|
21
27
|
recordedAt: Date;
|
|
22
28
|
}
|
|
23
29
|
export declare class DriverActivePositionHistory extends Model<DriverActivePositionHistoryAttributes, CreateDriverActivePositionHistoryData> {
|
|
@@ -25,6 +31,7 @@ export declare class DriverActivePositionHistory extends Model<DriverActivePosit
|
|
|
25
31
|
driverId: string;
|
|
26
32
|
latitude: number;
|
|
27
33
|
longitude: number;
|
|
34
|
+
source: DriverActivePositionSnapshotSource;
|
|
28
35
|
recordedAt: Date;
|
|
29
36
|
createdAt: Date;
|
|
30
37
|
updatedAt: Date;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"driver-active-position-history.entity.d.ts","sourceRoot":"","sources":["../../src/entities/driver-active-position-history.entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,EAON,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"driver-active-position-history.entity.d.ts","sourceRoot":"","sources":["../../src/entities/driver-active-position-history.entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,EAON,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,kCAAkC,EAAE,MAAM,sBAAsB,CAAC;AAE1E;;;;;GAKG;AACH,MAAM,WAAW,qCAAqC;IACpD,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,kDAAkD;IAClD,MAAM,EAAE,kCAAkC,CAAC;IAC3C,6DAA6D;IAC7D,UAAU,EAAE,IAAI,CAAC;IACjB,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;CACjB;AAED,MAAM,WAAW,qCAAqC;IACpD,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,kCAAkC,CAAC;IAC5C,UAAU,EAAE,IAAI,CAAC;CAClB;AAED,qBAkBa,2BAA4B,SAAQ,KAAK,CACpD,qCAAqC,EACrC,qCAAqC,CACtC;IAMS,EAAE,EAAE,MAAM,CAAC;IAWnB,QAAQ,EAAE,MAAM,CAAC;IAMjB,QAAQ,EAAE,MAAM,CAAC;IAMjB,SAAS,EAAE,MAAM,CAAC;IASlB,MAAM,EAAE,kCAAkC,CAAC;IAO3C,UAAU,EAAE,IAAI,CAAC;IAGT,SAAS,EAAE,IAAI,CAAC;IAGhB,SAAS,EAAE,IAAI,CAAC;IAGxB,MAAM,EAAE,aAAa,CAAC;CACvB"}
|
|
@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.DriverActivePositionHistory = void 0;
|
|
13
13
|
const sequelize_typescript_1 = require("sequelize-typescript");
|
|
14
14
|
const driver_entity_1 = require("./driver.entity");
|
|
15
|
+
const driver_enum_1 = require("../enums/driver.enum");
|
|
15
16
|
let DriverActivePositionHistory = class DriverActivePositionHistory extends sequelize_typescript_1.Model {
|
|
16
17
|
};
|
|
17
18
|
exports.DriverActivePositionHistory = DriverActivePositionHistory;
|
|
@@ -31,7 +32,7 @@ __decorate([
|
|
|
31
32
|
(0, sequelize_typescript_1.Column)({
|
|
32
33
|
type: sequelize_typescript_1.DataType.UUID,
|
|
33
34
|
allowNull: false,
|
|
34
|
-
comment: "driver_profiles.id
|
|
35
|
+
comment: "driver_profiles.id",
|
|
35
36
|
}),
|
|
36
37
|
__metadata("design:type", String)
|
|
37
38
|
], DriverActivePositionHistory.prototype, "driverId", void 0);
|
|
@@ -49,6 +50,15 @@ __decorate([
|
|
|
49
50
|
}),
|
|
50
51
|
__metadata("design:type", Number)
|
|
51
52
|
], DriverActivePositionHistory.prototype, "longitude", void 0);
|
|
53
|
+
__decorate([
|
|
54
|
+
(0, sequelize_typescript_1.Column)({
|
|
55
|
+
type: sequelize_typescript_1.DataType.ENUM(...Object.values(driver_enum_1.DriverActivePositionSnapshotSource)),
|
|
56
|
+
allowNull: false,
|
|
57
|
+
defaultValue: driver_enum_1.DriverActivePositionSnapshotSource.ACTIVE,
|
|
58
|
+
comment: "active = online (drivers:active); busy_trip = en viaje/paquete (driver:trip:location)",
|
|
59
|
+
}),
|
|
60
|
+
__metadata("design:type", String)
|
|
61
|
+
], DriverActivePositionHistory.prototype, "source", void 0);
|
|
52
62
|
__decorate([
|
|
53
63
|
(0, sequelize_typescript_1.Column)({
|
|
54
64
|
type: sequelize_typescript_1.DataType.DATE,
|
|
@@ -82,6 +92,10 @@ exports.DriverActivePositionHistory = DriverActivePositionHistory = __decorate([
|
|
|
82
92
|
fields: ["recordedAt"],
|
|
83
93
|
name: "driver_active_position_history_recorded_at_idx",
|
|
84
94
|
},
|
|
95
|
+
{
|
|
96
|
+
fields: ["source", "recordedAt"],
|
|
97
|
+
name: "driver_active_position_history_source_recorded_idx",
|
|
98
|
+
},
|
|
85
99
|
],
|
|
86
100
|
})
|
|
87
101
|
], DriverActivePositionHistory);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"driver-active-position-history.entity.js","sourceRoot":"","sources":["../../src/entities/driver-active-position-history.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAU8B;AAC9B,mDAAgD;
|
|
1
|
+
{"version":3,"file":"driver-active-position-history.entity.js","sourceRoot":"","sources":["../../src/entities/driver-active-position-history.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAU8B;AAC9B,mDAAgD;AAChD,sDAA0E;AA+CnE,IAAM,2BAA2B,GAAjC,MAAM,2BAA4B,SAAQ,4BAGhD;CAuDA,CAAA;AA1DY,kEAA2B;AAS9B;IALP,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,IAAI;QACnB,YAAY,EAAE,+BAAQ,CAAC,MAAM;QAC7B,UAAU,EAAE,IAAI;KACjB,CAAC;;uDACiB;AAWnB;IATC,IAAA,iCAAU,EAAC,GAAG,EAAE,CAAC,6BAAa,CAAC;IAC/B,IAAA,4BAAK,EAAC;QACL,IAAI,EAAE,8CAA8C;KACrD,CAAC;IACD,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,IAAI;QACnB,SAAS,EAAE,KAAK;QAChB,OAAO,EAAE,oBAAoB;KAC9B,CAAC;;6DACe;AAMjB;IAJC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,MAAM;QACrB,SAAS,EAAE,KAAK;KACjB,CAAC;;6DACe;AAMjB;IAJC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,MAAM;QACrB,SAAS,EAAE,KAAK;KACjB,CAAC;;8DACgB;AASlB;IAPC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,gDAAkC,CAAC,CAAC;QACzE,SAAS,EAAE,KAAK;QAChB,YAAY,EAAE,gDAAkC,CAAC,MAAM;QACvD,OAAO,EACL,uFAAuF;KAC1F,CAAC;;2DACyC;AAO3C;IALC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,IAAI;QACnB,SAAS,EAAE,KAAK;QAChB,OAAO,EAAE,0DAA0D;KACpE,CAAC;8BACU,IAAI;+DAAC;AAGT;IADP,gCAAS;8BACS,IAAI;8DAAC;AAGhB;IADP,gCAAS;8BACS,IAAI;8DAAC;AAGxB;IADC,IAAA,gCAAS,EAAC,GAAG,EAAE,CAAC,6BAAa,CAAC;8BACvB,6BAAa;2DAAC;sCAzDX,2BAA2B;IAlBvC,IAAA,4BAAK,EAAC;QACL,SAAS,EAAE,gCAAgC;QAC3C,UAAU,EAAE,IAAI;QAChB,OAAO,EAAE;YACP;gBACE,MAAM,EAAE,CAAC,UAAU,EAAE,YAAY,CAAC;gBAClC,IAAI,EAAE,oDAAoD;aAC3D;YACD;gBACE,MAAM,EAAE,CAAC,YAAY,CAAC;gBACtB,IAAI,EAAE,gDAAgD;aACvD;YACD;gBACE,MAAM,EAAE,CAAC,QAAQ,EAAE,YAAY,CAAC;gBAChC,IAAI,EAAE,oDAAoD;aAC3D;SACF;KACF,CAAC;GACW,2BAA2B,CA0DvC"}
|
|
@@ -22,6 +22,10 @@ export interface TripEarningsSettlementAttributes {
|
|
|
22
22
|
stripeToDriverAmount: number;
|
|
23
23
|
externalToDriverAmount: number;
|
|
24
24
|
stripeProcessingFee: number;
|
|
25
|
+
stripeFeeReallocatedAmount: number;
|
|
26
|
+
stripeNetToDriverAmount: number;
|
|
27
|
+
externalNetToDriverAmount: number;
|
|
28
|
+
stripeFeeAppliedAt: Date | null;
|
|
25
29
|
stripeChargeId: string | null;
|
|
26
30
|
paymentChannel: TripSettlementPaymentChannel;
|
|
27
31
|
isCorporateTrip: boolean;
|
|
@@ -48,6 +52,10 @@ export interface CreateTripEarningsSettlementData {
|
|
|
48
52
|
stripeToDriverAmount: number;
|
|
49
53
|
externalToDriverAmount: number;
|
|
50
54
|
stripeProcessingFee?: number;
|
|
55
|
+
stripeFeeReallocatedAmount?: number;
|
|
56
|
+
stripeNetToDriverAmount?: number;
|
|
57
|
+
externalNetToDriverAmount?: number;
|
|
58
|
+
stripeFeeAppliedAt?: Date | null;
|
|
51
59
|
stripeChargeId?: string | null;
|
|
52
60
|
paymentChannel: TripSettlementPaymentChannel;
|
|
53
61
|
isCorporateTrip?: boolean;
|
|
@@ -73,6 +81,10 @@ export declare class TripEarningsSettlement extends Model<TripEarningsSettlement
|
|
|
73
81
|
stripeToDriverAmount: number;
|
|
74
82
|
externalToDriverAmount: number;
|
|
75
83
|
stripeProcessingFee: number;
|
|
84
|
+
stripeFeeReallocatedAmount: number;
|
|
85
|
+
stripeNetToDriverAmount: number;
|
|
86
|
+
externalNetToDriverAmount: number;
|
|
87
|
+
stripeFeeAppliedAt: Date | null;
|
|
76
88
|
stripeChargeId: string | null;
|
|
77
89
|
paymentChannel: TripSettlementPaymentChannel;
|
|
78
90
|
isCorporateTrip: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trip-earnings-settlement.entity.d.ts","sourceRoot":"","sources":["../../src/entities/trip-earnings-settlement.entity.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"trip-earnings-settlement.entity.d.ts","sourceRoot":"","sources":["../../src/entities/trip-earnings-settlement.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -80,11 +80,21 @@ __decorate([
|
|
|
80
80
|
__metadata("design:type", Number)
|
|
81
81
|
], TripEarningsSettlement.prototype, "uaxiRetainedFromCharge", void 0);
|
|
82
82
|
__decorate([
|
|
83
|
-
(0, sequelize_typescript_1.Column)({
|
|
83
|
+
(0, sequelize_typescript_1.Column)({
|
|
84
|
+
type: sequelize_typescript_1.DataType.DECIMAL(12, 2),
|
|
85
|
+
allowNull: false,
|
|
86
|
+
defaultValue: 0,
|
|
87
|
+
comment: "Asignación Stripe al conductor antes de reasignar el fee",
|
|
88
|
+
}),
|
|
84
89
|
__metadata("design:type", Number)
|
|
85
90
|
], TripEarningsSettlement.prototype, "stripeToDriverAmount", void 0);
|
|
86
91
|
__decorate([
|
|
87
|
-
(0, sequelize_typescript_1.Column)({
|
|
92
|
+
(0, sequelize_typescript_1.Column)({
|
|
93
|
+
type: sequelize_typescript_1.DataType.DECIMAL(12, 2),
|
|
94
|
+
allowNull: false,
|
|
95
|
+
defaultValue: 0,
|
|
96
|
+
comment: "Asignación externa al conductor antes de reasignar el fee",
|
|
97
|
+
}),
|
|
88
98
|
__metadata("design:type", Number)
|
|
89
99
|
], TripEarningsSettlement.prototype, "externalToDriverAmount", void 0);
|
|
90
100
|
__decorate([
|
|
@@ -92,10 +102,41 @@ __decorate([
|
|
|
92
102
|
type: sequelize_typescript_1.DataType.DECIMAL(12, 2),
|
|
93
103
|
allowNull: false,
|
|
94
104
|
defaultValue: 0,
|
|
95
|
-
comment: "Fee
|
|
105
|
+
comment: "Fee real cobrado por Stripe en el charge",
|
|
96
106
|
}),
|
|
97
107
|
__metadata("design:type", Number)
|
|
98
108
|
], TripEarningsSettlement.prototype, "stripeProcessingFee", void 0);
|
|
109
|
+
__decorate([
|
|
110
|
+
(0, sequelize_typescript_1.Column)({
|
|
111
|
+
type: sequelize_typescript_1.DataType.DECIMAL(12, 2),
|
|
112
|
+
allowNull: false,
|
|
113
|
+
defaultValue: 0,
|
|
114
|
+
comment: "Parte del fee movida del bucket Stripe al bucket externo",
|
|
115
|
+
}),
|
|
116
|
+
__metadata("design:type", Number)
|
|
117
|
+
], TripEarningsSettlement.prototype, "stripeFeeReallocatedAmount", void 0);
|
|
118
|
+
__decorate([
|
|
119
|
+
(0, sequelize_typescript_1.Column)({
|
|
120
|
+
type: sequelize_typescript_1.DataType.DECIMAL(12, 2),
|
|
121
|
+
allowNull: false,
|
|
122
|
+
defaultValue: 0,
|
|
123
|
+
comment: "Transfer Connect real al conductor después de reasignar el fee",
|
|
124
|
+
}),
|
|
125
|
+
__metadata("design:type", Number)
|
|
126
|
+
], TripEarningsSettlement.prototype, "stripeNetToDriverAmount", void 0);
|
|
127
|
+
__decorate([
|
|
128
|
+
(0, sequelize_typescript_1.Column)({
|
|
129
|
+
type: sequelize_typescript_1.DataType.DECIMAL(12, 2),
|
|
130
|
+
allowNull: false,
|
|
131
|
+
defaultValue: 0,
|
|
132
|
+
comment: "Pago externo final al conductor incluyendo el fee reasignado",
|
|
133
|
+
}),
|
|
134
|
+
__metadata("design:type", Number)
|
|
135
|
+
], TripEarningsSettlement.prototype, "externalNetToDriverAmount", void 0);
|
|
136
|
+
__decorate([
|
|
137
|
+
(0, sequelize_typescript_1.Column)({ type: sequelize_typescript_1.DataType.DATE, allowNull: true }),
|
|
138
|
+
__metadata("design:type", Object)
|
|
139
|
+
], TripEarningsSettlement.prototype, "stripeFeeAppliedAt", void 0);
|
|
99
140
|
__decorate([
|
|
100
141
|
(0, sequelize_typescript_1.Column)({ type: sequelize_typescript_1.DataType.STRING(120), allowNull: true }),
|
|
101
142
|
__metadata("design:type", Object)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trip-earnings-settlement.entity.js","sourceRoot":"","sources":["../../src/entities/trip-earnings-settlement.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAO8B;AAC9B,iDAAsC;AACtC,mDAAgD;AAChD,qEAA0D;AAC1D,uEAA4D;AAC5D,+EAAmE;AACnE,wEAGuC;
|
|
1
|
+
{"version":3,"file":"trip-earnings-settlement.entity.js","sourceRoot":"","sources":["../../src/entities/trip-earnings-settlement.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAO8B;AAC9B,iDAAsC;AACtC,mDAAgD;AAChD,qEAA0D;AAC1D,uEAA4D;AAC5D,+EAAmE;AACnE,wEAGuC;AAyEhC,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,4BAG3C;CA8IA,CAAA;AAjJY,wDAAsB;AASzB;IALP,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,IAAI;QACnB,YAAY,EAAE,+BAAQ,CAAC,MAAM;QAC7B,UAAU,EAAE,IAAI;KACjB,CAAC;;kDACiB;AAInB;IAFC,IAAA,iCAAU,EAAC,GAAG,EAAE,CAAC,mBAAI,CAAC;IACtB,IAAA,6BAAM,EAAC,EAAE,IAAI,EAAE,+BAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;;sDACnC;AAIf;IAFC,IAAA,iCAAU,EAAC,GAAG,EAAE,CAAC,6BAAa,CAAC;IAC/B,IAAA,6BAAM,EAAC,EAAE,IAAI,EAAE,+BAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;;wDACjC;AAIjB;IAFC,IAAA,iCAAU,EAAC,GAAG,EAAE,CAAC,uCAAc,CAAC;IAChC,IAAA,6BAAM,EAAC,EAAE,IAAI,EAAE,+BAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;;gEACjB;AAGhC;IADC,IAAA,6BAAM,EAAC,EAAE,IAAI,EAAE,+BAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;;wDAC3C;AAGjB;IADC,IAAA,6BAAM,EAAC,EAAE,IAAI,EAAE,+BAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;;8DACtD;AAGvB;IADC,IAAA,6BAAM,EAAC,EAAE,IAAI,EAAE,+BAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;;kEAClD;AAG3B;IADC,IAAA,6BAAM,EAAC,EAAE,IAAI,EAAE,+BAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;;yDAC3D;AAGlB;IADC,IAAA,6BAAM,EAAC,EAAE,IAAI,EAAE,+BAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;;sEAC7B;AAG/B;IADC,IAAA,6BAAM,EAAC,EAAE,IAAI,EAAE,+BAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;;qEAC/C;AAG9B;IADC,IAAA,6BAAM,EAAC,EAAE,IAAI,EAAE,+BAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;;oEAC/B;AAG7B;IADC,IAAA,6BAAM,EAAC,EAAE,IAAI,EAAE,+BAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;;8DACtD;AAGvB;IADC,IAAA,6BAAM,EAAC,EAAE,IAAI,EAAE,+BAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;;sEAC9C;AAQ/B;IANC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QAC7B,SAAS,EAAE,KAAK;QAChB,YAAY,EAAE,CAAC;QACf,OAAO,EAAE,0DAA0D;KACpE,CAAC;;oEAC2B;AAQ7B;IANC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QAC7B,SAAS,EAAE,KAAK;QAChB,YAAY,EAAE,CAAC;QACf,OAAO,EAAE,2DAA2D;KACrE,CAAC;;sEAC6B;AAQ/B;IANC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QAC7B,SAAS,EAAE,KAAK;QAChB,YAAY,EAAE,CAAC;QACf,OAAO,EAAE,0CAA0C;KACpD,CAAC;;mEAC0B;AAQ5B;IANC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QAC7B,SAAS,EAAE,KAAK;QAChB,YAAY,EAAE,CAAC;QACf,OAAO,EAAE,0DAA0D;KACpE,CAAC;;0EACiC;AAQnC;IANC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QAC7B,SAAS,EAAE,KAAK;QAChB,YAAY,EAAE,CAAC;QACf,OAAO,EAAE,gEAAgE;KAC1E,CAAC;;uEAC8B;AAQhC;IANC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QAC7B,SAAS,EAAE,KAAK;QAChB,YAAY,EAAE,CAAC;QACf,OAAO,EAAE,8DAA8D;KACxE,CAAC;;yEACgC;AAGlC;IADC,IAAA,6BAAM,EAAC,EAAE,IAAI,EAAE,+BAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;;kEACjB;AAGhC;IADC,IAAA,6BAAM,EAAC,EAAE,IAAI,EAAE,+BAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;;8DAC1B;AAM9B;IAJC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,mDAA4B,CAAC,CAAC;QACnE,SAAS,EAAE,KAAK;KACjB,CAAC;;8DAC2C;AAG7C;IADC,IAAA,6BAAM,EAAC,EAAE,IAAI,EAAE,+BAAQ,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC;;+DACjD;AAGzB;IADC,IAAA,6BAAM,EAAC,EAAE,IAAI,EAAE,+BAAQ,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC;;gEAChD;AAI1B;IAFC,IAAA,iCAAU,EAAC,GAAG,EAAE,CAAC,yCAAe,CAAC;IACjC,IAAA,6BAAM,EAAC,EAAE,IAAI,EAAE,+BAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;;gEACjB;AAIhC;IAFC,IAAA,iCAAU,EAAC,GAAG,EAAE,CAAC,gDAAkB,CAAC;IACpC,IAAA,6BAAM,EAAC,EAAE,IAAI,EAAE,+BAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;;oEACb;AAOpC;IALC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,2CAAoB,CAAC,CAAC;QAC3D,SAAS,EAAE,KAAK;QAChB,YAAY,EAAE,2CAAoB,CAAC,UAAU;KAC9C,CAAC;;sDAC2B;AAG7B;IADC,IAAA,gCAAS,EAAC,GAAG,EAAE,CAAC,mBAAI,CAAC;8BAChB,mBAAI;oDAAC;AAGX;IADC,IAAA,gCAAS,EAAC,GAAG,EAAE,CAAC,6BAAa,CAAC;8BACvB,6BAAa;sDAAC;AAGtB;IADC,IAAA,gCAAS,EAAC,GAAG,EAAE,CAAC,uCAAc,CAAC;8BAChB,uCAAc;8DAAC;AAG/B;IADC,IAAA,gCAAS,EAAC,GAAG,EAAE,CAAC,yCAAe,CAAC;8BACjB,yCAAe;8DAAC;AAGhC;IADC,IAAA,gCAAS,EAAC,GAAG,EAAE,CAAC,gDAAkB,CAAC;8BAChB,gDAAkB;kEAAC;iCAhJ5B,sBAAsB;IAVlC,IAAA,4BAAK,EAAC;QACL,SAAS,EAAE,2BAA2B;QACtC,UAAU,EAAE,IAAI;QAChB,OAAO,EAAE;YACP,EAAE,IAAI,EAAE,sCAAsC,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE;YAClF,EAAE,IAAI,EAAE,sCAAsC,EAAE,MAAM,EAAE,CAAC,UAAU,CAAC,EAAE;YACtE,EAAE,IAAI,EAAE,sCAAsC,EAAE,MAAM,EAAE,CAAC,sBAAsB,CAAC,EAAE;YAClF,EAAE,IAAI,EAAE,uCAAuC,EAAE,MAAM,EAAE,CAAC,gBAAgB,CAAC,EAAE;SAC9E;KACF,CAAC;GACW,sBAAsB,CAiJlC"}
|
|
@@ -43,7 +43,7 @@ __decorate([
|
|
|
43
43
|
type: sequelize_typescript_1.DataType.DECIMAL(12, 2),
|
|
44
44
|
allowNull: false,
|
|
45
45
|
defaultValue: 0,
|
|
46
|
-
comment: "Fee Stripe
|
|
46
|
+
comment: "Fee Stripe del periodo (informativo; ya no se descuenta del payout UAXI)",
|
|
47
47
|
}),
|
|
48
48
|
__metadata("design:type", Number)
|
|
49
49
|
], UaxiTreasuryPayout.prototype, "stripeFeeAbsorbed", void 0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uaxi-treasury-payout.entity.js","sourceRoot":"","sources":["../../src/entities/uaxi-treasury-payout.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAM8B;AAC9B,oEAGqC;AAgD9B,IAAM,kBAAkB,GAAxB,MAAM,kBAAmB,SAAQ,4BAGvC;CAwEA,CAAA;AA3EY,gDAAkB;AASrB;IALP,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,IAAI;QACnB,YAAY,EAAE,+BAAQ,CAAC,MAAM;QAC7B,UAAU,EAAE,IAAI;KACjB,CAAC;;8CACiB;AAMnB;IAJC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,wCAAmB,CAAC,CAAC;QAC1D,SAAS,EAAE,KAAK;KACjB,CAAC;;mDAC2B;AAO7B;IALC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QAC7B,SAAS,EAAE,KAAK;QAChB,OAAO,EAAE,qDAAqD;KAC/D,CAAC;;4DACuB;AAQzB;IANC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QAC7B,SAAS,EAAE,KAAK;QAChB,YAAY,EAAE,CAAC;QACf,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"uaxi-treasury-payout.entity.js","sourceRoot":"","sources":["../../src/entities/uaxi-treasury-payout.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,6 +22,13 @@ export declare enum DriverClassification {
|
|
|
22
22
|
B = "B",
|
|
23
23
|
C = "C"
|
|
24
24
|
}
|
|
25
|
+
/** Origen del snapshot en driver_active_position_history. */
|
|
26
|
+
export declare enum DriverActivePositionSnapshotSource {
|
|
27
|
+
/** Conductor disponible/online en Redis `drivers:active`. */
|
|
28
|
+
ACTIVE = "active",
|
|
29
|
+
/** Conductor en viaje/paquete (busy) — Redis `driver:trip:location:{driverId}`. */
|
|
30
|
+
BUSY_TRIP = "busy_trip"
|
|
31
|
+
}
|
|
25
32
|
export declare enum EarningType {
|
|
26
33
|
TRIP = "trip",
|
|
27
34
|
PACKAGE = "package",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"driver.enum.d.ts","sourceRoot":"","sources":["../../src/enums/driver.enum.ts"],"names":[],"mappings":"AAIA,oBAAY,YAAY;IACtB,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,kBAAkB,uBAAuB;IACzC,IAAI,SAAS;CACd;AAED,oBAAY,mBAAmB;IAC7B,WAAW,gBAAgB;IAC3B,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,eAAe,oBAAoB;IACnC,QAAQ,aAAa;IACrB,OAAO,YAAY;CACpB;AAED,iFAAiF;AACjF,oBAAY,gBAAgB;IAC1B,SAAS,cAAc;IACvB,MAAM,WAAW;CAClB;AAED,oBAAY,oBAAoB;IAC9B,CAAC,MAAM;IACP,CAAC,MAAM;IACP,CAAC,MAAM;CACR;AAED,oBAAY,WAAW;IACrB,IAAI,SAAS;IACb,OAAO,YAAY;IACnB,KAAK,UAAU;IACf,yGAAyG;IACzG,SAAS,cAAc;IACvB,uDAAuD;IACvD,GAAG,QAAQ;CACZ"}
|
|
1
|
+
{"version":3,"file":"driver.enum.d.ts","sourceRoot":"","sources":["../../src/enums/driver.enum.ts"],"names":[],"mappings":"AAIA,oBAAY,YAAY;IACtB,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,kBAAkB,uBAAuB;IACzC,IAAI,SAAS;CACd;AAED,oBAAY,mBAAmB;IAC7B,WAAW,gBAAgB;IAC3B,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,eAAe,oBAAoB;IACnC,QAAQ,aAAa;IACrB,OAAO,YAAY;CACpB;AAED,iFAAiF;AACjF,oBAAY,gBAAgB;IAC1B,SAAS,cAAc;IACvB,MAAM,WAAW;CAClB;AAED,oBAAY,oBAAoB;IAC9B,CAAC,MAAM;IACP,CAAC,MAAM;IACP,CAAC,MAAM;CACR;AAED,6DAA6D;AAC7D,oBAAY,kCAAkC;IAC5C,6DAA6D;IAC7D,MAAM,WAAW;IACjB,mFAAmF;IACnF,SAAS,cAAc;CACxB;AAED,oBAAY,WAAW;IACrB,IAAI,SAAS;IACb,OAAO,YAAY;IACnB,KAAK,UAAU;IACf,yGAAyG;IACzG,SAAS,cAAc;IACvB,uDAAuD;IACvD,GAAG,QAAQ;CACZ"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
// DRIVER ENUMS
|
|
4
4
|
// =============================================
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.EarningType = exports.DriverClassification = exports.StripePayoutMode = exports.StripeAccountStatus = exports.DriverStatus = void 0;
|
|
6
|
+
exports.EarningType = exports.DriverActivePositionSnapshotSource = exports.DriverClassification = exports.StripePayoutMode = exports.StripeAccountStatus = exports.DriverStatus = void 0;
|
|
7
7
|
var DriverStatus;
|
|
8
8
|
(function (DriverStatus) {
|
|
9
9
|
DriverStatus["OFFLINE"] = "offline";
|
|
@@ -32,6 +32,14 @@ var DriverClassification;
|
|
|
32
32
|
DriverClassification["B"] = "B";
|
|
33
33
|
DriverClassification["C"] = "C";
|
|
34
34
|
})(DriverClassification || (exports.DriverClassification = DriverClassification = {}));
|
|
35
|
+
/** Origen del snapshot en driver_active_position_history. */
|
|
36
|
+
var DriverActivePositionSnapshotSource;
|
|
37
|
+
(function (DriverActivePositionSnapshotSource) {
|
|
38
|
+
/** Conductor disponible/online en Redis `drivers:active`. */
|
|
39
|
+
DriverActivePositionSnapshotSource["ACTIVE"] = "active";
|
|
40
|
+
/** Conductor en viaje/paquete (busy) — Redis `driver:trip:location:{driverId}`. */
|
|
41
|
+
DriverActivePositionSnapshotSource["BUSY_TRIP"] = "busy_trip";
|
|
42
|
+
})(DriverActivePositionSnapshotSource || (exports.DriverActivePositionSnapshotSource = DriverActivePositionSnapshotSource = {}));
|
|
35
43
|
var EarningType;
|
|
36
44
|
(function (EarningType) {
|
|
37
45
|
EarningType["TRIP"] = "trip";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"driver.enum.js","sourceRoot":"","sources":["../../src/enums/driver.enum.ts"],"names":[],"mappings":";AAAA,gDAAgD;AAChD,eAAe;AACf,gDAAgD;;;AAEhD,IAAY,YAKX;AALD,WAAY,YAAY;IACtB,mCAAmB,CAAA;IACnB,iCAAiB,CAAA;IACjB,yDAAyC,CAAA;IACzC,6BAAa,CAAA;AACf,CAAC,EALW,YAAY,4BAAZ,YAAY,QAKvB;AAED,IAAY,mBAOX;AAPD,WAAY,mBAAmB;IAC7B,kDAA2B,CAAA;IAC3B,0CAAmB,CAAA;IACnB,gDAAyB,CAAA;IACzB,0DAAmC,CAAA;IACnC,4CAAqB,CAAA;IACrB,0CAAmB,CAAA;AACrB,CAAC,EAPW,mBAAmB,mCAAnB,mBAAmB,QAO9B;AAED,iFAAiF;AACjF,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IAC1B,2CAAuB,CAAA;IACvB,qCAAiB,CAAA;AACnB,CAAC,EAHW,gBAAgB,gCAAhB,gBAAgB,QAG3B;AAED,IAAY,oBAIX;AAJD,WAAY,oBAAoB;IAC9B,+BAAO,CAAA;IACP,+BAAO,CAAA;IACP,+BAAO,CAAA;AACT,CAAC,EAJW,oBAAoB,oCAApB,oBAAoB,QAI/B;AAED,IAAY,WAQX;AARD,WAAY,WAAW;IACrB,4BAAa,CAAA;IACb,kCAAmB,CAAA;IACnB,8BAAe,CAAA;IACf,yGAAyG;IACzG,sCAAuB,CAAA;IACvB,uDAAuD;IACvD,0BAAW,CAAA;AACb,CAAC,EARW,WAAW,2BAAX,WAAW,QAQtB"}
|
|
1
|
+
{"version":3,"file":"driver.enum.js","sourceRoot":"","sources":["../../src/enums/driver.enum.ts"],"names":[],"mappings":";AAAA,gDAAgD;AAChD,eAAe;AACf,gDAAgD;;;AAEhD,IAAY,YAKX;AALD,WAAY,YAAY;IACtB,mCAAmB,CAAA;IACnB,iCAAiB,CAAA;IACjB,yDAAyC,CAAA;IACzC,6BAAa,CAAA;AACf,CAAC,EALW,YAAY,4BAAZ,YAAY,QAKvB;AAED,IAAY,mBAOX;AAPD,WAAY,mBAAmB;IAC7B,kDAA2B,CAAA;IAC3B,0CAAmB,CAAA;IACnB,gDAAyB,CAAA;IACzB,0DAAmC,CAAA;IACnC,4CAAqB,CAAA;IACrB,0CAAmB,CAAA;AACrB,CAAC,EAPW,mBAAmB,mCAAnB,mBAAmB,QAO9B;AAED,iFAAiF;AACjF,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IAC1B,2CAAuB,CAAA;IACvB,qCAAiB,CAAA;AACnB,CAAC,EAHW,gBAAgB,gCAAhB,gBAAgB,QAG3B;AAED,IAAY,oBAIX;AAJD,WAAY,oBAAoB;IAC9B,+BAAO,CAAA;IACP,+BAAO,CAAA;IACP,+BAAO,CAAA;AACT,CAAC,EAJW,oBAAoB,oCAApB,oBAAoB,QAI/B;AAED,6DAA6D;AAC7D,IAAY,kCAKX;AALD,WAAY,kCAAkC;IAC5C,6DAA6D;IAC7D,uDAAiB,CAAA;IACjB,mFAAmF;IACnF,6DAAuB,CAAA;AACzB,CAAC,EALW,kCAAkC,kDAAlC,kCAAkC,QAK7C;AAED,IAAY,WAQX;AARD,WAAY,WAAW;IACrB,4BAAa,CAAA;IACb,kCAAmB,CAAA;IACnB,8BAAe,CAAA;IACf,yGAAyG;IACzG,sCAAuB,CAAA;IACvB,uDAAuD;IACvD,0BAAW,CAAA;AACb,CAAC,EARW,WAAW,2BAAX,WAAW,QAQtB"}
|
|
@@ -16,6 +16,7 @@ export declare enum TripSettlementLedgerConcept {
|
|
|
16
16
|
STRIPE_TO_DRIVER = "STRIPE_TO_DRIVER",
|
|
17
17
|
EXTERNAL_TO_DRIVER = "EXTERNAL_TO_DRIVER",
|
|
18
18
|
UAXI_SUBSIDY = "UAXI_SUBSIDY",
|
|
19
|
-
STRIPE_PROCESSING_FEE = "STRIPE_PROCESSING_FEE"
|
|
19
|
+
STRIPE_PROCESSING_FEE = "STRIPE_PROCESSING_FEE",
|
|
20
|
+
STRIPE_FEE_REALLOCATED_TO_EXTERNAL = "STRIPE_FEE_REALLOCATED_TO_EXTERNAL"
|
|
20
21
|
}
|
|
21
22
|
//# sourceMappingURL=trip-settlement.enum.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trip-settlement.enum.d.ts","sourceRoot":"","sources":["../../src/enums/trip-settlement.enum.ts"],"names":[],"mappings":"AAAA,oBAAY,4BAA4B;IACtC,WAAW,gBAAgB;IAC3B,MAAM,WAAW;IACjB,aAAa,kBAAkB;CAChC;AAED,oBAAY,oBAAoB;IAC9B,UAAU,eAAe;IACzB,kBAAkB,uBAAuB;IACzC,aAAa,kBAAkB;IAC/B,OAAO,YAAY;CACpB;AAED,oBAAY,2BAA2B;IACrC,gBAAgB,qBAAqB;IACrC,eAAe,oBAAoB;IACnC,qBAAqB,0BAA0B;IAC/C,gBAAgB,qBAAqB;IACrC,kBAAkB,uBAAuB;IACzC,YAAY,iBAAiB;IAC7B,qBAAqB,0BAA0B;
|
|
1
|
+
{"version":3,"file":"trip-settlement.enum.d.ts","sourceRoot":"","sources":["../../src/enums/trip-settlement.enum.ts"],"names":[],"mappings":"AAAA,oBAAY,4BAA4B;IACtC,WAAW,gBAAgB;IAC3B,MAAM,WAAW;IACjB,aAAa,kBAAkB;CAChC;AAED,oBAAY,oBAAoB;IAC9B,UAAU,eAAe;IACzB,kBAAkB,uBAAuB;IACzC,aAAa,kBAAkB;IAC/B,OAAO,YAAY;CACpB;AAED,oBAAY,2BAA2B;IACrC,gBAAgB,qBAAqB;IACrC,eAAe,oBAAoB;IACnC,qBAAqB,0BAA0B;IAC/C,gBAAgB,qBAAqB;IACrC,kBAAkB,uBAAuB;IACzC,YAAY,iBAAiB;IAC7B,qBAAqB,0BAA0B;IAC/C,kCAAkC,uCAAuC;CAC1E"}
|
|
@@ -23,5 +23,6 @@ var TripSettlementLedgerConcept;
|
|
|
23
23
|
TripSettlementLedgerConcept["EXTERNAL_TO_DRIVER"] = "EXTERNAL_TO_DRIVER";
|
|
24
24
|
TripSettlementLedgerConcept["UAXI_SUBSIDY"] = "UAXI_SUBSIDY";
|
|
25
25
|
TripSettlementLedgerConcept["STRIPE_PROCESSING_FEE"] = "STRIPE_PROCESSING_FEE";
|
|
26
|
+
TripSettlementLedgerConcept["STRIPE_FEE_REALLOCATED_TO_EXTERNAL"] = "STRIPE_FEE_REALLOCATED_TO_EXTERNAL";
|
|
26
27
|
})(TripSettlementLedgerConcept || (exports.TripSettlementLedgerConcept = TripSettlementLedgerConcept = {}));
|
|
27
28
|
//# sourceMappingURL=trip-settlement.enum.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trip-settlement.enum.js","sourceRoot":"","sources":["../../src/enums/trip-settlement.enum.ts"],"names":[],"mappings":";;;AAAA,IAAY,4BAIX;AAJD,WAAY,4BAA4B;IACtC,2DAA2B,CAAA;IAC3B,iDAAiB,CAAA;IACjB,+DAA+B,CAAA;AACjC,CAAC,EAJW,4BAA4B,4CAA5B,4BAA4B,QAIvC;AAED,IAAY,oBAKX;AALD,WAAY,oBAAoB;IAC9B,iDAAyB,CAAA;IACzB,iEAAyC,CAAA;IACzC,uDAA+B,CAAA;IAC/B,2CAAmB,CAAA;AACrB,CAAC,EALW,oBAAoB,oCAApB,oBAAoB,QAK/B;AAED,IAAY,
|
|
1
|
+
{"version":3,"file":"trip-settlement.enum.js","sourceRoot":"","sources":["../../src/enums/trip-settlement.enum.ts"],"names":[],"mappings":";;;AAAA,IAAY,4BAIX;AAJD,WAAY,4BAA4B;IACtC,2DAA2B,CAAA;IAC3B,iDAAiB,CAAA;IACjB,+DAA+B,CAAA;AACjC,CAAC,EAJW,4BAA4B,4CAA5B,4BAA4B,QAIvC;AAED,IAAY,oBAKX;AALD,WAAY,oBAAoB;IAC9B,iDAAyB,CAAA;IACzB,iEAAyC,CAAA;IACzC,uDAA+B,CAAA;IAC/B,2CAAmB,CAAA;AACrB,CAAC,EALW,oBAAoB,oCAApB,oBAAoB,QAK/B;AAED,IAAY,2BASX;AATD,WAAY,2BAA2B;IACrC,oEAAqC,CAAA;IACrC,kEAAmC,CAAA;IACnC,8EAA+C,CAAA;IAC/C,oEAAqC,CAAA;IACrC,wEAAyC,CAAA;IACzC,4DAA6B,CAAA;IAC7B,8EAA+C,CAAA;IAC/C,wGAAyE,CAAA;AAC3E,CAAC,EATW,2BAA2B,2CAA3B,2BAA2B,QAStC"}
|
package/package.json
CHANGED
|
@@ -10,9 +10,12 @@ import {
|
|
|
10
10
|
Index,
|
|
11
11
|
} from "sequelize-typescript";
|
|
12
12
|
import { DriverProfile } from "./driver.entity";
|
|
13
|
+
import { DriverActivePositionSnapshotSource } from "../enums/driver.enum";
|
|
13
14
|
|
|
14
15
|
/**
|
|
15
|
-
* Snapshot periódico de la posición de conductores
|
|
16
|
+
* Snapshot periódico de la posición de conductores:
|
|
17
|
+
* - `drivers:active` (online/disponible)
|
|
18
|
+
* - `driver:trip:location:{driverId}` (busy, en viaje/paquete)
|
|
16
19
|
* Lo alimenta un cron cada 30 min en microservice-drivers.
|
|
17
20
|
*/
|
|
18
21
|
export interface DriverActivePositionHistoryAttributes {
|
|
@@ -20,6 +23,8 @@ export interface DriverActivePositionHistoryAttributes {
|
|
|
20
23
|
driverId: string;
|
|
21
24
|
latitude: number;
|
|
22
25
|
longitude: number;
|
|
26
|
+
/** online (active) vs busy (en viaje/paquete). */
|
|
27
|
+
source: DriverActivePositionSnapshotSource;
|
|
23
28
|
/** Momento en que se tomó el snapshot (corrida del cron). */
|
|
24
29
|
recordedAt: Date;
|
|
25
30
|
createdAt: Date;
|
|
@@ -30,6 +35,7 @@ export interface CreateDriverActivePositionHistoryData {
|
|
|
30
35
|
driverId: string;
|
|
31
36
|
latitude: number;
|
|
32
37
|
longitude: number;
|
|
38
|
+
source?: DriverActivePositionSnapshotSource;
|
|
33
39
|
recordedAt: Date;
|
|
34
40
|
}
|
|
35
41
|
|
|
@@ -45,6 +51,10 @@ export interface CreateDriverActivePositionHistoryData {
|
|
|
45
51
|
fields: ["recordedAt"],
|
|
46
52
|
name: "driver_active_position_history_recorded_at_idx",
|
|
47
53
|
},
|
|
54
|
+
{
|
|
55
|
+
fields: ["source", "recordedAt"],
|
|
56
|
+
name: "driver_active_position_history_source_recorded_idx",
|
|
57
|
+
},
|
|
48
58
|
],
|
|
49
59
|
})
|
|
50
60
|
export class DriverActivePositionHistory extends Model<
|
|
@@ -65,7 +75,7 @@ export class DriverActivePositionHistory extends Model<
|
|
|
65
75
|
@Column({
|
|
66
76
|
type: DataType.UUID,
|
|
67
77
|
allowNull: false,
|
|
68
|
-
comment: "driver_profiles.id
|
|
78
|
+
comment: "driver_profiles.id",
|
|
69
79
|
})
|
|
70
80
|
driverId: string;
|
|
71
81
|
|
|
@@ -81,6 +91,15 @@ export class DriverActivePositionHistory extends Model<
|
|
|
81
91
|
})
|
|
82
92
|
longitude: number;
|
|
83
93
|
|
|
94
|
+
@Column({
|
|
95
|
+
type: DataType.ENUM(...Object.values(DriverActivePositionSnapshotSource)),
|
|
96
|
+
allowNull: false,
|
|
97
|
+
defaultValue: DriverActivePositionSnapshotSource.ACTIVE,
|
|
98
|
+
comment:
|
|
99
|
+
"active = online (drivers:active); busy_trip = en viaje/paquete (driver:trip:location)",
|
|
100
|
+
})
|
|
101
|
+
source: DriverActivePositionSnapshotSource;
|
|
102
|
+
|
|
84
103
|
@Column({
|
|
85
104
|
type: DataType.DATE,
|
|
86
105
|
allowNull: false,
|
|
@@ -33,6 +33,10 @@ export interface TripEarningsSettlementAttributes {
|
|
|
33
33
|
stripeToDriverAmount: number;
|
|
34
34
|
externalToDriverAmount: number;
|
|
35
35
|
stripeProcessingFee: number;
|
|
36
|
+
stripeFeeReallocatedAmount: number;
|
|
37
|
+
stripeNetToDriverAmount: number;
|
|
38
|
+
externalNetToDriverAmount: number;
|
|
39
|
+
stripeFeeAppliedAt: Date | null;
|
|
36
40
|
stripeChargeId: string | null;
|
|
37
41
|
paymentChannel: TripSettlementPaymentChannel;
|
|
38
42
|
isCorporateTrip: boolean;
|
|
@@ -60,6 +64,10 @@ export interface CreateTripEarningsSettlementData {
|
|
|
60
64
|
stripeToDriverAmount: number;
|
|
61
65
|
externalToDriverAmount: number;
|
|
62
66
|
stripeProcessingFee?: number;
|
|
67
|
+
stripeFeeReallocatedAmount?: number;
|
|
68
|
+
stripeNetToDriverAmount?: number;
|
|
69
|
+
externalNetToDriverAmount?: number;
|
|
70
|
+
stripeFeeAppliedAt?: Date | null;
|
|
63
71
|
stripeChargeId?: string | null;
|
|
64
72
|
paymentChannel: TripSettlementPaymentChannel;
|
|
65
73
|
isCorporateTrip?: boolean;
|
|
@@ -129,20 +137,57 @@ export class TripEarningsSettlement extends Model<
|
|
|
129
137
|
@Column({ type: DataType.DECIMAL(12, 2), allowNull: false, defaultValue: 0 })
|
|
130
138
|
uaxiRetainedFromCharge: number;
|
|
131
139
|
|
|
132
|
-
@Column({
|
|
140
|
+
@Column({
|
|
141
|
+
type: DataType.DECIMAL(12, 2),
|
|
142
|
+
allowNull: false,
|
|
143
|
+
defaultValue: 0,
|
|
144
|
+
comment: "Asignación Stripe al conductor antes de reasignar el fee",
|
|
145
|
+
})
|
|
133
146
|
stripeToDriverAmount: number;
|
|
134
147
|
|
|
135
|
-
@Column({
|
|
148
|
+
@Column({
|
|
149
|
+
type: DataType.DECIMAL(12, 2),
|
|
150
|
+
allowNull: false,
|
|
151
|
+
defaultValue: 0,
|
|
152
|
+
comment: "Asignación externa al conductor antes de reasignar el fee",
|
|
153
|
+
})
|
|
136
154
|
externalToDriverAmount: number;
|
|
137
155
|
|
|
138
156
|
@Column({
|
|
139
157
|
type: DataType.DECIMAL(12, 2),
|
|
140
158
|
allowNull: false,
|
|
141
159
|
defaultValue: 0,
|
|
142
|
-
comment: "Fee
|
|
160
|
+
comment: "Fee real cobrado por Stripe en el charge",
|
|
143
161
|
})
|
|
144
162
|
stripeProcessingFee: number;
|
|
145
163
|
|
|
164
|
+
@Column({
|
|
165
|
+
type: DataType.DECIMAL(12, 2),
|
|
166
|
+
allowNull: false,
|
|
167
|
+
defaultValue: 0,
|
|
168
|
+
comment: "Parte del fee movida del bucket Stripe al bucket externo",
|
|
169
|
+
})
|
|
170
|
+
stripeFeeReallocatedAmount: number;
|
|
171
|
+
|
|
172
|
+
@Column({
|
|
173
|
+
type: DataType.DECIMAL(12, 2),
|
|
174
|
+
allowNull: false,
|
|
175
|
+
defaultValue: 0,
|
|
176
|
+
comment: "Transfer Connect real al conductor después de reasignar el fee",
|
|
177
|
+
})
|
|
178
|
+
stripeNetToDriverAmount: number;
|
|
179
|
+
|
|
180
|
+
@Column({
|
|
181
|
+
type: DataType.DECIMAL(12, 2),
|
|
182
|
+
allowNull: false,
|
|
183
|
+
defaultValue: 0,
|
|
184
|
+
comment: "Pago externo final al conductor incluyendo el fee reasignado",
|
|
185
|
+
})
|
|
186
|
+
externalNetToDriverAmount: number;
|
|
187
|
+
|
|
188
|
+
@Column({ type: DataType.DATE, allowNull: true })
|
|
189
|
+
stripeFeeAppliedAt: Date | null;
|
|
190
|
+
|
|
146
191
|
@Column({ type: DataType.STRING(120), allowNull: true })
|
|
147
192
|
stripeChargeId: string | null;
|
|
148
193
|
|
|
@@ -84,7 +84,7 @@ export class UaxiTreasuryPayout extends Model<
|
|
|
84
84
|
type: DataType.DECIMAL(12, 2),
|
|
85
85
|
allowNull: false,
|
|
86
86
|
defaultValue: 0,
|
|
87
|
-
comment: "Fee Stripe
|
|
87
|
+
comment: "Fee Stripe del periodo (informativo; ya no se descuenta del payout UAXI)",
|
|
88
88
|
})
|
|
89
89
|
stripeFeeAbsorbed: number;
|
|
90
90
|
|
package/src/enums/driver.enum.ts
CHANGED
|
@@ -30,6 +30,14 @@ export enum DriverClassification {
|
|
|
30
30
|
C = "C",
|
|
31
31
|
}
|
|
32
32
|
|
|
33
|
+
/** Origen del snapshot en driver_active_position_history. */
|
|
34
|
+
export enum DriverActivePositionSnapshotSource {
|
|
35
|
+
/** Conductor disponible/online en Redis `drivers:active`. */
|
|
36
|
+
ACTIVE = "active",
|
|
37
|
+
/** Conductor en viaje/paquete (busy) — Redis `driver:trip:location:{driverId}`. */
|
|
38
|
+
BUSY_TRIP = "busy_trip",
|
|
39
|
+
}
|
|
40
|
+
|
|
33
41
|
export enum EarningType {
|
|
34
42
|
TRIP = "trip",
|
|
35
43
|
PACKAGE = "package",
|