uaxi-shared-entities 1.0.205 → 1.0.206
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/trip-accepted-driver.entity.d.ts +6 -0
- package/dist/entities/trip-accepted-driver.entity.d.ts.map +1 -1
- package/dist/entities/trip-accepted-driver.entity.js +14 -0
- package/dist/entities/trip-accepted-driver.entity.js.map +1 -1
- package/package.json +1 -1
- package/src/entities/trip-accepted-driver.entity.ts +16 -0
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Model } from 'sequelize-typescript';
|
|
2
2
|
import { Trip } from './trips.entity';
|
|
3
3
|
import { DriverProfile } from './driver.entity';
|
|
4
|
+
import { User } from './user.entity';
|
|
4
5
|
export interface TripAcceptedDriverAttributes {
|
|
5
6
|
id: string;
|
|
6
7
|
tripId: string;
|
|
@@ -13,6 +14,8 @@ export interface TripAcceptedDriverAttributes {
|
|
|
13
14
|
/** Si después canceló: true; si sigue siendo el conductor del viaje: false */
|
|
14
15
|
cancelledAfterAccept: boolean;
|
|
15
16
|
cancelledAt: Date | null;
|
|
17
|
+
/** Usuario admin que forzó la aceptación desde panel; null si aceptó el conductor en app. */
|
|
18
|
+
adminAcceptedId: string | null;
|
|
16
19
|
createdAt: Date;
|
|
17
20
|
updatedAt: Date;
|
|
18
21
|
}
|
|
@@ -24,6 +27,7 @@ export interface CreateTripAcceptedDriverData {
|
|
|
24
27
|
driverLongitude?: number | null;
|
|
25
28
|
cancelledAfterAccept?: boolean;
|
|
26
29
|
cancelledAt?: Date | null;
|
|
30
|
+
adminAcceptedId?: string | null;
|
|
27
31
|
}
|
|
28
32
|
export declare class TripAcceptedDriver extends Model<TripAcceptedDriverAttributes, CreateTripAcceptedDriverData> {
|
|
29
33
|
id: string;
|
|
@@ -34,6 +38,8 @@ export declare class TripAcceptedDriver extends Model<TripAcceptedDriverAttribut
|
|
|
34
38
|
driverLongitude: number | null;
|
|
35
39
|
cancelledAfterAccept: boolean;
|
|
36
40
|
cancelledAt: Date | null;
|
|
41
|
+
adminAcceptedId: string | null;
|
|
42
|
+
adminAcceptedBy: User | null;
|
|
37
43
|
trip: Trip;
|
|
38
44
|
driver: DriverProfile;
|
|
39
45
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trip-accepted-driver.entity.d.ts","sourceRoot":"","sources":["../../src/entities/trip-accepted-driver.entity.ts"],"names":[],"mappings":"AAKA,OAAO,EAKL,KAAK,EAEN,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"trip-accepted-driver.entity.d.ts","sourceRoot":"","sources":["../../src/entities/trip-accepted-driver.entity.ts"],"names":[],"mappings":"AAKA,OAAO,EAKL,KAAK,EAEN,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAErC,MAAM,WAAW,4BAA4B;IAC3C,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,IAAI,CAAC;IACjB,8DAA8D;IAC9D,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,+DAA+D;IAC/D,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,8EAA8E;IAC9E,oBAAoB,EAAE,OAAO,CAAC;IAC9B,WAAW,EAAE,IAAI,GAAG,IAAI,CAAC;IACzB,6FAA6F;IAC7F,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;CACjB;AAED,MAAM,WAAW,4BAA4B;IAC3C,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,IAAI,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,WAAW,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;IAC1B,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC;AAED,qBAQa,kBAAmB,SAAQ,KAAK,CAC3C,4BAA4B,EAC5B,4BAA4B,CAC7B;IAMS,EAAE,EAAE,MAAM,CAAC;IAOnB,MAAM,EAAE,MAAM,CAAC;IAOf,QAAQ,EAAE,MAAM,CAAC;IAOjB,UAAU,EAAE,IAAI,CAAC;IAOjB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAO9B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAM/B,oBAAoB,EAAE,OAAO,CAAC;IAM9B,WAAW,EAAE,IAAI,GAAG,IAAI,CAAC;IASzB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAG/B,eAAe,EAAE,IAAI,GAAG,IAAI,CAAC;IAG7B,IAAI,EAAE,IAAI,CAAC;IAGX,MAAM,EAAE,aAAa,CAAC;CACvB"}
|
|
@@ -17,6 +17,7 @@ exports.TripAcceptedDriver = void 0;
|
|
|
17
17
|
const sequelize_typescript_1 = require("sequelize-typescript");
|
|
18
18
|
const trips_entity_1 = require("./trips.entity");
|
|
19
19
|
const driver_entity_1 = require("./driver.entity");
|
|
20
|
+
const user_entity_1 = require("./user.entity");
|
|
20
21
|
let TripAcceptedDriver = class TripAcceptedDriver extends sequelize_typescript_1.Model {
|
|
21
22
|
};
|
|
22
23
|
exports.TripAcceptedDriver = TripAcceptedDriver;
|
|
@@ -82,6 +83,19 @@ __decorate([
|
|
|
82
83
|
}),
|
|
83
84
|
__metadata("design:type", Object)
|
|
84
85
|
], TripAcceptedDriver.prototype, "cancelledAt", void 0);
|
|
86
|
+
__decorate([
|
|
87
|
+
(0, sequelize_typescript_1.ForeignKey)(() => user_entity_1.User),
|
|
88
|
+
(0, sequelize_typescript_1.Column)({
|
|
89
|
+
type: sequelize_typescript_1.DataType.UUID,
|
|
90
|
+
allowNull: true,
|
|
91
|
+
comment: 'Usuario admin que aceptó el viaje desde panel (accept-admin); null si fue el conductor en app',
|
|
92
|
+
}),
|
|
93
|
+
__metadata("design:type", Object)
|
|
94
|
+
], TripAcceptedDriver.prototype, "adminAcceptedId", void 0);
|
|
95
|
+
__decorate([
|
|
96
|
+
(0, sequelize_typescript_1.BelongsTo)(() => user_entity_1.User, 'adminAcceptedId'),
|
|
97
|
+
__metadata("design:type", Object)
|
|
98
|
+
], TripAcceptedDriver.prototype, "adminAcceptedBy", void 0);
|
|
85
99
|
__decorate([
|
|
86
100
|
(0, sequelize_typescript_1.BelongsTo)(() => trips_entity_1.Trip),
|
|
87
101
|
__metadata("design:type", trips_entity_1.Trip)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trip-accepted-driver.entity.js","sourceRoot":"","sources":["../../src/entities/trip-accepted-driver.entity.ts"],"names":[],"mappings":";AAAA,gDAAgD;AAChD,sFAAsF;AACtF,gDAAgD;AAChD,8EAA8E;;;;;;;;;;;;AAE9E,+DAO8B;AAC9B,iDAAsC;AACtC,mDAAgD;
|
|
1
|
+
{"version":3,"file":"trip-accepted-driver.entity.js","sourceRoot":"","sources":["../../src/entities/trip-accepted-driver.entity.ts"],"names":[],"mappings":";AAAA,gDAAgD;AAChD,sFAAsF;AACtF,gDAAgD;AAChD,8EAA8E;;;;;;;;;;;;AAE9E,+DAO8B;AAC9B,iDAAsC;AACtC,mDAAgD;AAChD,+CAAqC;AAuC9B,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;AAOnB;IALC,IAAA,iCAAU,EAAC,GAAG,EAAE,CAAC,mBAAI,CAAC;IACtB,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,IAAI;QACnB,SAAS,EAAE,KAAK;KACjB,CAAC;;kDACa;AAOf;IALC,IAAA,iCAAU,EAAC,GAAG,EAAE,CAAC,6BAAa,CAAC;IAC/B,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,IAAI;QACnB,SAAS,EAAE,KAAK;KACjB,CAAC;;oDACe;AAOjB;IALC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,IAAI;QACnB,SAAS,EAAE,KAAK;QAChB,YAAY,EAAE,+BAAQ,CAAC,GAAG;KAC3B,CAAC;8BACU,IAAI;sDAAC;AAOjB;IALC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,MAAM;QACrB,SAAS,EAAE,IAAI;QACf,OAAO,EAAE,yDAAyD;KACnE,CAAC;;0DAC4B;AAO9B;IALC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,MAAM;QACrB,SAAS,EAAE,IAAI;QACf,OAAO,EAAE,0DAA0D;KACpE,CAAC;;2DAC6B;AAM/B;IAJC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,OAAO;QACtB,YAAY,EAAE,KAAK;KACpB,CAAC;;gEAC4B;AAM9B;IAJC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,IAAI;QACnB,SAAS,EAAE,IAAI;KAChB,CAAC;;uDACuB;AASzB;IAPC,IAAA,iCAAU,EAAC,GAAG,EAAE,CAAC,kBAAI,CAAC;IACtB,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,IAAI;QACnB,SAAS,EAAE,IAAI;QACf,OAAO,EACL,+FAA+F;KAClG,CAAC;;2DAC6B;AAG/B;IADC,IAAA,gCAAS,EAAC,GAAG,EAAE,CAAC,kBAAI,EAAE,iBAAiB,CAAC;;2DACZ;AAG7B;IADC,IAAA,gCAAS,EAAC,GAAG,EAAE,CAAC,mBAAI,CAAC;8BAChB,mBAAI;gDAAC;AAGX;IADC,IAAA,gCAAS,EAAC,GAAG,EAAE,CAAC,6BAAa,CAAC;8BACvB,6BAAa;kDAAC;6BA1EX,kBAAkB;IAR9B,IAAA,4BAAK,EAAC;QACL,SAAS,EAAE,uBAAuB;QAClC,UAAU,EAAE,IAAI;QAChB,OAAO,EAAE;YACP,EAAE,IAAI,EAAE,gCAAgC,EAAE,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE;YAC9D,EAAE,IAAI,EAAE,kCAAkC,EAAE,MAAM,EAAE,CAAC,UAAU,CAAC,EAAE;SACnE;KACF,CAAC;GACW,kBAAkB,CA2E9B"}
|
package/package.json
CHANGED
|
@@ -13,6 +13,7 @@ import {
|
|
|
13
13
|
} from 'sequelize-typescript';
|
|
14
14
|
import { Trip } from './trips.entity';
|
|
15
15
|
import { DriverProfile } from './driver.entity';
|
|
16
|
+
import { User } from './user.entity';
|
|
16
17
|
|
|
17
18
|
export interface TripAcceptedDriverAttributes {
|
|
18
19
|
id: string;
|
|
@@ -26,6 +27,8 @@ export interface TripAcceptedDriverAttributes {
|
|
|
26
27
|
/** Si después canceló: true; si sigue siendo el conductor del viaje: false */
|
|
27
28
|
cancelledAfterAccept: boolean;
|
|
28
29
|
cancelledAt: Date | null;
|
|
30
|
+
/** Usuario admin que forzó la aceptación desde panel; null si aceptó el conductor en app. */
|
|
31
|
+
adminAcceptedId: string | null;
|
|
29
32
|
createdAt: Date;
|
|
30
33
|
updatedAt: Date;
|
|
31
34
|
}
|
|
@@ -38,6 +41,7 @@ export interface CreateTripAcceptedDriverData {
|
|
|
38
41
|
driverLongitude?: number | null;
|
|
39
42
|
cancelledAfterAccept?: boolean;
|
|
40
43
|
cancelledAt?: Date | null;
|
|
44
|
+
adminAcceptedId?: string | null;
|
|
41
45
|
}
|
|
42
46
|
|
|
43
47
|
@Table({
|
|
@@ -106,6 +110,18 @@ export class TripAcceptedDriver extends Model<
|
|
|
106
110
|
})
|
|
107
111
|
cancelledAt: Date | null;
|
|
108
112
|
|
|
113
|
+
@ForeignKey(() => User)
|
|
114
|
+
@Column({
|
|
115
|
+
type: DataType.UUID,
|
|
116
|
+
allowNull: true,
|
|
117
|
+
comment:
|
|
118
|
+
'Usuario admin que aceptó el viaje desde panel (accept-admin); null si fue el conductor en app',
|
|
119
|
+
})
|
|
120
|
+
adminAcceptedId: string | null;
|
|
121
|
+
|
|
122
|
+
@BelongsTo(() => User, 'adminAcceptedId')
|
|
123
|
+
adminAcceptedBy: User | null;
|
|
124
|
+
|
|
109
125
|
@BelongsTo(() => Trip)
|
|
110
126
|
trip: Trip;
|
|
111
127
|
|