pcvolkmer/onkostar-plugin-dnpm
1
0
Fork 0
mirror of https://github.com/pcvolkmer/onkostar-plugin-dnpm.git synced 2025-07-02 01:02:55 +00:00
Code Issues Activity

Issue #4: Ermittle Studien mit Namen der Kategorie

Browse Source
This commit is contained in:
Paul-Christian Volkmer
2023-03-14 15:11:50 +01:00
parent fcb7e6c14d
commit 599b8687b1
3 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/DNPM/services/DefaultStudienService.java
View File

@ -22,37 +22,41 @@ public class DefaultStudienService implements StudienService {
@Override
public List<Studie> findAll() {
var sql = "SELECT property_catalogue_version.version_number, studie.studien_nummer, pcve.code, pcve.shortdesc, pcve.description FROM property_catalogue "
var sql = "SELECT pcc.name, property_catalogue_version.version_number, studie.studien_nummer, pcve.code, pcve.shortdesc, pcve.description FROM property_catalogue "
+ "JOIN property_catalogue_version ON property_catalogue.id = property_catalogue_version.datacatalog_id "
+ "JOIN property_catalogue_version_entry pcve ON property_catalogue_version.id = pcve.property_version_id "
+ "JOIN property_catalogue_category pcc on property_catalogue_version.id = pcc.version_id "
+ "LEFT JOIN studie ON pcve.id = studie.property_version_entry AND studie.aktiv "
+ "WHERE property_catalogue.name = 'OS.Studien';";
return this.jdbcTemplate.query(sql, (resultSet, i) -> new Studie(
resultSet.getString(1),
resultSet.getString(0),
resultSet.getInt(1),
resultSet.getString(2),
resultSet.getString(3),
resultSet.getString(4),
resultSet.getInt(0)
resultSet.getString(5)
));
}
@Override
public List<Studie> findByQuery(String query) {
var sql = "SELECT property_catalogue_version.version_number, studie.studien_nummer, pcve.code, pcve.shortdesc, pcve.description FROM property_catalogue "
var sql = "SELECT pcc.name, property_catalogue_version.version_number, studie.studien_nummer, pcve.code, pcve.shortdesc, pcve.description FROM property_catalogue "
+ "JOIN property_catalogue_version ON property_catalogue.id = property_catalogue_version.datacatalog_id "
+ "JOIN property_catalogue_version_entry pcve ON property_catalogue_version.id = pcve.property_version_id "
+ "JOIN property_catalogue_category pcc on property_catalogue_version.id = pcc.version_id "
+ "LEFT JOIN studie ON pcve.id = studie.property_version_entry AND studie.aktiv "
+ "WHERE property_catalogue.name = 'OS.Studien' AND (pcve.shortdesc LIKE ? OR pcve.description LIKE ? OR studie.studien_nummer LIKE ?);";
var like = String.format("%%%s%%", query);
return this.jdbcTemplate.query(sql, new Object[]{like, like, like}, (resultSet, i) -> new Studie(
resultSet.getString(1),
resultSet.getString(0),
resultSet.getInt(1),
resultSet.getString(2),
resultSet.getString(3),
resultSet.getString(4),
resultSet.getInt(0)
resultSet.getString(5)
));
}
}

18
src/main/java/DNPM/services/Studie.java
View File

@ -1,18 +1,28 @@
package DNPM.services;
public class Studie {
private final String kategorieName;
private final String code;
private final String studiennummer;
private final String shortDesc;
private final String description;
private final int version;
public Studie(final String code, final String studiennummer, final String shortDesc, final String description, final int version) {
public Studie(final String kategorieName, final int version, final String code, final String studiennummer, final String shortDesc, final String description) {
this.kategorieName = kategorieName;
this.version = version;
this.code = code;
this.studiennummer = studiennummer;
this.shortDesc = shortDesc;
this.description = description;
this.version = version;
}
public String getKategorieName() {
return kategorieName;
}
public int getVersion() {
return version;
}
public String getCode() {
@ -31,10 +41,6 @@ public class Studie {
return description;
}
public int getVersion() {
return version;
}
public Type getType() {
if (this.hasNctNumber()) {
return Type.NCT;

19
src/test/java/DNPM/services/StudieTest.java
View File

@ -9,11 +9,12 @@ public class StudieTest {
@Test
void shouldDetectStudieWithNctNumber() {
var studie = new Studie(
"teststudie1",
"Kat 1",
1,
null,
"Nct-12345678",
"Teststudie 1",
"Teststudie 1",
1
"Teststudie 1"
);
assertThat(studie.getType()).isEqualTo(Studie.Type.NCT);
@ -22,11 +23,12 @@ public class StudieTest {
@Test
void shouldDetectStudieWithEudraCtNumber() {
var studie = new Studie(
"teststudie1",
"Kat 1",
1,
null,
"2023-012345-12",
"Teststudie 1",
"Teststudie 1",
1
"Teststudie 1"
);
assertThat(studie.getType()).isEqualTo(Studie.Type.EUDRA_CT);
@ -35,11 +37,12 @@ public class StudieTest {
@Test
void shouldReturnStudieWithUnknownNumberScheme() {
var studie = new Studie(
"Kat 1",
1,
"teststudie1",
null,
"Teststudie 1",
"Teststudie 1",
1
"Teststudie 1"
);
assertThat(studie.getType()).isEqualTo(Studie.Type.UNKNOWN);