Skip to content

Commit 65e7193

Browse files
authored
Merge pull request #41 from ThePandaDevs/fix/vacants
fix: Add only show vacants on active period (dates)
2 parents 7dae0b7 + a76b691 commit 65e7193

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

src/main/java/mx/com/pandadevs/pibeapi/models/vacants/repository/VacantRepository.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@
44
import org.springframework.data.jpa.repository.JpaRepository;
55
import org.springframework.stereotype.Repository;
66

7+
import java.time.LocalDateTime;
78
import java.util.List;
89
import java.util.Optional;
910

1011
@Repository
1112
public interface VacantRepository extends JpaRepository<Vacant, Integer> {
1213
List<Vacant> findAllByActiveIsTrueAndIsPublicIsTrue();
14+
List<Vacant> findAllByActiveIsTrueAndIsPublicIsTrueAndEndDateGreaterThanEqual(LocalDateTime time);
1315
Optional<Vacant> findByIdAndActiveIsTrue(Integer id);
1416
}

src/main/java/mx/com/pandadevs/pibeapi/models/vacants/service/VacantService.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.springframework.util.ReflectionUtils;
2424

2525
import java.lang.reflect.Field;
26+
import java.time.LocalDateTime;
2627
import java.util.ArrayList;
2728
import java.util.List;
2829
import java.util.Map;
@@ -64,7 +65,8 @@ public VacantService(VacantMapper mapper) {
6465

6566
@Transactional(readOnly = true)
6667
public List<VacantDto> getAll() {
67-
return mapper.toVacantsDto(vacantRepository.findAllByActiveIsTrueAndIsPublicIsTrue());
68+
LocalDateTime nowTime = LocalDateTime.now();
69+
return mapper.toVacantsDto(vacantRepository.findAllByActiveIsTrueAndIsPublicIsTrueAndEndDateGreaterThanEqual(nowTime));
6870
}
6971

7072
@Transactional(readOnly = true)

0 commit comments

Comments
 (0)