Subversion Repositories SmartDukaan

Rev

Rev 36816 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 36816 Rev 36849
Line 23... Line 23...
23
import com.spice.profitmandi.dao.entity.transaction.Order;
23
import com.spice.profitmandi.dao.entity.transaction.Order;
24
import com.spice.profitmandi.dao.enumuration.catalog.UpgradeOfferStatus;
24
import com.spice.profitmandi.dao.enumuration.catalog.UpgradeOfferStatus;
25
import com.spice.profitmandi.dao.enumuration.cs.EscalationType;
25
import com.spice.profitmandi.dao.enumuration.cs.EscalationType;
26
import com.spice.profitmandi.dao.enumuration.fofo.Milestone;
26
import com.spice.profitmandi.dao.enumuration.fofo.Milestone;
27
import com.spice.profitmandi.dao.enumuration.transaction.OrderStatus;
27
import com.spice.profitmandi.dao.enumuration.transaction.OrderStatus;
28
import com.spice.profitmandi.dao.model.*;
-
 
29
import com.spice.profitmandi.dao.model.SamsungUpgradeOfferModel;
28
import com.spice.profitmandi.dao.model.SamsungUpgradeOfferModel;
-
 
29
import com.spice.profitmandi.dao.model.*;
30
import com.spice.profitmandi.dao.model.warehouse.LMSGraphRequest;
30
import com.spice.profitmandi.dao.model.warehouse.LMSGraphRequest;
31
import com.spice.profitmandi.dao.repository.auth.AuthRepository;
31
import com.spice.profitmandi.dao.repository.auth.AuthRepository;
32
import com.spice.profitmandi.dao.repository.catalog.*;
32
import com.spice.profitmandi.dao.repository.catalog.*;
33
import com.spice.profitmandi.dao.repository.cs.*;
33
import com.spice.profitmandi.dao.repository.cs.*;
34
import com.spice.profitmandi.dao.repository.dtr.*;
34
import com.spice.profitmandi.dao.repository.dtr.*;
Line 424... Line 424...
424
        String email = loginDetails.getEmailId();
424
        String email = loginDetails.getEmailId();
425
        AuthUser authUser = authRepository.selectByEmailOrMobile(email);
425
        AuthUser authUser = authRepository.selectByEmailOrMobile(email);
426
        List<Position> positions = positionRepository.selectAllByAuthUserId(authUser.getId());
426
        List<Position> positions = positionRepository.selectAllByAuthUserId(authUser.getId());
427
        LocalDate selectedDate = LocalDate.parse(date);
427
        LocalDate selectedDate = LocalDate.parse(date);
428
 
428
 
-
 
429
        // Short-circuit when the caller has no Position rows. getTodayBulletin's
-
 
430
        // `positions` parameter is @NotEmpty validated — handing it an empty list
-
 
431
        // throws "List should not be empty" and 500s the dashboard. A user with
429
        // DB data (can be any order)
432
        // no positions simply has no bulletins to see, so render an empty page.
430
        Map<ProfitMandiConstants.BULLETIN_TYPE_ENUM, List<BulletinOfferModal>> dbBulletins =
433
        Map<ProfitMandiConstants.BULLETIN_TYPE_ENUM, List<BulletinOfferModal>> dbBulletins =
-
 
434
                (positions == null || positions.isEmpty())
-
 
435
                        ? new HashMap<>()
431
                adminUser.getTodayBulletin(positions, selectedDate.atStartOfDay());
436
                        : adminUser.getTodayBulletin(positions, selectedDate.atStartOfDay());
432
 
437
 
433
        // Final ordered map (STRICT enum order)
438
        // Final ordered map (STRICT enum order)
434
        Map<ProfitMandiConstants.BULLETIN_TYPE_ENUM, List<BulletinOfferModal>> bulletins =
439
        Map<ProfitMandiConstants.BULLETIN_TYPE_ENUM, List<BulletinOfferModal>> bulletins =
435
                new LinkedHashMap<>();
440
                new LinkedHashMap<>();
436
 
441