This commit is contained in:
2026-02-26 10:07:05 +03:30
parent c8ff614aaf
commit c608a8e159
3 changed files with 31 additions and 20 deletions
+8 -16
View File
@@ -1413,15 +1413,13 @@
}, },
"delivery_fee": { "delivery_fee": {
"name": "delivery_fee", "name": "delivery_fee",
"type": "numeric(10,0)", "type": "int",
"unsigned": false, "unsigned": false,
"autoincrement": false, "autoincrement": false,
"primary": false, "primary": false,
"nullable": false, "nullable": false,
"precision": 10,
"scale": 0,
"default": "0", "default": "0",
"mappedType": "decimal" "mappedType": "integer"
}, },
"delivery_fee_type": { "delivery_fee_type": {
"name": "delivery_fee_type", "name": "delivery_fee_type",
@@ -1439,39 +1437,33 @@
}, },
"per_kilometer_fee": { "per_kilometer_fee": {
"name": "per_kilometer_fee", "name": "per_kilometer_fee",
"type": "numeric(10,0)", "type": "int",
"unsigned": false, "unsigned": false,
"autoincrement": false, "autoincrement": false,
"primary": false, "primary": false,
"nullable": true, "nullable": true,
"precision": 10,
"scale": 0,
"default": "0", "default": "0",
"mappedType": "decimal" "mappedType": "integer"
}, },
"distance_based_min_cost": { "distance_based_min_cost": {
"name": "distance_based_min_cost", "name": "distance_based_min_cost",
"type": "numeric(10,0)", "type": "int",
"unsigned": false, "unsigned": false,
"autoincrement": false, "autoincrement": false,
"primary": false, "primary": false,
"nullable": true, "nullable": true,
"precision": 10,
"scale": 0,
"default": "0", "default": "0",
"mappedType": "decimal" "mappedType": "integer"
}, },
"min_order_price": { "min_order_price": {
"name": "min_order_price", "name": "min_order_price",
"type": "numeric(10,0)", "type": "int",
"unsigned": false, "unsigned": false,
"autoincrement": false, "autoincrement": false,
"primary": false, "primary": false,
"nullable": false, "nullable": false,
"precision": 10,
"scale": 0,
"default": "0", "default": "0",
"mappedType": "decimal" "mappedType": "integer"
}, },
"description": { "description": {
"name": "description", "name": "description",
@@ -0,0 +1,19 @@
import { Migration } from '@mikro-orm/migrations';
export class Migration20260226063544 extends Migration {
override async up(): Promise<void> {
this.addSql(`alter table "deliveries" alter column "delivery_fee" type int using ("delivery_fee"::int);`);
this.addSql(`alter table "deliveries" alter column "per_kilometer_fee" type int using ("per_kilometer_fee"::int);`);
this.addSql(`alter table "deliveries" alter column "distance_based_min_cost" type int using ("distance_based_min_cost"::int);`);
this.addSql(`alter table "deliveries" alter column "min_order_price" type int using ("min_order_price"::int);`);
}
override async down(): Promise<void> {
this.addSql(`alter table "deliveries" alter column "delivery_fee" type numeric(10,0) using ("delivery_fee"::numeric(10,0));`);
this.addSql(`alter table "deliveries" alter column "per_kilometer_fee" type numeric(10,0) using ("per_kilometer_fee"::numeric(10,0));`);
this.addSql(`alter table "deliveries" alter column "distance_based_min_cost" type numeric(10,0) using ("distance_based_min_cost"::numeric(10,0));`);
this.addSql(`alter table "deliveries" alter column "min_order_price" type numeric(10,0) using ("min_order_price"::numeric(10,0));`);
}
}
@@ -11,19 +11,19 @@ export class Delivery extends BaseEntity {
@ManyToOne(() => Restaurant) @ManyToOne(() => Restaurant)
restaurant!: Restaurant; restaurant!: Restaurant;
@Property({ type: 'decimal', precision: 10, scale: 0, default: 0 }) @Property({ type: 'number', default: 0 })
deliveryFee: number = 0; deliveryFee: number = 0;
@Enum(() => DeliveryFeeTypeEnum) @Enum(() => DeliveryFeeTypeEnum)
deliveryFeeType: DeliveryFeeTypeEnum = DeliveryFeeTypeEnum.FIXED; deliveryFeeType: DeliveryFeeTypeEnum = DeliveryFeeTypeEnum.FIXED;
@Property({ type: 'decimal', precision: 10, scale: 0, default: 0 }) @Property({ type: 'number', default: 0 })
perKilometerFee: number | null = null; perKilometerFee: number | null = null;
@Property({ type: 'decimal', precision: 10, scale: 0, default: 0 }) @Property({ type: 'number', default: 0 })
distanceBasedMinCost: number | null = null; distanceBasedMinCost: number | null = null;
@Property({ type: 'decimal', precision: 10, scale: 0, default: 0 }) @Property({ type: 'number', default: 0 })
minOrderPrice: number = 0; minOrderPrice: number = 0;
@Property({ nullable: true }) @Property({ nullable: true })