Subversion Repositories SmartDukaan

Rev

Hide changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff Changes
35458 27 d 6 h amit /trunk/ Revert @Transactional(readOnly=true) - keep @Transactional only at Controller level

Changes:
- profitmandi-web: Controllers use @Transactional(rollbackFor = Throwable.class) at class level, removed method-level @Transactional(readOnly = true)
- profitmandi-fofo: Controllers use @Transactional(rollbackFor = Throwable.class) at class level, removed method-level @Transactional
- profitmandi-dao: Removed @Transactional from services/repositories

Exceptions (called from interceptors, need own transaction):
- RoleManager: @Transactional(readOnly = true) - called from interceptor for auth
- PartnerTypeChangeServiceImpl.getBestPartner(): @Transactional - called from JWTUtil via interceptor

Fixed javax.transaction.Transactional to org.springframework.transaction.annotation.Transactional
Fixed rollbackOn to rollbackFor for Spring compatibility		  
/trunk/profitmandi-dao/pinelabs.http
/trunk/profitmandi-dao
/trunk/profitmandi-dao/build.gradle
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ActivatedImei.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PartnerTypeChangeServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PinelabsCustomerRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PinelabsOrderRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PinelabsPaymentMethodRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PinelabsRefundRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/LocationTrackingServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/PurSaleServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/SaleRewardServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/ScratchService.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/authentication/RoleManager.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/SchemeBlockedImeiServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/recharge/RechargeServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/AccessManagementController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/AnalysisDashboardController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ContentController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CustomerController.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/FofoController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InvoiceController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ItemLedgerController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoginController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LogisticsController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/MapTrackController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/MarginController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/MongoMigrationController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerPendingTasksController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerTargetController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PaymentOptionController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PerformanceController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PlacementPlanController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PostOfficeController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PunchInOutController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SDCreditController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ScanRecordController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/TagListingController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/TrialController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WebHookController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WebListingController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WebOffersController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/logix/LogixController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/provider/ProviderController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/purchase_sale_ratio/PurSaleController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/spicemoney/SpiceMoneyController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/OrderManagementController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse_rider/WarehouseRiderController.java
/trunk/profitmandi-fofo/src/main/resources/META-INF/env.property
/trunk/profitmandi-fofo/src/main/resources/log4j2.xml
/trunk/profitmandi-fofo/src/main/webapp/resources/js/cart.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/inventory.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/login.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/order.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/purchase.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/AddressController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/BannerListingController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/BrandController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/CartController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/CustomerController.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/FileUploaderController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/GatewayController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/InsuranceController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/MigrationController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/NotificationController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/PageController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/PostOfficeController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RechargeController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/SDCreditController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ShopController.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/controller/TrackingController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TransactionController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TrialUserController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuPayController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/guest/GuestController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/scratch/ScratchController.java
/trunk/profitmandi-web/src/main/resources/META-INF/env.property
/trunk/profitmandi-web/src/main/resources/log4j2.xml
35435 28 d 14 h amit /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ Add @Transactional(readOnly = true) to GET methods in controllers

Added @Transactional(readOnly = true) to all read-only GET methods across 14 controllers:
- RetailerController (10 methods)
- UserController (16 methods)
- WalletController (5 methods)
- CartController (2 methods)
- StoreController (25 methods)
- DealsController (20 methods)
- ShopController (1 method)
- CustomerController (2 methods)
- NotificationController (3 methods)
- SolrSearchController (2 methods)
- InsuranceController (1 method)
- GatewayController (1 method)
- LeadController (13 methods)
- RechargeController (4 methods)

Total: 105 methods updated

All methods verified to only set @Transient fields on entities, ensuring no dirty writes.		  
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/CartController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/CustomerController.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/GatewayController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/InsuranceController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/NotificationController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RechargeController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ShopController.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/controller/UserController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
35377 35 d 10 h aman /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/ Fix:Add user-Status(not register google account)  
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/enumuration/UserStatus.java
35373 36 d 14 h aman /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ Fix:Add user status trial in token  
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
35352 39 d 9 h amit /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ Added changes for trial user  
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
35337 45 d 8 h aman /trunk/ Feat:Trial Feedback Api and Trial brand potential Api  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/TrialBrandPotential.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/TrialFeedbackForm.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/trialFeedbackForm
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/trialFeedbackForm/CompetitivePricing.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/trialFeedbackForm/DashboardUsage.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/trialFeedbackForm/ImportantFeature.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/trialFeedbackForm/SupportTeamCommunication.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/trialFeedbackForm/SupportTeamRating.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/trialFeedbackForm/TopModelAvailability.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/trialFeedbackForm/TrialClarity.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/TrialBrandPotentialRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/TrialBrandPotentialRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/TrialFeedbackFormRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/TrialFeedbackFormRepositoryimpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/TrialService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/TrialServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/BrandCatalog.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/BrandsServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/serviceConfig/ServiceConfigServiceImpl.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TrialUserController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
35296 59 d 14 h amit /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ Fixed lead self Assigned  
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
35272 66 d 11 h amit /trunk/ Added Logic for guest  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/authentication/JWTUtil.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/guest
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PartnerTypeChangeServiceImpl.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/WebMVCConfig.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/enumuration/UserStatus.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/AuthenticationInterceptor.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/PostInterceptor.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/GoogleLoginProcessor.java
35262 71 d 6 h vikas /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ Comment UnRegistred Token  
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
35257 73 d 6 h amit /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/ Added logic to incrporate trial version  
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/WebMVCConfig.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
35193 94 d 8 h vikas /trunk/ Optimized oppo rewards query and update in app feature api  
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoOrderItem.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
35170 98 d 7 h vikas /trunk/ Carry bag 1 rupee to NEW, GOLD, PLATINUM, DIAMOND  
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/cart/CartServiceImpl.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
34794 185 d 15 h vikas.jangra /trunk/ Login With Email Password - Reset Password - Change Password  
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/EmailPassword.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/GoogleLoginRequest.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/LocationTrackingModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/LocationTrackingServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AuthService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AuthServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/UserService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/UserServiceImpl.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LocationTrackingController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
34664 218 d 11 h vikas.jangra /trunk/ Google Login with email  
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/GoogleLoginRequest.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
34037 406 d 6 h amit.gupta /trunk/ Fixed logic to get mapped partner type.  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PartnerTypeChangeService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PartnerTypeChangeServiceImpl.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
33792 479 d 14 h ranu /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ policy amount to be changed 10000 to 2000  
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
33194 647 d 13 h amit.gupta /trunk/ Added 10K for Referral  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
32721 766 d 11 h ranu /trunk/ code commented for min stock value  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/BrandLimitServiceImpl.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/OTPController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
32458 850 d 14 h amit.gupta /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ Resolved the issue with any color  
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
31820 1005 d 16 h amit.gupta /trunk/ Fixed promoter login issue.  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/PromoterRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/PromoterRepositoryImpl.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java

←Prev12Next→

Show All