Resolved conflicts

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

@@ -80,6 +80,10 @@ public interface ApplicationEvaluationRepository extends JpaRepository<Applicati
            Long assignedApplicationId,
            String status
     );
+    @Query("SELECT ae FROM ApplicationEvaluationEntity ae WHERE ae.applicationId = :applicationId AND ae.isDeleted = false")
+    ApplicationEvaluationEntity findByApplicationId(@Param("applicationId") Long applicationId);
+
+
 
 
 }

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

@@ -14,5 +14,15 @@ public interface EmailLogRepository extends JpaRepository<EmailLogEntity,Long> {
     List<EmailLogEntity> findByUserActionIdAndEmailServiceTypeAndSendStatus(
             Long userActionId, String emailServiceType, String sendStatus);
     Optional<EmailLogEntity> findTopByUserIdAndEmailTypeAndIsDeletedFalseOrderByCreatedDateDesc(Long userId, String emailType);
+    List<EmailLogEntity> findByUserActionIdAndEmailServiceType(
+            Long userActionId, String emailServiceType);
+
+    EmailLogEntity findTopByUserActionIdAndEmailServiceTypeAndSendStatusOrderByIdDesc(
+            Long userActionId,
+            String emailServiceType,
+            String sendStatus
+    );
+
+
 
 }