Commit 9f821018 authored by Christos Tranoris's avatar Christos Tranoris
Browse files

fix fir #106

parent 8a130583
Loading
Loading
Loading
Loading
Loading
+3 −2
Changes for src/main/java/org/etsi/osl/tmf/ri639/repo/ResourceRepository.java: 3 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -40,10 +40,11 @@ public interface ResourceRepository extends JpaRepository<Resource, Long> {
	Iterable<Resource> findByRolename(String name);


	@Query("SELECT srv FROM RIResource srv  WHERE srv.resourceStatus = org.etsi.osl.tmf.ri639.model.ResourceStatusType.AVAILABLE AND "
			+ "srv.endOperatingDate < CURRENT_TIMESTAMP")
	@Query("SELECT srv FROM RIResource srv WHERE srv.endOperatingDate < CURRENT_TIMESTAMP AND "
			+ "(srv.administrativeState IS NULL OR srv.administrativeState <> org.etsi.osl.tmf.ri639.model.ResourceAdministrativeStateType.SHUTDOWN)")
	List<Resource> findActiveToTerminate();
	

	@Query("SELECT srv FROM RIResource srv "
			+ "JOIN FETCH srv.resourceCharacteristic char "
			+ "JOIN FETCH char.value val "