Merge branch 'develop' of https://github.com/Kitzanos/GEPAFIN-BE into feature/GEPAFINBE-55

src/main/java/net/gepafin/tendermanagement/repositories/CriteriaFormFieldRepository.java

@@ -0,0 +1,17 @@
+package net.gepafin.tendermanagement.repositories;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import net.gepafin.tendermanagement.entities.CriteriaFormFieldEntity;
+
+@Repository
+public interface CriteriaFormFieldRepository extends JpaRepository<CriteriaFormFieldEntity, Long>{
+
+	List<CriteriaFormFieldEntity> findByCallIdAndFormIdAndFormFieldIdAndIsDeletedFalse(Long callId, Long formId, String formFieldId);
+
+	List<CriteriaFormFieldEntity> findByEvaluationCriteriaIdAndIsDeletedFalse(Long evaluationCriteriaId);
+
+}

src/main/java/net/gepafin/tendermanagement/repositories/HubRepository.java

@@ -0,0 +1,15 @@
+package net.gepafin.tendermanagement.repositories;
+
+import net.gepafin.tendermanagement.entities.HubEntity;
+
+import java.util.Optional;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface HubRepository extends JpaRepository<HubEntity, Long> {
+
+	Optional<HubEntity> findByUniqueUuid(String hubUuid);
+    
+}

src/main/java/net/gepafin/tendermanagement/repositories/ProtocolRepository.java

@@ -3,11 +3,12 @@ package net.gepafin.tendermanagement.repositories;
 import net.gepafin.tendermanagement.entities.ProtocolEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 @Repository
 public interface ProtocolRepository extends JpaRepository<ProtocolEntity,Long> {
 
-    @Query("SELECT MAX(p.protocolNumber) FROM ProtocolEntity p")
-    Integer findMaxProtocolNumber();
+    @Query("SELECT MAX(p.protocolNumber) FROM ProtocolEntity p where p.hubId = :hubId")
+    Long findMaxProtocolNumberAndHubId(@Param("hubId") Long hubId);
 }

src/main/java/net/gepafin/tendermanagement/repositories/SamlResponseRepository.java

@@ -1,5 +1,7 @@
 package net.gepafin.tendermanagement.repositories;
 
+import java.util.Optional;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
@@ -10,4 +12,6 @@ public interface SamlResponseRepository extends JpaRepository<SamlResponseEntity
 
 	SamlResponseEntity findByToken(String token);
 
+	Optional<SamlResponseEntity> findByInResponseToAndStatus(String inResponseTo, String status);
+
 }

src/main/java/net/gepafin/tendermanagement/repositories/UserRepository.java

@@ -1,7 +1,6 @@
 package net.gepafin.tendermanagement.repositories;
 
 import net.gepafin.tendermanagement.entities.UserEntity;
-import net.gepafin.tendermanagement.model.response.UserResponseBean;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
@@ -11,17 +10,27 @@ import java.util.Optional;
 @Repository
 public interface UserRepository extends JpaRepository<UserEntity, Long> {
 	
-    Optional<UserEntity> findByEmailIgnoreCase(String email);
+//    Optional<UserEntity> findByEmailIgnoreCase(String email);
     
-    boolean existsByEmailIgnoreCase(String email);
+//    boolean existsByEmailIgnoreCase(String email);
     
-    UserEntity findByEmail(String email);
+//    UserEntity findByEmail(String email);
     
     Optional<UserEntity> findByBeneficiaryCodiceFiscale(String codiceFiscale);
 
 	boolean existsByBeneficiaryCodiceFiscale(String codiceFiscale);
+	
     UserEntity findByBeneficiaryId(Long beneficiaryId);
 
-    Long countByStatusAndRoleEntity_RoleType(String status, String roleName);
-    List<UserEntity> findByRoleEntityId(Long roleId);
+    Long countByStatusAndRoleEntityRoleType(String status, String roleName);
+
+    Optional<UserEntity> findByEmailIgnoreCaseAndHubUniqueUuid(String email, String hubId);
+
+	boolean existsByEmailIgnoreCaseAndHubUniqueUuid(String email, String hubUuid);
+
+	List<UserEntity> findByRoleEntityIdAndHubId(Long roleId, Long hubId);
+
+	List<UserEntity> findByHubId(Long hubId);
+
+	Long countByStatusAndRoleEntityRoleTypeAndHubId(String status, String roleName, Long hubId);
 }