danak/shop-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #76 from Danakcorp/chatbot

Browse Source 
not round prices
This commit is contained in:
morteza-mortezai
2025-12-10 17:54:11 +03:30
committed by GitHub
parent 0eaffd9e6b 0ce2fea56d
commit cfca1e7e9f
3 changed files with 69 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/db/seeders/shipmentSeeder.ts
+63 -92
View File
@@ -1,4 +1,3 @@
import { cleanMongoData, extractDumpData, getCollectionData } from "./utils/extractDumpData";
import { DeliveryType } from "../../common/enums/shipment.enum"; import { DeliveryType } from "../../common/enums/shipment.enum";
import { Logger } from "../../core/logging/logger"; import { Logger } from "../../core/logging/logger";
import { ShipmentModel } from "../../modules/shipment/models/shipment.model"; import { ShipmentModel } from "../../modules/shipment/models/shipment.model";
@@ -7,100 +6,72 @@ export const SeedShipment = async (logger: Logger) => {
try { try {
logger.info("ShipmentMethod seeding started"); logger.info("ShipmentMethod seeding started");
// Extract data from dump // Remove all existing shipment documents
const dumpData = extractDumpData(); await ShipmentModel.deleteMany({});
const shipmentsData = getCollectionData(dumpData, "shipments"); logger.info("Existing shipment collection cleared");
if (shipmentsData.length === 0) { const fallbackProviders = [
logger.warn("No shipment data found in dump, using fallback data"); {
const fallbackProviders = [ name: "پست",
{ description: "ارسال توسط پست",
name: "پست", costs: [
description: "ارسال توسط پست", { weightRange: { min: 0, max: 1 }, cost_first: 40000, cost_rest: 2000 },
costs: [ { weightRange: { min: 1, max: 5 }, cost_first: 80000, cost_rest: 2000 },
{ weightRange: { min: 0, max: 1 }, cost_first: 40000, cost_rest: 2000 }, { weightRange: { min: 5, max: 10 }, cost_first: 100000, cost_rest: 2000 },
{ weightRange: { min: 1, max: 5 }, cost_first: 80000, cost_rest: 2000 }, ],
{ weightRange: { min: 5, max: 10 }, cost_first: 100000, cost_rest: 2000 }, deliveryTime: 5,
], deliveryType: DeliveryType.Standard,
deliveryTime: 5, },
deliveryType: DeliveryType.Standard, {
}, name: "چاپار",
{ description: "ارائه بهترین راه حل های جهانی لجستیک چاپار",
name: "چاپار", costs: [
description: "ارائه بهترین راه حل های جهانی لجستیک چاپار", { weightRange: { min: 0, max: 2 }, cost_first: 40000, cost_rest: 2000 },
costs: [ { weightRange: { min: 2, max: 6 }, cost_first: 80000, cost_rest: 2000 },
{ weightRange: { min: 0, max: 2 }, cost_first: 40000, cost_rest: 2000 }, { weightRange: { min: 6, max: 12 }, cost_first: 100000, cost_rest: 2000 },
{ weightRange: { min: 2, max: 6 }, cost_first: 80000, cost_rest: 2000 }, ],
{ weightRange: { min: 6, max: 12 }, cost_first: 100000, cost_rest: 2000 }, deliveryTime: 6,
], deliveryType: DeliveryType.Standard,
deliveryTime: 6, },
deliveryType: DeliveryType.Standard, {
}, name: "پیک",
{ description: "ارسال توسط پیک",
name: "پیک", costs: [
description: "ارسال توسط پیک", { weightRange: { min: 0, max: 1 }, cost_first: 40000, cost_rest: 2000 },
costs: [ { weightRange: { min: 1, max: 3 }, cost_first: 80000, cost_rest: 2000 },
{ weightRange: { min: 0, max: 1 }, cost_first: 40000, cost_rest: 2000 }, { weightRange: { min: 3, max: 6 }, cost_first: 100000, cost_rest: 2000 },
{ weightRange: { min: 1, max: 3 }, cost_first: 80000, cost_rest: 2000 }, ],
{ weightRange: { min: 3, max: 6 }, cost_first: 100000, cost_rest: 2000 }, deliveryTime: 0,
], deliveryType: DeliveryType.SameDay,
deliveryTime: 0, },
deliveryType: DeliveryType.SameDay, {
}, name: "تیپاکس",
{ description: "ارسال بسته های پستی در سریعترین زمان، از درب منزل با امکان پرداخت هزینه بعد از ارسال و پوشش تمام نقاط ایران",
name: "تیپاکس", costs: [
description: "ارسال بسته های پستی در سریعترین زمان، از درب منزل با امکان پرداخت هزینه بعد از ارسال و پوشش تمام نقاط ایران", { weightRange: { min: 0, max: 1 }, cost_first: 40000, cost_rest: 2000 },
costs: [ { weightRange: { min: 1, max: 5 }, cost_first: 80000, cost_rest: 2000 },
{ weightRange: { min: 0, max: 1 }, cost_first: 40000, cost_rest: 2000 }, { weightRange: { min: 5, max: 10 }, cost_first: 100000, cost_rest: 2000 },
{ weightRange: { min: 1, max: 5 }, cost_first: 80000, cost_rest: 2000 }, ],
{ weightRange: { min: 5, max: 10 }, cost_first: 100000, cost_rest: 2000 }, deliveryTime: 2,
], deliveryType: DeliveryType.Express,
deliveryTime: 2, },
deliveryType: DeliveryType.Express, {
}, name: "باربری",
{ description: "ارسال توسط باربری",
name: "باربری", costs: [
description: "ارسال توسط باربری", { weightRange: { min: 0, max: 10 }, cost_first: 40000, cost_rest: 2000 },
costs: [ { weightRange: { min: 10, max: 20 }, cost_first: 80000, cost_rest: 2000 },
{ weightRange: { min: 0, max: 10 }, cost_first: 40000, cost_rest: 2000 }, { weightRange: { min: 20, max: 50 }, cost_first: 100000, cost_rest: 2000 },
{ weightRange: { min: 10, max: 20 }, cost_first: 80000, cost_rest: 2000 }, ],
{ weightRange: { min: 20, max: 50 }, cost_first: 100000, cost_rest: 2000 }, deliveryTime: 7,
], deliveryType: DeliveryType.Standard,
deliveryTime: 7, },
deliveryType: DeliveryType.Standard, ];
},
];
for (const provider of fallbackProviders) { for (const provider of fallbackProviders) {
await ShipmentModel.create(provider); await ShipmentModel.create(provider);
}
logger.info("Shipment Providers seeded successfully with fallback data");
return;
}
// Clean and prepare shipment data (only non-deleted)
const cleanedShipments = shipmentsData
.map((shipment) => {
const cleaned = cleanMongoData(shipment);
if (cleaned.deleted) {
return null;
}
return {
name: cleaned.name,
description: cleaned.description,
costs: cleaned.costs,
deliveryTime: cleaned.deliveryTime,
deliveryType: cleaned.deliveryType as DeliveryType,
};
})
.filter((s) => s !== null);
if (cleanedShipments.length > 0) {
await ShipmentModel.insertMany(cleanedShipments);
logger.info(`Shipment Providers seeded successfully (${cleanedShipments.length} providers)`);
} else {
logger.warn("No valid shipments found after filtering");
} }
logger.info("Shipment Providers seeded successfully");
} catch (error) { } catch (error) {
logger.error("Error seeding Shipment providers:", error); logger.error("Error seeding Shipment providers:", error);
} }
src/modules/product/models/productVariant.model.ts
+5 -5
View File
@@ -67,11 +67,11 @@ const productVariantSchema = new Schema<IProductVariant>(
productVariantSchema.pre("save", function (next) { productVariantSchema.pre("save", function (next) {
if (this.price) { if (this.price) {
if (this.price.retailPrice) { if (this.price.retailPrice) {
this.price.retailPrice = Math.round(this.price.retailPrice / 10000) * 10000; this.price.retailPrice = Number(this.price.retailPrice);
const sellingPrice = const sellingPrice =
this.price.discount_percent > 0 ? this.price.retailPrice * ((100 - this.price.discount_percent) / 100) : this.price.retailPrice; this.price.discount_percent > 0 ? this.price.retailPrice * ((100 - this.price.discount_percent) / 100) : this.price.retailPrice;
this.price.selling_price = Math.round(sellingPrice / 10000) * 10000; this.price.selling_price = Number(sellingPrice);
} }
} }
@@ -84,15 +84,15 @@ productVariantSchema.pre(["findOneAndUpdate", "updateOne", "updateMany"], functi
// ensure price object exists in the update object // ensure price object exists in the update object
if (update.price && update.price.retailPrice !== undefined) { if (update.price && update.price.retailPrice !== undefined) {
const retailPrice = Math.round(update.price.retailPrice / 10000) * 10000; const retailPrice = Number(update.price.retailPrice);
const discountPercent = Math.round(update.price.discount_percent) || 0; const discountPercent = update.price.discount_percent || 0;
// calculate selling price based on retailPrice and discount_percent // calculate selling price based on retailPrice and discount_percent
const sellingPrice = discountPercent > 0 ? retailPrice * ((100 - discountPercent) / 100) : retailPrice; const sellingPrice = discountPercent > 0 ? retailPrice * ((100 - discountPercent) / 100) : retailPrice;
// set the calculated selling price in the update object // set the calculated selling price in the update object
update.price.retailPrice = retailPrice; update.price.retailPrice = retailPrice;
update.price.selling_price = Math.round(sellingPrice / 10000) * 10000; update.price.selling_price = Number(sellingPrice);
update.price.discount_percent = discountPercent; update.price.discount_percent = discountPercent;
} }
src/modules/shipment/shipment.repository.ts
+1 -1
View File
@@ -12,7 +12,7 @@ class ShipmentRepository extends BaseRepository<IShipmentProviders> {
const skip = (page - 1) * limit; const skip = (page - 1) * limit;
const count = await this.model.countDocuments({ deleted: false }); const count = await this.model.countDocuments({ deleted: false });
const shipper = await this.model.find({ deleted: false }).skip(skip).limit(limit); const shipper = await this.model.find({ deleted: false }).skip(skip).limit(limit).lean();
return { shipper, count }; return { shipper, count };
} }