SmartDukaan – //trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/

Rev 37840 – fix(offers): select month offers by date overlap so multi-month offers ...

amit — Mon, 05 Oct 2026 13:28:42 +0530

amit – 2 file(s) modified
fix(offers): select month offers by date overlap so multi-month offers show in price circular

selectAll(YearMonth) kept an offer only if its start or end date fell in the month,
so an offer running Sep 24 -> Nov 15 (e.g. 10378) was missing from October's price
circular, partner offer view and getMonthOfferIds. Now start <= month end AND
end >= month start. Offer cache eviction (edit + bulk create) clears every month
the offer covers instead of only the start month.

Rev 37805 – fix(catalog): trim f_ colour prefix space; age delisted listings from ...

amit — Tue, 29 Sep 2026 04:14:47 +0530

amit – 8 file(s) modified
fix(catalog): trim f_ colour prefix space; age delisted listings from last activation

- Item.normalizeColor drops the space after f_ on every write (upload sheets typed
'f_ Black', which read ' Black' everywhere); ItemLoaderService uses it so the
duplicate-colour check compares the clean value
- tag_listing.last_activated, stamped by TagListing.setActive on off->on;
updateActiveById now goes through the entity (+flush) so the toggle stamps it
- delist cron + SQL script age a listing from GREATEST(start_date, last_activated),
so a re-activated listing is not delisted again the next morning
- migrations: add_tag_listing_last_activated_20260929.sql, fix_item_color_prefix_space_20260929.sql
(both applied on hadb1 2026-09-29; 174 items trimmed, 36830 excluded - clashes with 37089)

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Item.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TagListing.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/TagListingRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/CatalogDelistServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/ItemLoaderService.java
+ /trunk/profitmandi-dao/src/main/resources/sql/add_tag_listing_last_activated_20260929.sql
~ /trunk/profitmandi-dao/src/main/resources/sql/delist_inactive_listings_rolling_24m.sql
+ /trunk/profitmandi-dao/src/main/resources/sql/fix_item_color_prefix_space_20260929.sql

Rev 37782 – fix(catalog): add serializedOnly overloads of selectAllItems/selectAllBrands r37776 committed InventoryServiceImpl ...

amit — Fri, 25 Sep 2026 14:54:53 +0530

amit – 3 file(s) modified
fix(catalog): add serializedOnly overloads of selectAllItems/selectAllBrands

r37776 committed InventoryServiceImpl calling the 3-arg selectAllItems and
selectAllBrands, but the repository overloads and the named-query parameters
they bind were left uncommitted, so a build from trunk failed.

serializedOnly = true restricts the model/brand pickers to IMEI items; the
2-arg forms delegate with false, unchanged behaviour.

Rev 37640 – Hot Deal brand: brand-driven membership, model_hot_deal reduced to attributes + ...

amit — Tue, 15 Sep 2026 17:39:20 +0530

amit – 14 file(s) modified
Hot Deal brand: brand-driven membership, model_hot_deal reduced to attributes + oem_brand + oem_catalog_id, migration SQL

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/cart/CartServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/ModelHotDeal.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TagListing.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CatalogRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CatalogRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ModelHotDealRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ModelHotDealRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/solr/FofoSolr.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/ModelHotDealService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/ModelHotDealServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PricingServiceImpl.java
+ /trunk/profitmandi-dao/src/main/resources/sql/hot_deal_brand_migration.sql
+ /trunk/profitmandi-dao/src/main/resources/sql/hot_deal_brand_schema.sql
~ /trunk/profitmandi-dao/src/test/java/com/spice/profitmandi/service/catalog/ModelHotDealServiceImplTest.java

Rev 37634 – feat(pricing): tag_listing price change log; retire vendoritempricing writes/reads in dao; ...

amit — Tue, 15 Sep 2026 17:23:02 +0530

amit – 14 file(s) modified
feat(pricing): tag_listing price change log; retire vendoritempricing writes/reads in dao; price drops no longer touch vendor catalog pricing

- New catalog.tag_listing_price_log (sql/create_tag_listing_price_log_20260915.sql, applied on prod 2026-09-15) + TagListingPriceService: the single setter for tag_listing DP/MOP/MRP, logging old/new values, source and user
- Remove applyPriceDrop (r37622): price drops write only price_drop + tag_listing; sql/revert_price_drop_vendor_catalog_pricing_20260915.sql restores the 30 rows it wrote (run on prod)
- VendorCatalogPricingService: reference TP = latest approved external TP (single + batched); internal suppliers rejected on create, bulk upload and approval
- Stop copying pricing into vendoritempricing on approval and item upload; tag listing detail TP from reference TP; indent DP from tag_listing only

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TagListingPriceLog.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/SaholicInventoryCIS.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/TagListingPriceLogRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/TagListingPriceLogRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/VendorCatalogPricingLogRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/VendorCatalogPricingLogRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/ItemLoaderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/VendorCatalogPricingService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/VendorCatalogPricingServiceImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/tag/TagListingPriceService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/tag/TagListingPriceServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/tag/TagServiceImpl.java
+ /trunk/profitmandi-dao/src/main/resources/sql/create_tag_listing_price_log_20260915.sql
+ /trunk/profitmandi-dao/src/main/resources/sql/revert_price_drop_vendor_catalog_pricing_20260915.sql

Rev 37563 – Filter delisted SKUs out of creation pickers; add rolling 24m ...

amit — Thu, 10 Sep 2026 02:52:18 +0530

amit – 7 file(s) modified
Filter delisted SKUs out of creation pickers; add rolling 24m delist migration

Creation screens could offer items whose catalog.tag_listing.active = 0:
- Item.selectAllModels (scheme/offer model dropdown) joined tag_listing with
no active predicate. Adding tl.active = true also gives the model-level
rollup, since callers dedupe to catalogItemId: a model whose colours are
all inactive now yields no rows, one keeping a listed colour stays.
- The shared partner item picker had no active filter at all. Added a second
basis via getAllPartnerItemStringDescription(anyColor, activeOnly);
activeOnly participates in the fofoItems cache key so the two bases cannot
serve each other's cached results. Default stays false for screens that
inspect or edit existing records.
- New TagListing.selectActiveItemIds named query backs the filter.

Also adds the rolling 24-month delist migration: zero stock both sides, no
outstanding vendor PO (status IN (1,2), external supplier, unfulfilled > 0 --
INIT is excluded as it is a drawer of stale drafts), and re-categorises
fully-dark mobile models to OTHER. Idempotent, audited, rollback documented.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Item.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TagListing.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/TagListingRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/TagListingRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java
+ /trunk/profitmandi-dao/src/main/resources/sql/delist_inactive_listings_rolling_24m.sql

Rev 37500 – sales target and achievement added cron and flags

ranu — Tue, 01 Sep 2026 16:19:27 +0530

ranu – 3 file(s) modified
sales target and achievement added cron and flags

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/SalesAchievements.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SalesAchievementsRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SalesAchievementsRepositoryImpl.java

Rev 37499 – sales target and achievement added cron and flags

ranu — Tue, 01 Sep 2026 16:09:28 +0530

ranu – 7 file(s) modified
sales target and achievement added cron and flags

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledSkeleton.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/SalesTargets.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SalesTargetsRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SalesTargetsRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/IciciLombardService.java

Rev 37276 – Hot deals Solr: derive hot_deal_b from model_hot_deal active windows at ...

amit — Mon, 10 Aug 2026 11:44:16 +0530

amit – 4 file(s) modified
Hot deals Solr: derive hot_deal_b from model_hot_deal active windows at index time (full push, single-catalog update, parent + child docs) - catalog.model_hot_deal is the only source, tag_listing.hot_deals no longer read; drop unused tag_listing write-through methods; syncHotDealFlags javadoc reflects reindex-based daily sync

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/TagListingRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/TagListingRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/solr/FofoSolr.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/ModelHotDealService.java

Rev 37275 – Add ModelHotDeal window-boundary and active catalog-id lookups r37268 committed ...

amit — Mon, 10 Aug 2026 11:35:10 +0530

amit – 2 file(s) modified
Add ModelHotDeal window-boundary and active catalog-id lookups

r37268 committed the ModelHotDealServiceImpl call to
selectWindowBoundaryCatalogIds but not the repository declaration or
implementation, breaking the trunk build with 'cannot find symbol'.

Adds both methods:
- selectWindowBoundaryCatalogIds(today): catalog ids whose deal window opens
today or closed yesterday, i.e. the models whose hot_deal_b flips at
midnight and need a Solr re-index.
- selectActiveCatalogIds(today): catalog ids with a deal live on the given
date, the Solr hot_deal_b source (caller in FofoSolr still pending).

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ModelHotDealRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ModelHotDealRepositoryImpl.java

Rev 37271 – Add selectMappingByCatalogIdAndSuperCatalogId to SuperCatalogMappingRepository Lookup by the (catalogId, superCatalogId) ...

amit — Mon, 10 Aug 2026 11:12:16 +0530

amit – 2 file(s) modified
Add selectMappingByCatalogIdAndSuperCatalogId to SuperCatalogMappingRepository

Lookup by the (catalogId, superCatalogId) pair so the super-catalog save
flow can detect an existing mapping instead of always inserting.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SuperCatalogMappingRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SuperCatalogMappingRepositoryImpl.java

Rev 37261 – hot deal show all items

ranu — Fri, 07 Aug 2026 16:52:26 +0530

ranu – 3 file(s) modified
hot deal show all items

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CatalogRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CatalogRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/HotDealController.java

Rev 37254 – feat: hot-deals admin search/pagination + tag_listing.hot_deals write-through and daily sync ...

amit — Thu, 06 Aug 2026 15:38:09 +0530

amit – 7 file(s) modified
feat: hot-deals admin search/pagination + tag_listing.hot_deals write-through and daily sync

- searchAllWithCatalog/countSearchAll: all-brands deal listing joined with
Catalog (brandName transient), server-side search on model/brand, paginated
- add/removeDeal write through to tag_listing.hot_deals (Solr hot_deal_b
source) and publish a re-index event (prod-gated in TagListingChangeListener)
- syncHotDealFlags: daily reconcile of date-windowed model_hot_deal into
tag_listing.hot_deals so deal windows start/expire on time

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/ModelHotDeal.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ModelHotDealRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ModelHotDealRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/TagListingRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/TagListingRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/ModelHotDealService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/ModelHotDealServiceImpl.java

Rev 37244 – Hot deal attributes: five mandatory fields (warranty_months 0-12, item_condition NEW/OPEN_BOX/REFURBISHED, ...

amit — Thu, 06 Aug 2026 10:54:32 +0530

amit – 10 file(s) modified
Hot deal attributes: five mandatory fields (warranty_months 0-12, item_condition NEW/OPEN_BOX/REFURBISHED, activated, finance_mapping, affordability) on model_hot_deal - entity+enum+attributes holder, service validation (no defaults), addDeal/updateDeal signatures, selectActiveByCatalogItemIds/selectAllActive repo queries, hotDealTags on FofoCatalogResponse, DDL script, tests (14 green)

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/HotDealCondition.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/ModelHotDeal.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ModelHotDealRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ModelHotDealRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/HotDealAttributes.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/ModelHotDealService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/ModelHotDealServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/FofoCatalogResponse.java
+ /trunk/profitmandi-dao/src/main/resources/sql/model_hot_deal_attributes.sql
~ /trunk/profitmandi-dao/src/test/java/com/spice/profitmandi/service/catalog/ModelHotDealServiceImplTest.java

Rev 37242 – Reject non-18% GST rates for TV categories (14202/14203) in addStateGstRates ...

amit — Wed, 05 Aug 2026 18:34:43 +0530

amit – 1 file(s) modified
Reject non-18% GST rates for TV categories (14202/14203) in addStateGstRates - GST 2.0 makes all TVs 18% regardless of screen size; guards item-loader sheets and Taxation CSV upload from re-introducing 28%

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/StateGstRateRepositoryImpl.java

Rev 37211 – Hot Deals: model_hot_deal entity, repository and service with 15-active-per-brand cap, ...

amit — Tue, 04 Aug 2026 13:01:55 +0530

amit – 8 file(s) modified
Hot Deals: model_hot_deal entity, repository and service with 15-active-per-brand cap, duplicate-active and date validation

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/ModelHotDeal.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ModelHotDealRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ModelHotDealRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/ModelHotDealService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/ModelHotDealServiceImpl.java
+ /trunk/profitmandi-dao/src/main/resources/sql/model_hot_deal_schema.sql
+ /trunk/profitmandi-dao/src/test/java/com/spice/profitmandi/service/catalog
+ /trunk/profitmandi-dao/src/test/java/com/spice/profitmandi/service/catalog/ModelHotDealServiceImplTest.java

Rev 37204 – external api v2: category spec + client category entities, cached ...

amit — Tue, 04 Aug 2026 12:28:23 +0530

amit – 16 file(s) modified
external api v2: category spec + client category entities, cached category exposure, title util, item.brand_identifier, ContentPojo categoryId/categorySpecs

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/CategorySpecDefinition.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Item.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ApiClientCategory.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CategorySpecPojo.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/ContentPojo.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/external/ExternalTitleUtil.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CategorySpecDefinitionRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CategorySpecDefinitionRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/external/ApiClientRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/external/ApiClientRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/external/ApiClientAuthService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/external/ApiClientAuthServiceImpl.java
+ /trunk/profitmandi-dao/src/test/java/com/spice/profitmandi/dao
+ /trunk/profitmandi-dao/src/test/java/com/spice/profitmandi/dao/model
+ /trunk/profitmandi-dao/src/test/java/com/spice/profitmandi/dao/model/external
+ /trunk/profitmandi-dao/src/test/java/com/spice/profitmandi/dao/model/external/ExternalTitleUtilTest.java

Rev 37098 – Align CatalogRepository.selectCatalog signature with impl param order (brand, modelNumber, modelName) ...

amit — Thu, 16 Jul 2026 12:24:14 +0530

amit – 1 file(s) modified
Align CatalogRepository.selectCatalog signature with impl param order (brand, modelNumber, modelName)

Interface declared (brand, modelName, modelNumber) while CatalogRepositoryImpl
binds equalsMap keys off its own params (brand, modelNumber, modelName). The lone
caller, ItemLoaderService.addItem, passes impl order, so lookups worked by accident.
Any new caller trusting the interface signature would have silently swapped
modelName/modelNumber and minted phantom catalogs on lookup miss.

Names only; binary signature (String,String,String) is unchanged, so behaviour and
all callers are unaffected.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CatalogRepository.java

Rev 37033 – Offer report: treat catalogIds as authoritative in item criteria ...

amit — Tue, 07 Jul 2026 15:06:43 +0530

amit – 1 file(s) modified
Offer report: treat catalogIds as authoritative in item criteria

When an offer item criteria specifies catalogIds, match exactly those catalog
ids and skip the brand/category(smartWatch,led)/hsn(smartPhone,featuredPhone)
filters. Previously smartWatch/led ANDed a categoryId filter unconditionally, so
a catalog wrongly flagged smartWatch (e.g. Oppo ENCO Buds, offer 9661) matched
zero items and the download report came back empty despite real purchases.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemRepositoryImpl.java

Rev 36971 – Surface active flagship models as a 'flagship' Solr label (prepended, ...

amit — Tue, 30 Jun 2026 20:03:35 +0530

amit – 3 file(s) modified
Surface active flagship models as a 'flagship' Solr label (prepended, shows first) in catalog indexing; add no-arg selectActiveFlagshipCatalogIds

Rev 36578 – Flagship credit: fix sale conversion to use invoice reference, add ...

amit — Sun, 17 May 2026 15:15:25 +0530

amit – 6 file(s) modified
Flagship credit: fix sale conversion to use invoice reference, add IMEI activation trigger

- Sale flow: removed unnecessary model_flagship table lookup at sale time. The flagship loan's invoice number already links to the purchase orders, making the date-based check redundant and incorrect (would miss conversions if flagship entry removed after billing).
- IMEI activation: added flagship conversion in addActivatedImeis() for newly activated serials. Groups by partner, checks flagship limits, converts via invoice matching. Covers Samsung/Vivo/Oppo/Realme activation crons and manual UI uploads.
- Repository: added date-parameterized selectActiveFlagshipCatalogIds(catalogIds, asOfDate) overload for future use. Existing method delegates with LocalDate.now().

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ModelFlagshipRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ModelFlagshipRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditServiceImpl.java

Rev 36562 – Flagship credit: date-wise model_flagship table, sale-time conversion with pessimistic locking, ...

amit — Sat, 16 May 2026 13:23:41 +0530

amit – 8 file(s) modified
Flagship credit: date-wise model_flagship table, sale-time conversion with pessimistic locking, batch queries, extracted doConvertFlagshipToLoan helper, removed Catalog.isFlagship

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Catalog.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/ModelFlagship.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ModelFlagshipRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ModelFlagshipRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditServiceImpl.java
+ /trunk/profitmandi-dao/src/main/resources/sql/model_flagship_schema.sql

Rev 36482 – V2 Weekly feedback and All Brands API

vikas — Wed, 06 May 2026 19:37:59 +0530

vikas – 6 file(s) modified
V2 Weekly feedback and All Brands API

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/BrandCategoryRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/BrandCategoryRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/BrandsService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/BrandsServiceImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/V2BrandController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/V2LeadController.java

Rev 36428 – Fix:Partner Stock Api

aman — Wed, 29 Apr 2026 16:17:41 +0530

aman – 4 file(s) modified
Fix:Partner Stock Api

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TagListing.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/TagListingRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/TagListingRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/StoreController.java

Rev 36403 – Add catalog.catalog_monitor_type table, entity, and repository for per-catalog focused/normal monitor ...

amit — Mon, 27 Apr 2026 14:57:42 +0530

amit – 5 file(s) modified
Add catalog.catalog_monitor_type table, entity, and repository for per-catalog focused/normal monitor type tagging

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/CatalogMonitorType.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/MonitorType.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CatalogMonitorTypeRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CatalogMonitorTypeRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/resources/sql/catalog_monitor_type.sql

Rev 36374 – schemes and offer for v2 version

ranu — Fri, 24 Apr 2026 15:23:35 +0530

ranu – 9 file(s) modified
schemes and offer for v2 version

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Scheme.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoOfferController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoSchemeController.java

Rev 36302 – Add 2-min cache on Catalog.selectAllGoodStockBrandWise Hottest query right now ...

amit — Fri, 17 Apr 2026 18:15:45 +0530

amit – 1 file(s) modified
Add 2-min cache on Catalog.selectAllGoodStockBrandWise

Hottest query right now on the DB: 3851 execs x 297ms = ~1143 s over
2.9h uptime. Fired once per target-slab in TodayOfferServiceImpl's
findAllTodayOffer loop whenever the slab has no explicit catalog IDs.

Input is a single String brand (only ~10 brands), output is a list of
Catalog entities with no associations (all primitive/String columns,
no lazy-init risk) and the caller only invokes getBrand/getId on the
results. Safe to cache in the existing in-memory Caffeine
twoMintimeoutCacheManager.

Default Spring key (= brand) is stable; unless skips empty results.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CatalogRepositoryImpl.java

Rev 36242 – Fix:Attachment is Full-stock payment approval ,Timeline ui graphical summary, wod ...

aman — Fri, 10 Apr 2026 19:41:18 +0530

aman – 21 file(s) modified
Fix:Attachment is Full-stock payment approval ,Timeline ui graphical summary, wod initianl mail after store code creation

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoStore.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/AddWalletRequestRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/AddWalletRequestRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/FullStockPaymentRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/FullStockPaymentRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/StoreTimelineTatRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/loiForm/LoiFormServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/StoreTimelineTatServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerOnBoardingPanelController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-wallet-rejected.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-wallet-req.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-wallet-request-paginated.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-wallet-request.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/monthSales.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/onboarding-timeline-detail.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/onboarding_timeline.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-history-paginated.vm

Rev 36079 – Fix offers not visible in price circular - cache manager ...

amit — Thu, 26 Mar 2026 18:09:02 +0530

amit – 1 file(s) modified
Fix offers not visible in price circular - cache manager mismatch

selectAllPublishedMapByPartner was cached in Caffeine (oneDayCacheManager)
but evictOfferCaches cleared it from Redis (redisCacheManager). Eviction
had no effect, so stale in-memory cache served old data for up to 6 hours.
Changed to redisCacheManager to match the eviction target.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepositoryImpl.java

Rev 36056 – Revert criteria fallback - keep original behavior, empty criteria means ...

amit — Wed, 25 Mar 2026 16:20:53 +0530

amit – 1 file(s) modified
Revert criteria fallback - keep original behavior, empty criteria means missing catalog data

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemCriteriaRepositoryImpl.java

Rev 36055 – Fall back to brand/category description when catalogIds resolve to no ...

amit — Wed, 25 Mar 2026 16:14:50 +0530

amit – 1 file(s) modified
Fall back to brand/category description when catalogIds resolve to no items

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemCriteriaRepositoryImpl.java

Rev 36051 – Support FIXED per-pc payout with VALUE target: use per-criteria qty ...

amit — Tue, 24 Mar 2026 16:09:16 +0530

amit – 3 file(s) modified
Support FIXED per-pc payout with VALUE target: use per-criteria qty for payout calculation, sort payoutSlabs ascending

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferTargetSlabRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java

Rev 36049 – Redesign offer caching: separate definition from achievement, per-partner Redis cache, ...

amit — Tue, 24 Mar 2026 13:41:34 +0530

amit – 5 file(s) modified
Redesign offer caching: separate definition from achievement, per-partner Redis cache, deep-copy before mutation, centralized eviction

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/config/CacheConfig.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java

Rev 36041 – Offer partner filter: exclude only INTERNAL fofoType instead of using ...

amit — Mon, 23 Mar 2026 16:51:05 +0530

amit – 1 file(s) modified
Offer partner filter: exclude only INTERNAL fofoType instead of using internal flag

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepositoryImpl.java

Rev 35924 – Per-criteria target and payout editing for offers - Add ...

amit — Mon, 02 Mar 2026 17:46:27 +0530

amit – 6 file(s) modified
Per-criteria target and payout editing for offers

- Add UpdateSlabRequest/UpdateOfferSlabsRequest models for per-slab updates
- Add id field to PayoutSlab, populate from TargetSlabEntity.id
- Add updateOfferSlabs() service method: validates slab ownership, updates payoutTarget and payoutValue independently
- Keep updateOfferTargets() for backward compatibility

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/UpdateOfferSlabsRequest.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/UpdateSlabRequest.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferTargetSlabRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/PayoutSlab.java

Rev 35887 – Fix: use partner_criteria JSON instead of offer_partners table for partner ...

amit — Sat, 28 Feb 2026 20:11:47 +0530

amit – 3 file(s) modified
Fix: use partner_criteria JSON instead of offer_partners table for partner management

Rev 35885 – Admin offer management: add/remove partners, clone offer, update targets + ...

amit — Sat, 28 Feb 2026 18:06:21 +0530

amit – 6 file(s) modified
Admin offer management: add/remove partners, clone offer, update targets + empty guard fix in getCreateOfferRequest

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferPartnerRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferPartnerRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferTargetSlabRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferTargetSlabRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java

Rev 35862 – offfer cache changed with local cache

ranu — Thu, 26 Feb 2026 18:09:30 +0530

ranu – 1 file(s) modified
offfer cache changed with local cache

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepositoryImpl.java

Rev 35856 – Optimize activated stock query (no cache), move offer cache to ...

amit — Thu, 26 Feb 2026 16:50:39 +0530

amit – 7 file(s) modified
Optimize activated stock query (no cache), move offer cache to Redis, add bulk publish and delete offer

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/InventoryItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/InventoryItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/InventoryItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java

Rev 35855 – Fix SAXParseException on offer publish: replace unclosed
with
...

amit — Thu, 26 Feb 2026 16:00:54 +0530

amit – 1 file(s) modified
Fix SAXParseException on offer publish: replace unclosed <br> with <br/> in ItemCriteriaRepositoryImpl

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemCriteriaRepositoryImpl.java

SmartDukaan – //trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/

Rev 37840 – fix(offers): select month offers by date overlap so multi-month offers ...

Rev 37805 – fix(catalog): trim f_ colour prefix space; age delisted listings from ...

Rev 37782 – fix(catalog): add serializedOnly overloads of selectAllItems/selectAllBrands r37776 committed InventoryServiceImpl ...

Rev 37640 – Hot Deal brand: brand-driven membership, model_hot_deal reduced to attributes + ...

Rev 37634 – feat(pricing): tag_listing price change log; retire vendoritempricing writes/reads in dao; ...

Rev 37563 – Filter delisted SKUs out of creation pickers; add rolling 24m ...

Rev 37500 – sales target and achievement added cron and flags

Rev 37499 – sales target and achievement added cron and flags

Rev 37276 – Hot deals Solr: derive hot_deal_b from model_hot_deal active windows at ...

Rev 37275 – Add ModelHotDeal window-boundary and active catalog-id lookups r37268 committed ...

Rev 37271 – Add selectMappingByCatalogIdAndSuperCatalogId to SuperCatalogMappingRepository Lookup by the (catalogId, superCatalogId) ...

Rev 37261 – hot deal show all items

Rev 37254 – feat: hot-deals admin search/pagination + tag_listing.hot_deals write-through and daily sync ...

Rev 37244 – Hot deal attributes: five mandatory fields (warranty_months 0-12, item_condition NEW/OPEN_BOX/REFURBISHED, ...

Rev 37242 – Reject non-18% GST rates for TV categories (14202/14203) in addStateGstRates ...

Rev 37211 – Hot Deals: model_hot_deal entity, repository and service with 15-active-per-brand cap, ...

Rev 37204 – external api v2: category spec + client category entities, cached ...

Rev 37098 – Align CatalogRepository.selectCatalog signature with impl param order (brand, modelNumber, modelName) ...

Rev 37033 – Offer report: treat catalogIds as authoritative in item criteria ...

Rev 36971 – Surface active flagship models as a 'flagship' Solr label (prepended, ...

Rev 36578 – Flagship credit: fix sale conversion to use invoice reference, add ...

Rev 36562 – Flagship credit: date-wise model_flagship table, sale-time conversion with pessimistic locking, ...

Rev 36482 – V2 Weekly feedback and All Brands API

Rev 36428 – Fix:Partner Stock Api

Rev 36403 – Add catalog.catalog_monitor_type table, entity, and repository for per-catalog focused/normal monitor ...

Rev 36374 – schemes and offer for v2 version

Rev 36302 – Add 2-min cache on Catalog.selectAllGoodStockBrandWise Hottest query right now ...

Rev 36242 – Fix:Attachment is Full-stock payment approval ,Timeline ui graphical summary, wod ...

Rev 36079 – Fix offers not visible in price circular - cache manager ...

Rev 36056 – Revert criteria fallback - keep original behavior, empty criteria means ...

Rev 36055 – Fall back to brand/category description when catalogIds resolve to no ...

Rev 36051 – Support FIXED per-pc payout with VALUE target: use per-criteria qty ...

Rev 36049 – Redesign offer caching: separate definition from achievement, per-partner Redis cache, ...

Rev 36041 – Offer partner filter: exclude only INTERNAL fofoType instead of using ...

Rev 35924 – Per-criteria target and payout editing for offers - Add ...

Rev 35887 – Fix: use partner_criteria JSON instead of offer_partners table for partner ...

Rev 35885 – Admin offer management: add/remove partners, clone offer, update targets + ...

Rev 35862 – offfer cache changed with local cache

Rev 35856 – Optimize activated stock query (no cache), move offer cache to ...

Rev 35855 – Fix SAXParseException on offer publish: replace unclosed with ...

Rev 35855 – Fix SAXParseException on offer publish: replace unclosed
with
...