Skip to content

[PPANTT-106] feat: add dataCreazione property and filters to /stations api #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

[PPANTT-106] feat: add dataCreazione property and filters to /stations api #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
106d84b
[PPANTT-106] feat: updated Stazioni with data_creazione entity
alessio-cialini Sep 4, 2024
cdc3412
[PPANTT-106] feat: updated Stazioni with new filter in stazioni repos…
alessio-cialini Sep 5, 2024
803d016
[PPANTT-106] feat: updated Stazioni with new filter in stazioni repos…
alessio-cialini Sep 5, 2024
73a5b28
[PPANTT-106] feat: updated Stazioni with new filter in stazioni repos…
alessio-cialini Sep 5, 2024
a35b380
[PPANTT-106] feat: updated Stazioni with new filter in stazioni repos…
alessio-cialini Sep 5, 2024
429c66b
[PPANTT-106] feat: updated Stazioni with new filter in stazioni repos…
alessio-cialini Sep 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/main/java/it/gov/pagopa/apiconfig/starter/entity/Stazioni.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import lombok.*;

import javax.persistence.*;
import java.sql.Timestamp;
import java.util.List;

@Entity
Expand Down Expand Up @@ -154,6 +155,9 @@ public class Stazioni {
@Column(name = "FLAG_STANDIN", nullable = false)
private Boolean flagStandin = false;

@Column(name = "DATA_CREAZIONE")
private Timestamp dataCreazione;

@Column(name = "VERSIONE_PRIMITIVE")
private Integer versionePrimitive;
@OneToMany(
Expand Down
42 changes: 38 additions & 4 deletions src/main/java/it/gov/pagopa/apiconfig/starter/repository/StazioniRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;

import java.time.OffsetDateTime;
import java.util.List;
import java.util.Optional;

Expand All @@ -25,21 +26,37 @@ public interface StazioniRepository extends JpaRepository<Stazioni, Long>, JpaSp
"select distinct s from Stazioni s, PaStazionePa r where (:fkIntermediario is null or"
+ " s.fkIntermediarioPa = :fkIntermediario) and (r.fkPa = :fkPa and r.fkStazione = s)"
+ " and (:idStazione is null or upper(s.idStazione) like concat('%',"
+ " upper(:idStazione), '%')) ")
+ " upper(:idStazione), '%')) "
+ " AND (cast(cast(:createDateBefore as text) as timestamp) IS NULL OR s.dataCreazione < cast(cast(:createDateBefore as text) as timestamp)) "
+ " AND (cast(cast(:createDateAfter as text) as timestamp) IS NULL OR s.dataCreazione > cast(cast(:createDateAfter as text) as timestamp)) "
+ " AND ((:connectionType IS NULL OR :connectionType = 'NONE') "
+ " OR (:connectionType = 'SYNC' AND servizio LIKE '%gpd%')"
+ " OR (:connectionType = 'ASYNC' AND (servizio IS NULL or servizio NOT LIKE '%gpd%')))")
Page<Stazioni> findAllByFilters(
@Param("fkIntermediario") Long fkIntermediario,
@Param("fkPa") Long fkPa,
@Param("idStazione") String idStazione,
@Param("createDateBefore") OffsetDateTime createDateBefore,
@Param("createDateAfter") OffsetDateTime createDateAfter,
@Param("connectionType") String connectionType,
Pageable pageable);

@Query(
value =
"select distinct s from Stazioni s where (:fkIntermediario is null or s.fkIntermediarioPa"
+ " = :fkIntermediario) and (:idStazione is null or upper(s.idStazione) like"
+ " concat('%', upper(:idStazione), '%')) ")
+ " concat('%', upper(:idStazione), '%')) "
+ " AND (cast(cast(:createDateBefore as text) as timestamp) IS NULL OR s.dataCreazione < cast(cast(:createDateBefore as text) as timestamp)) "
+ " AND (cast(cast(:createDateAfter as text) as timestamp) IS NULL OR s.dataCreazione > cast(cast(:createDateAfter as text) as timestamp)) "
+ " AND ((:connectionType IS NULL OR :connectionType = 'NONE') "
+ " OR (:connectionType = 'SYNC' AND servizio LIKE '%gpd%')"
+ " OR (:connectionType = 'ASYNC' AND (servizio IS NULL or servizio NOT LIKE '%gpd%')))")
Page<Stazioni> findAllByFilters(
@Param("fkIntermediario") Long fkIntermediario,
@Param("idStazione") String idStazione,
@Param("createDateBefore") OffsetDateTime createDateBefore,
@Param("createDateAfter") OffsetDateTime createDateAfter,
@Param("connectionType") String connectionType,
Pageable pageable);

@Query(
Expand All @@ -49,12 +66,20 @@ Page<Stazioni> findAllByFilters(
+ " = :fkPa and r.fkStazione = s) and (s.intermediarioPa = i) and (:idStazione is"
+ " null or upper(s.idStazione) like concat('%', upper(:idStazione), '%')) and"
+ " (:codiceIntermediario is null or upper(i.codiceIntermediario) like concat('%',"
+ " upper(:codiceIntermediario), '%')) ")
+ " upper(:codiceIntermediario), '%')) "
+ " AND (cast(cast(:createDateBefore as text) as timestamp) IS NULL OR s.dataCreazione < cast(cast(:createDateBefore as text) as timestamp)) "
+ " AND (cast(cast(:createDateAfter as text) as timestamp) IS NULL OR s.dataCreazione > cast(cast(:createDateAfter as text) as timestamp)) "
+ " AND ((:connectionType IS NULL OR :connectionType = 'NONE') "
+ " OR (:connectionType = 'SYNC' AND servizio LIKE '%gpd%')"
+ " OR (:connectionType = 'ASYNC' AND (servizio IS NULL or servizio NOT LIKE '%gpd%')))")
Page<Stazioni> findAllByFilters(
@Param("fkIntermediario") Long fkIntermediario,
@Param("fkPa") Long fkPa,
@Param("idStazione") String idStazione,
@Param("codiceIntermediario") String codiceIntermediario,
@Param("createDateBefore") OffsetDateTime createDateBefore,
@Param("createDateAfter") OffsetDateTime createDateAfter,
@Param("connectionType") String connectionType,
Pageable pageable);

@Query(
Expand All @@ -63,11 +88,20 @@ Page<Stazioni> findAllByFilters(
+ " (:fkIntermediario is null or s.fkIntermediarioPa = :fkIntermediario) and"
+ " (:idStazione is null or upper(s.idStazione) like concat('%', upper(:idStazione),"
+ " '%')) and (:codiceIntermediario is null or upper(i.codiceIntermediario) like "
+ " concat('%', upper(:codiceIntermediario), '%')) ")
+ " concat('%', upper(:codiceIntermediario), '%')) "
+ " AND (cast(cast(:createDateBefore as text) as timestamp) IS NULL OR s.dataCreazione < cast(cast(:createDateBefore as text) as timestamp)) "
+ " AND (cast(cast(:createDateAfter as text) as timestamp) IS NULL OR s.dataCreazione > cast(cast(:createDateAfter as text) as timestamp)) "
+ " AND ((:connectionType IS NULL OR :connectionType = 'NONE') "
+ " OR (:connectionType = 'SYNC' AND servizio LIKE '%gpd%')"
+ " OR (:connectionType = 'ASYNC' AND (servizio IS NULL or servizio NOT LIKE '%gpd%')))"
)
Page<Stazioni> findAllByFilters(
@Param("fkIntermediario") Long fkIntermediario,
@Param("idStazione") String idStazione,
@Param("codiceIntermediario") String codiceIntermediario,
@Param("createDateBefore") OffsetDateTime createDateBefore,
@Param("createDateAfter") OffsetDateTime createDateAfter,
@Param("connectionType") String connectionType,
Pageable pageable);

@Query(
Expand Down
Loading