SmartDukaan – //trunk/profitmandi-web/src/main/java/

Rev 37319 – Fix partner-performance tertiary: aggregate order items (qty*mop), not the POS-typed ...

amit — Fri, 14 Aug 2026 18:17:18 +0530

amit – 6 file(s) modified
Fix partner-performance tertiary: aggregate order items (qty*mop), not the POS-typed order header

The tertiary panel summed fofo_order.total_amount - a price typed at the partner POS
and never validated against the catalogue - and attributed each whole order to its
first line item's brand via .get(0). One mistyped digit inflated reported sell-out
10x, and mixed-brand orders booked 100% to the first brand, leaving the rest at zero.
Defect dates from r32000/r32034 (May 2023); the panel was the only tertiary consumer
diverging from the qty*mop basis.

- New FofoOrder.selectMonthlyBrandTertiary: sum(quantity*mop) grouped by
(year*100+month) and item brand - the same basis selectPartnerTertiarySales
already uses for the DSR and the partner tier calculation
- PerformanceController: replaces two entity-loading queries (every FofoOrder and
FofoOrderItem for 6 months) with one aggregate; all items now count, each under
its own brand
- Month labels unchanged - toMonthLabel rebuilds the MMM''uu key, template untouched
- Remove V2FofoPerformanceController, the /v2/fofo JSON copy carrying the same defect

Verified against dev DB for fofo_id 175139501: Jul 2026 now 16,94,939 (panel
previously showed 50,92,440); all six months match the qty*mop basis.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoOrder.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/MonthlyBrandTertiaryModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PerformanceController.java
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoPerformanceController.java

Rev 37318 – v2 version some fixes

ranu — Fri, 14 Aug 2026 16:04:50 +0530

ranu – 1 file(s) modified
v2 version some fixes

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java

Rev 37313 – v2 version some fixes

ranu — Fri, 14 Aug 2026 12:09:49 +0530

ranu – 1 file(s) modified
v2 version some fixes

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoOrderController.java

Rev 37305 – carry bag for silver at 1

ranu — Thu, 13 Aug 2026 17:44:34 +0530

ranu – 2 file(s) modified
carry bag for silver at 1

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/cart/CartServiceImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/V2CartController.java

Rev 37304 – v2 version some fixes

ranu — Thu, 13 Aug 2026 17:39:13 +0530

ranu – 1 file(s) modified
v2 version some fixes

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/V2CartController.java

Rev 37298 – Default subCategoryId to 0 on endpoints that declare it required=false ...

amit — Wed, 12 Aug 2026 22:10:01 +0530

amit – 4 file(s) modified
Default subCategoryId to 0 on endpoints that declare it required=false

subCategoryId is a primitive int, so a required=false declaration with no
defaultValue makes Spring throw when the param is omitted:

Optional int parameter 'subCategoryId' is present but cannot be translated
into a null value due to being declared as a primitive type.

v1 DealsController and GuestController already default it to 0; their v2
wrappers dropped that, and StoreController never had it on either version. Any
caller omitting the param got a 500 with a message that does not name the
parameter at fault.

Adding the default only removes that failure path — every currently working
caller already sends a value, so no existing behaviour changes.

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/StoreController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/V2DealsController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/V2GuestController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/V2StoreController.java

Rev 37293 – Fix region-ALL (fofoId=0 sentinel) handling on RBM home active-offers: ...

amit — Wed, 12 Aug 2026 11:58:47 +0530

amit – 2 file(s) modified
Fix region-ALL (fofoId=0 sentinel) handling on RBM home

active-offers: regionId resolved via rows.get(0).getFofoId(), which is 0 for
region ALL, so selectByRetailerId(0) threw FOFOSTR_1000 'Fofo store not found'
(400) for every region-ALL user. Now filters fofoId>0, picks an active store,
and falls back to the caller's fofoId when a region resolves to nothing.

rbm-regions: dropdown now lists only regions holding an active retailer (with
activePartners count), which drops the ALL pseudo-region; users carrying the
sentinel get every live region as assignedRegionIds instead of an empty set.

rbm-dashboard: expand the sentinel like CsServiceImpl does (row region ->
its partners; region ALL -> all active stores) so the partners tile stops
reporting 0/1. Scope-wide batches limited to stores/targets/purchases/
last-billed; name, wallet and loan lookups now run only over the returned
slice. partners and alerts capped via ?limit (default 50, max 200) with
partnersReturned/totalAlerts/alertsReturned/limit added to summary. Partners
with no target this month rank after those actually missing a target, so the
capped slice is not filled by unset-target stores.

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoMonitorController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoOfferController.java

Rev 37273 – Apply same idempotent super-catalog mapping save to V2 controller ...

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

amit – 1 file(s) modified
Apply same idempotent super-catalog mapping save to V2 controller

Keeps V2FofoSuperCatalogController in step with the fofo SuperCatalogController
fix (r37272) so the dormant endpoint cannot violate the new
UNIQUE(catalog_id, super_catalog_id) constraint if it is ever enabled.

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoSuperCatalogController.java

Rev 37269 – Hot deals enrichment: Fresh pill (green tick when device unused, ...

amit — Mon, 10 Aug 2026 10:12:39 +0530

amit – 1 file(s) modified
Hot deals enrichment: Fresh pill (green tick when device unused, greyed cross otherwise) replacing Activated; class hd-fresh

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/services/HotDealEnrichmentService.java

Rev 37267 – v2 version some fixes

ranu — Sun, 09 Aug 2026 19:03:16 +0530

ranu – 1 file(s) modified
v2 version some fixes

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TrialUserController.java

Rev 37260 – Hot deals API: fix /fofo 500 when subCategoryId omitted (primitive ...

amit — Fri, 07 Aug 2026 03:35:46 +0530

amit – 3 file(s) modified
Hot deals API: fix /fofo 500 when subCategoryId omitted (primitive int + required=false cannot bind null; defaultValue 0, same in GuestController); /fofo/hotDeals/categories facet endpoint for filter chips; hotDeal listing honors explicit categoryId only (cross-category default); enrichment pills - constant names with hd-yes/hd-no + hd-good/hd-off state classes, not-activated is the green state

Rev 37250 – perf: speed up /partner/listing by batching partner-level data and parallelizing ...

amit — Thu, 06 Aug 2026 15:12:19 +0530

amit – 2 file(s) modified
perf: speed up /partner/listing by batching partner-level data and parallelizing solr calls

- Fetch stock snapshot, favourites, web offers, combo models, CIS, items,
cashback and price circular once per request (union of all listings'
catalogs/items) instead of once per listing
- Precompute slab-payout/scheme-offer alignment once per catalog so shared
PriceCircularItemModelNew instances are not mutated twice
- Fan per-listing solr queries out on a bounded thread pool; brand exclusion
resolved once on the request thread (Hibernate session is thread-bound)
- Drop per-doc info logs (full stock map, label dumps, solrtype)

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/services/PartnerSolrClient.java

Rev 37249 – Null check for email

vikas — Thu, 06 Aug 2026 15:04:20 +0530

vikas – 3 file(s) modified
Null check for email

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/BeatTrackingController.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/services/RemarkScoreService.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/V2BeatTrackingController.java

Rev 37247 – Hot deal surfacing: HotDealEnrichmentService attaches hotDealTags (condition/activated/warranty/fin-mapped/affordability pills, No values ...

amit — Thu, 06 Aug 2026 11:04:39 +0530

amit – 2 file(s) modified
Hot deal surfacing: HotDealEnrichmentService attaches hotDealTags (condition/activated/warranty/fin-mapped/affordability pills, No values hidden) to fofo listing, favourites and partnerdeals responses; /fofo hotDeal=true now sources from model_hot_deal actives via Solr catalogId filter

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/services/HotDealEnrichmentService.java

Rev 37224 – external api v2: paginated storeMaster endpoint + docs

amit — Tue, 04 Aug 2026 17:13:44 +0530

amit – 2 file(s) modified
external api v2: paginated storeMaster endpoint + docs

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/external/ExternalApiController.java
~ /trunk/profitmandi-web/src/main/resources/external-api-docs.html

Rev 37207 – external api v2: categoryMaster endpoint, client-scoped feeds, itemIds-optional paginated /stock

amit — Tue, 04 Aug 2026 12:33:19 +0530

amit – 1 file(s) modified
external api v2: categoryMaster endpoint, client-scoped feeds, itemIds-optional paginated /stock

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/external/ExternalApiController.java

Rev 37196 – v2 version some fixes

ranu — Mon, 03 Aug 2026 11:46:45 +0530

ranu – 1 file(s) modified
v2 version some fixes

+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/filter/BrandParamNormalizingFilter.java

Rev 37195 – ai + brand display mapping fixed

ranu — Mon, 03 Aug 2026 11:37:03 +0530

ranu – 1 file(s) modified
ai + brand display mapping fixed

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/SpringWebAppInitializer.java

Rev 37185 – ai + brand display mapping fixed

ranu — Thu, 30 Jul 2026 15:57:44 +0530

ranu – 5 file(s) modified
ai + brand display mapping fixed

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoAnalysisDashboardController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoContentController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoDashboardController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoWarehouseController.java

Rev 37183 – PJP agenda assign: composeAgendaTaskName on create/batch/revisit (supervisor on-the-go path); revival ...

amit — Thu, 30 Jul 2026 15:38:57 +0530

amit – 1 file(s) modified
PJP agenda assign: composeAgendaTaskName on create/batch/revisit (supervisor on-the-go path); revival visibility filter on GET agendas; skip blank checkout discussions

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/BeatTrackingController.java

Rev 37177 – PJP agenda instances: per-agenda visit logs at checkout + open-agendas ...

amit — Thu, 30 Jul 2026 12:40:40 +0530

amit – 1 file(s) modified
PJP agenda instances: per-agenda visit logs at checkout + open-agendas endpoint

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/BeatTrackingController.java

Rev 37157 – getPartners null-safe saholic lookup (one bad partner row no longer ...

amit — Wed, 29 Jul 2026 16:30:10 +0530

amit – 3 file(s) modified
getPartners null-safe saholic lookup (one bad partner row no longer 500s the whole list), retailer registration uses idempotent user_accounts upsert, V2CartController distinguishes missing-procurement-cart (404) from missing auth token (401)

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/V2CartController.java

Rev 37153 – Null check for email

vikas — Mon, 27 Jul 2026 17:37:33 +0530

vikas – 2 file(s) modified
Null check for email

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/AuthRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/BeatTrackingController.java

Rev 37152 – External partner API: fix /external/v1/docs 500 — return byte[] with ...

amit — Mon, 27 Jul 2026 17:21:35 +0530

amit – 1 file(s) modified
External partner API: fix /external/v1/docs 500 — return byte[] with explicit text/html (no StringHttpMessageConverter registered in WebMVCConfig)

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/external/ExternalApiController.java

Rev 37150 – External partner API (web): /external/v1 endpoints (catalogMaster, catalogSkuMaster, skuMaster, storeMaster ...

amit — Mon, 27 Jul 2026 14:55:18 +0530

amit – 5 file(s) modified
External partner API (web): /external/v1 endpoints (catalogMaster, catalogSkuMaster, skuMaster, storeMaster + catalogs/catalogSkus/stock lookups), X-Api-Key ApiKeyInterceptor on /external/** (excluded from JWT/CORS/post interceptors), hosted partner docs at /external/v1/docs. Requires migration_external_api_client.sql (r37149) on DB before deploy.

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/WebMVCConfig.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/external
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/external/ExternalApiController.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/ApiKeyInterceptor.java
+ /trunk/profitmandi-web/src/main/resources/external-api-docs.html

Rev 37146 – ticket l1 to l9 level introduced

ranu — Mon, 27 Jul 2026 12:36:41 +0530

ranu – 1 file(s) modified
ticket l1 to l9 level introduced

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoCsController.java

Rev 37144 – Brand eligibility: hide restricted (blocked + LOI-ineligible) brands on partner ...

amit — Fri, 24 Jul 2026 17:16:59 +0530

amit – 9 file(s) modified
Brand eligibility: hide restricted (blocked + LOI-ineligible) brands on partner surfaces and enforce at purchase — PartnerSolrClient applies Solr brand exclusion on all partner demo-core queries; brand list + deal/store facets filtered; legacy solr-search title filter with word boundary; add-to-cart and checkout validate via validateOrderableBrands

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/CartController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/SmartCartController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/SolrSearchController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/StoreController.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/services/PartnerSolrClient.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/services/SolrService.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/V2SolrSearchController.java

Rev 37138 – Remove updateAndInsertWodCodes endpoint: unguarded GET that bulk-stamped IT_CODE across all ...

amit — Thu, 23 Jul 2026 18:49:43 +0530

amit – 1 file(s) modified
Remove updateAndInsertWodCodes endpoint: unguarded GET that bulk-stamped IT_CODE across all active stores' dealer mappings

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoPartnerOnBoardingPanelController.java

Rev 37130 – rating api issue fix

ranu — Tue, 21 Jul 2026 16:41:46 +0530

ranu – 2 file(s) modified
rating api issue fix

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/V2LeadController.java

Rev 37117 – adld ui launch for mannual

ranu — Thu, 16 Jul 2026 19:08:53 +0530

ranu – 1 file(s) modified
adld ui launch for mannual

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/V2InsuranceController.java

Rev 37116 – v2 version some fixes

ranu — Thu, 16 Jul 2026 18:26:36 +0530

ranu – 1 file(s) modified
v2 version some fixes

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/V2InsuranceController.java

Rev 37115 – Guard /partnerdeals/{id} against empty deal response: return DEAL_NOT_FOUND instead of ...

amit — Thu, 16 Jul 2026 18:17:42 +0530

amit – 1 file(s) modified
Guard /partnerdeals/{id} against empty deal response: return DEAL_NOT_FOUND instead of 500 (IndexOutOfBoundsException on dealResponse.get(0)) when the catalog is not a matching partner deal in Solr

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java

Rev 37113 – Trial-registration GST duplicate check now via FofoStoreRepository.existsByGstNumber (fofo_store) instead of ...

amit — Thu, 16 Jul 2026 17:47:23 +0530

amit – 1 file(s) modified
Trial-registration GST duplicate check now via FofoStoreRepository.existsByGstNumber (fofo_store) instead of PrivateDealUserRepository.isActiveByGst

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TrialUserController.java

Rev 37111 – v2 version some fixes

ranu — Thu, 16 Jul 2026 17:44:09 +0530

ranu – 1 file(s) modified
v2 version some fixes

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/V2InsuranceController.java

Rev 37109 – v2 version some fixes

ranu — Thu, 16 Jul 2026 17:00:49 +0530

ranu – 1 file(s) modified
v2 version some fixes

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/V2InsuranceController.java

Rev 37107 – v2 version some fixes

ranu — Thu, 16 Jul 2026 16:20:34 +0530

ranu – 1 file(s) modified
v2 version some fixes

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/V2InsuranceController.java

Rev 37106 – v2 version some fixes

ranu — Thu, 16 Jul 2026 16:15:21 +0530

ranu – 1 file(s) modified
v2 version some fixes

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/V2InsuranceController.java

Rev 37103 – Remove dead PrivateDealUser.bulkShipmentAmountLimit writes in retailer creation

amit — Thu, 16 Jul 2026 15:24:06 +0530

amit – 1 file(s) modified
Remove dead PrivateDealUser.bulkShipmentAmountLimit writes in retailer creation

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java

Rev 37094 – v2 version some fixes

ranu — Wed, 15 Jul 2026 13:42:04 +0530

ranu – 1 file(s) modified
v2 version some fixes

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/V2CartController.java

Rev 37084 – v2 version some fixes

ranu — Tue, 14 Jul 2026 14:59:28 +0530

ranu – 2 file(s) modified
v2 version some fixes

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/V2BaseController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/V2CartController.java