Merge pull request #41 from ThePandaDevs/fix/vacants

fix: Add only show vacants on active period (dates)
NunnaTech · Aug 25, 2022 · 65e7193 · 65e7193
2 parents 7dae0b7 + a76b691
commit 65e7193
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/main/java/mx/com/pandadevs/pibeapi/models/vacants/repository/VacantRepository.java b/src/main/java/mx/com/pandadevs/pibeapi/models/vacants/repository/VacantRepository.java
@@ -4,11 +4,13 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Optional;
 
 @Repository
 public interface VacantRepository extends JpaRepository<Vacant, Integer> {
     List<Vacant> findAllByActiveIsTrueAndIsPublicIsTrue();
+    List<Vacant> findAllByActiveIsTrueAndIsPublicIsTrueAndEndDateGreaterThanEqual(LocalDateTime time);
     Optional<Vacant> findByIdAndActiveIsTrue(Integer id);
 }
diff --git a/src/main/java/mx/com/pandadevs/pibeapi/models/vacants/service/VacantService.java b/src/main/java/mx/com/pandadevs/pibeapi/models/vacants/service/VacantService.java
@@ -23,6 +23,7 @@
 import org.springframework.util.ReflectionUtils;
 
 import java.lang.reflect.Field;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -64,7 +65,8 @@ public VacantService(VacantMapper mapper) {
 
     @Transactional(readOnly = true)
     public List<VacantDto> getAll() {
-        return mapper.toVacantsDto(vacantRepository.findAllByActiveIsTrueAndIsPublicIsTrue());
+        LocalDateTime nowTime = LocalDateTime.now();
+        return mapper.toVacantsDto(vacantRepository.findAllByActiveIsTrueAndIsPublicIsTrueAndEndDateGreaterThanEqual(nowTime));
     }
 
     @Transactional(readOnly = true)