feat : using blaze MultiSelect View

.gitpod.yml

@@ -1,5 +1,5 @@
 
-image: gitpod/workspace-java-17
+image: gitpod/workspace-java-21
 
 tasks:
   - init: ./gradlew build -x test

build.gradle

@@ -3,6 +3,7 @@ import org.gradle.plugins.ide.eclipse.model.SourceFolder
 buildscript {
     repositories {
         mavenCentral()
+        maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
     }
     dependencies {
         classpath "org.owasp:dependency-check-gradle:${owasp_plugin_version}"
@@ -39,6 +40,7 @@ configurations {
 
 repositories {
     mavenCentral()
+    maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
 }
 
 dependencies {

gradle.properties

@@ -8,8 +8,8 @@ spotless_version=6.25.0
 
 jacoco_min_coverage_required=0.84
 
-spring_boot_version=3.2.5
-blaze_persistence_version=1.6.11
+spring_boot_version=3.2.6
+blaze_persistence_version=1.6.12-SNAPSHOT
 spring_dependency_management_version=1.1.5
 springdoc_openapi_version=2.5.0
 

src/main/java/com/learning/mfscreener/repository/CustomUserCASDetailsEntityRepository.java

@@ -0,0 +1,8 @@
+package com.learning.mfscreener.repository;
+
+import com.learning.mfscreener.models.entityviews.UserCASDetailsEntityView;
+
+public interface CustomUserCASDetailsEntityRepository {
+
+    UserCASDetailsEntityView findByInvestorEmailAndName(String email, String name);
+}

src/main/java/com/learning/mfscreener/repository/CustomUserCASDetailsEntityRepositoryImpl.java

@@ -0,0 +1,39 @@
+package com.learning.mfscreener.repository;
+
+import com.blazebit.persistence.CriteriaBuilderFactory;
+import com.blazebit.persistence.view.EntityViewManager;
+import com.blazebit.persistence.view.EntityViewSetting;
+import com.learning.mfscreener.entities.UserCASDetailsEntity;
+import com.learning.mfscreener.models.entityviews.UserCASDetailsEntityView;
+import jakarta.persistence.EntityManager;
+
+public class CustomUserCASDetailsEntityRepositoryImpl implements CustomUserCASDetailsEntityRepository {
+
+    private final EntityManager entityManager;
+
+    private final CriteriaBuilderFactory criteriaBuilderFactory;
+
+    private final EntityViewManager entityViewManager;
+
+    public CustomUserCASDetailsEntityRepositoryImpl(
+            EntityManager entityManager,
+            CriteriaBuilderFactory criteriaBuilderFactory,
+            EntityViewManager entityViewManager) {
+        this.entityManager = entityManager;
+        this.criteriaBuilderFactory = criteriaBuilderFactory;
+        this.entityViewManager = entityViewManager;
+    }
+
+    @Override
+    public UserCASDetailsEntityView findByInvestorEmailAndName(String email, String name) {
+        return entityViewManager
+                .applySetting(
+                        EntityViewSetting.create(UserCASDetailsEntityView.class),
+                        criteriaBuilderFactory.create(entityManager, UserCASDetailsEntity.class))
+                .where("investorInfoEntity.email")
+                .eq(email)
+                .where("investorInfoEntity.name")
+                .eq(name) // Adding condition for the name
+                .getSingleResult();
+    }
+}

src/main/java/com/learning/mfscreener/repository/UserCASDetailsEntityRepository.java

@@ -10,7 +10,8 @@
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface UserCASDetailsEntityRepository extends JpaRepository<UserCASDetailsEntity, Long> {
+public interface UserCASDetailsEntityRepository
+        extends JpaRepository<UserCASDetailsEntity, Long>, CustomUserCASDetailsEntityRepository {
 
     @Query(
             nativeQuery = true,
@@ -58,11 +59,4 @@ SELECT SUM(balance) AS balanceUnits,
                     """)
     List<PortfolioDetailsProjection> getPortfolioDetails(
             @Param("pan") String panNumber, @Param("asOfDate") LocalDate asOfDate);
-
-    @Query(
-            """
-              select u from UserCASDetailsEntity u join fetch u.folioEntities join fetch u.investorInfoEntity as i
-              where i.email = :email and i.name = :name
-              """)
-    UserCASDetailsEntity findByInvestorEmailAndName(@Param("email") String email, @Param("name") String name);
 }

src/main/java/com/learning/mfscreener/service/PortfolioService.java

@@ -12,6 +12,7 @@
 import com.learning.mfscreener.entities.UserTransactionDetailsEntity;
 import com.learning.mfscreener.mapper.CasDetailsMapper;
 import com.learning.mfscreener.models.PortfolioDetailsDTO;
+import com.learning.mfscreener.models.entityviews.UserCASDetailsEntityView;
 import com.learning.mfscreener.models.portfolio.CasDTO;
 import com.learning.mfscreener.models.portfolio.UserFolioDTO;
 import com.learning.mfscreener.models.portfolio.UserSchemeDTO;
@@ -133,45 +134,46 @@ UploadResponseHolder findDelta(String email, String name, CasDTO casDTO) {
         long userTransactionCount = portfolioServiceHelper.countTransactionsByUserFolioDTOList(inputUserFolioDTOList);
         List<UserTransactionDetailsEntity> userTransactionDetailsEntityList =
                 this.userTransactionDetailsService.findAllTransactionsByEmailAndName(email, name);
-        UserCASDetailsEntity userCASDetailsEntity = userCASDetailsService.findByInvestorEmailAndName(email, name);
+        UserCASDetailsEntityView userCASDetailsEntityView =
+                userCASDetailsService.findByInvestorEmailAndName(email, name);
 
         if (userTransactionCount == userTransactionDetailsEntityList.size()) {
             LOGGER.info("No new transactions are added");
             return null;
         }
 
         return processFoliosAndTransactions(
-                email, name, casDTO, userCASDetailsEntity, userTransactionCount, userTransactionDetailsEntityList);
+                email, name, casDTO, userCASDetailsEntityView, userTransactionCount, userTransactionDetailsEntityList);
     }
 
     UploadResponseHolder processFoliosAndTransactions(
             String email,
             String name,
             CasDTO casDTO,
-            UserCASDetailsEntity userCASDetailsEntity,
+            UserCASDetailsEntityView userCASDetailsEntityView,
             long userTransactionDTOListCount,
             List<UserTransactionDetailsEntity> userTransactionDetailsEntityList) {
         AtomicInteger folioCounter = new AtomicInteger();
         AtomicInteger transactionsCounter = new AtomicInteger();
 
-        processNewFolios(casDTO.folios(), userCASDetailsEntity, folioCounter, transactionsCounter);
+        processNewFolios(casDTO.folios(), userCASDetailsEntityView, folioCounter, transactionsCounter);
         updateSchemesAndTransactions(
                 email,
                 name,
                 casDTO,
-                userCASDetailsEntity,
+                userCASDetailsEntityView,
                 userTransactionDTOListCount,
                 userTransactionDetailsEntityList,
                 transactionsCounter);
 
-        return new UploadResponseHolder(userCASDetailsEntity, folioCounter.get(), transactionsCounter.get());
+        return new UploadResponseHolder(null, folioCounter.get(), transactionsCounter.get());
     }
 
     void updateSchemesAndTransactions(
             String email,
             String name,
             CasDTO casDTO,
-            UserCASDetailsEntity userCASDetailsEntity,
+            UserCASDetailsEntityView userCASDetailsEntityView,
             long userTransactionDTOListCount,
             List<UserTransactionDetailsEntity> userTransactionDetailsEntityList,
             AtomicInteger transactionsCounter) {
@@ -196,7 +198,8 @@ void updateSchemesAndTransactions(
                     existingFolioSchemesMap,
                     existingUserFolioDetailsEntityList,
                     transactionsCounter);
-            userCASDetailsEntity.setFolioEntities(existingUserFolioDetailsEntityList);
+            // TODO
+            // userCASDetailsEntityView.setFolioEntities(existingUserFolioDetailsEntityList);
 
             // Check if all new transactions are added as part of adding schemes
             if (userTransactionDTOListCount == (userTransactionDetailsEntityList.size() + transactionsCounter.get())) {
@@ -332,20 +335,21 @@ Map<String, List<UserSchemeDTO>> groupSchemesByFolio(List<UserFolioDTO> userFoli
 
     void processNewFolios(
             List<UserFolioDTO> userFolioDTOList,
-            UserCASDetailsEntity userCASDetailsEntity,
+            UserCASDetailsEntityView userCASDetailsEntityView,
             AtomicInteger folioCounter,
             AtomicInteger transactionsCounter) {
         // Logic to process new folios
-        List<String> existingFolioNumbers = userCASDetailsEntity.getFolioEntities().stream()
-                .map(UserFolioDetailsEntity::getFolio)
+        List<String> existingFolioNumbers = userCASDetailsEntityView.getFolioEntities().stream()
+                .map(t -> t.getFolio())
                 .toList();
 
         userFolioDTOList.forEach(userFolioDTO -> {
             String folio = userFolioDTO.folio();
             if (!existingFolioNumbers.contains(folio)) {
                 LOGGER.info("New folio: {} created that is not present in the database", folio);
-                userCASDetailsEntity.addFolioEntity(
-                        casDetailsMapper.mapUserFolioDTOToUserFolioDetailsEntity(userFolioDTO));
+                // TODO
+                // userCASDetailsEntityView.addFolioEntity(
+                // casDetailsMapper.mapUserFolioDTOToUserFolioDetailsEntity(userFolioDTO));
                 folioCounter.incrementAndGet();
                 int newTransactions = userFolioDTO.schemes().stream()
                         .map(UserSchemeDTO::transactions)

src/main/java/com/learning/mfscreener/service/UserCASDetailsService.java

@@ -2,6 +2,7 @@
 
 import com.learning.mfscreener.config.logging.Loggable;
 import com.learning.mfscreener.entities.UserCASDetailsEntity;
+import com.learning.mfscreener.models.entityviews.UserCASDetailsEntityView;
 import com.learning.mfscreener.models.projection.PortfolioDetailsProjection;
 import com.learning.mfscreener.repository.UserCASDetailsEntityRepository;
 import java.time.LocalDate;
@@ -25,7 +26,7 @@ public UserCASDetailsEntity saveEntity(UserCASDetailsEntity casDetailsEntity) {
         return userCASDetailsEntityRepository.save(casDetailsEntity);
     }
 
-    public UserCASDetailsEntity findByInvestorEmailAndName(String email, String name) {
+    public UserCASDetailsEntityView findByInvestorEmailAndName(String email, String name) {
         return userCASDetailsEntityRepository.findByInvestorEmailAndName(email, name);
     }