From a4f02a0ebacb3d0d07b30a9d4d3b2d6228e3771b Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Tue, 27 Sep 2022 16:26:36 +0200
Subject: [PATCH] Removed untracked files, updated some schema metadata
---
.jupyter/.gitignore | 5 +-
.../api/__pycache__/__init__.cpython-38.pyc | Bin 295 -> 0 bytes
.../metadata_endpoint_api.cpython-38.pyc | Bin 3519 -> 0 bytes
.../__pycache__/__init__.cpython-38.pyc | Bin 585 -> 0 bytes
...list_identifiers_parameters.cpython-38.pyc | Bin 8397 -> 0 bytes
.../at/tuwien/api/database/DatabaseDto.java | 54 +-----------------
.../api/database/DatabaseModifyDto.java | 14 +----
.../api/identifier/IdentifierCreateDto.java | 3 +-
.../tuwien/api/identifier/IdentifierDto.java | 5 +-
9 files changed, 7 insertions(+), 74 deletions(-)
delete mode 100644 .jupyter/api_metadata/api/__pycache__/__init__.cpython-38.pyc
delete mode 100644 .jupyter/api_metadata/api/__pycache__/metadata_endpoint_api.cpython-38.pyc
delete mode 100644 .jupyter/api_metadata/models/__pycache__/__init__.cpython-38.pyc
delete mode 100644 .jupyter/api_metadata/models/__pycache__/oai_list_identifiers_parameters.cpython-38.pyc
diff --git a/.jupyter/.gitignore b/.jupyter/.gitignore
index d189b23377..bd7009506f 100644
--- a/.jupyter/.gitignore
+++ b/.jupyter/.gitignore
@@ -9,7 +9,4 @@ api_identifier/
api_analyse/
## Cache
-api_authentication/__pycache__/
-api_broker/__pycache__/
-api_units/__pacache__/
-api_metadata/__pycache__/
+**/__pycache__/
diff --git a/.jupyter/api_metadata/api/__pycache__/__init__.cpython-38.pyc b/.jupyter/api_metadata/api/__pycache__/__init__.cpython-38.pyc
deleted file mode 100644
index 074f563f060fa72fc349088d8d35a5dbbe3e527b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 295
zcmWIL<>g{vU|?8y)F^o#0|Ucj5C<7EF)%PVFfcF_%P=r7q%fo~<}l<kMlmvi*i1Q0
zxy(__j0`Ev!3>%#FG2b=8E^3?CKc!Bl$NB%XXX~<7nNu--V*jrElEsCEJ<|DODV|D
z%qwv$$n?`>xy2P9pH^B@T9g_eUj(x0mRe##W_&JGv0h?9rXGwFp9<9)pIDGt#LU3J
zu#%yOje!9|{PNJx$j?pH&n-{QEKb!AD9X=DO)e?cPfJPEElw>e%S=u!*4N7_EvPI>
oEz(D}1jNygkI&4@EQycTE2zB1VUwGmQks)$#|ZK^$W=V70A@^6l>h($
diff --git a/.jupyter/api_metadata/api/__pycache__/metadata_endpoint_api.cpython-38.pyc b/.jupyter/api_metadata/api/__pycache__/metadata_endpoint_api.cpython-38.pyc
deleted file mode 100644
index bcf5e3dbb0df868b5c122beeaea639be13e4245a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 3519
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
PGYc0F69+Q~6Av>0l;7_~
diff --git a/.jupyter/api_metadata/models/__pycache__/__init__.cpython-38.pyc b/.jupyter/api_metadata/models/__pycache__/__init__.cpython-38.pyc
deleted file mode 100644
index 90580fabb33b3a2e769fefef7403111160820804..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 585
zcmWIL<>g{vU|?8y)F}A`BLl-@5C<7EF)%PVFfcF_D=;uHq%cG=q%fv1<uK+lMKLjg
z*vvW1xhzpEj0`C(!3>(LRX?~C6ciL(5=#=35{pw6f>I0ei!)2|iz*d-Q%e$45=#;l
zf>VpiGLusk90NSLz^Y*aB^ik&3b~1SiRr1u3MCn-3b`;X3d#z3`GtvA3a+LGh7e8u
z1*v(C0iFuQ1*ypjWvNBQnfZBE3Wj=ydIq|QIRzPsV56P$^GXtvORN+U^HPdZ6N~kV
z5=)a(iyTTy%QI8+^b(Wx5=+1e-Ba^YixNvxQxuXatrRj!N(zdt^!3v-OEOB6^pf*)
z^^40B)6-LnbQ23Q;q2u6l+^UpJiYYH60Vn^P}5|*#h;i|oS#!#k{X|xTaaH=qRDtm
z#y>IBC$qT3GbJ^zBr`2DwWv5Cu_!S&wIsEu*iV!77JGbrN`7*D{4K8d__WfJ(xTM(
z_##lq-!e`t$c%>tgI;caN@`BAUVdU`d`@O@Nqi>4!1#hhn2ANq3=9k_8H(5$7$C$i
zZ~ct?+*JMC^3=@YRQ-UW{H)aEl4AX|ltkTPNMsc2>t&S|RF<R`=_A{y53x}{K0Y%q
evm`!Vub}c4hfQvNN@-529SbN~fCv^Y9%caJKDDI)
diff --git a/.jupyter/api_metadata/models/__pycache__/oai_list_identifiers_parameters.cpython-38.pyc b/.jupyter/api_metadata/models/__pycache__/oai_list_identifiers_parameters.cpython-38.pyc
deleted file mode 100644
index 00ddadcbc70b90f9790f75a4ab6be004da1ba913..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 8397
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
L#lgtI#K8mr$YO${
diff --git a/fda-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseDto.java b/fda-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseDto.java
index dee998bf93..afc62445f1 100644
--- a/fda-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseDto.java
+++ b/fda-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseDto.java
@@ -23,7 +23,6 @@ import java.util.List;
public class DatabaseDto {
@NotNull
-<<<<<<< HEAD
private Long id;
@NotBlank
@@ -35,38 +34,10 @@ public class DatabaseDto {
private String exchange;
@NotNull
-=======
- @Schema(example = "1")
- private Long id;
-
- @NotBlank
- @Schema(example = "Weather Australia")
- private String name;
-
- @NotBlank
- private String exchange;
-
- @NotNull
- @Schema
->>>>>>> dev
private UserBriefDto creator;
@NotBlank
@JsonProperty("internal_name")
-<<<<<<< HEAD
- @Schema(example = "air_quality")
- private String internalName;
-
- @Schema(description = "database subjects")
- private List<String> subjects;
-
- @Schema(example = "en")
- private LanguageTypeDto language;
-
- private LicenseDto license;
-
- @Schema(example = "Air Quality in Austria")
-=======
@Schema(example = "weather_australia")
private String internalName;
@@ -79,26 +50,11 @@ public class DatabaseDto {
private LicenseDto license;
@Schema(example = "Weather Australia 2009-2021")
->>>>>>> dev
private String description;
@Schema(example = "TU Wien")
private String publisher;
-<<<<<<< HEAD
- private UserDto contact;
-
- @JsonProperty("publication_year")
- @Schema(description = "database publication year", example = "2022")
- private Integer publicationYear;
-
- @JsonProperty("publication_month")
- @Schema(description = "database publication month", example = "12")
- private Integer publicationMonth;
-
- @JsonProperty("publication_day")
- @Schema(description = "database publication day", example = "15")
-=======
@JsonProperty("publication_year")
private Integer publicationYear;
@@ -106,16 +62,12 @@ public class DatabaseDto {
private Integer publicationMonth;
@JsonProperty("publication_day")
->>>>>>> dev
private Integer publicationDay;
private List<TableBriefDto> tables;
@JsonProperty("is_public")
-<<<<<<< HEAD
- @Schema(description = "database publicity", example = "true")
-=======
->>>>>>> dev
+ @Schema(example = "true")
private Boolean isPublic;
private ImageDto image;
@@ -126,11 +78,7 @@ public class DatabaseDto {
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", timezone = "UTC")
private Instant created;
-<<<<<<< HEAD
@Schema(example = "2020-08-04 11:13:00")
-=======
- @Parameter(example = "2020-08-04 11:13:00")
->>>>>>> dev
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", timezone = "UTC")
private Instant deleted;
diff --git a/fda-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseModifyDto.java b/fda-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseModifyDto.java
index a923db8767..819bf7ffc6 100644
--- a/fda-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseModifyDto.java
+++ b/fda-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseModifyDto.java
@@ -1,7 +1,6 @@
package at.tuwien.api.database;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
@@ -9,7 +8,6 @@ import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
-import java.sql.Date;
import java.util.List;
@Getter
@@ -22,19 +20,11 @@ public class DatabaseModifyDto {
private List<String> subjects;
-<<<<<<< HEAD
- @NotBlank
- @Schema(example = "Air Quality in Austria")
- private String description;
-
- @Schema(example = "TU Wien")
-=======
- @Parameter(name = "database description", example = "Sample")
+ @Schema(example = "Sample")
private String description;
@NotBlank
- @Parameter(name = "database publisher", example = "TU Wien")
->>>>>>> dev
+ @Schema(example = "TU Wien")
private String publisher;
@NotNull
diff --git a/fda-metadata-db/api/src/main/java/at/tuwien/api/identifier/IdentifierCreateDto.java b/fda-metadata-db/api/src/main/java/at/tuwien/api/identifier/IdentifierCreateDto.java
index 164b218f85..899d29f781 100644
--- a/fda-metadata-db/api/src/main/java/at/tuwien/api/identifier/IdentifierCreateDto.java
+++ b/fda-metadata-db/api/src/main/java/at/tuwien/api/identifier/IdentifierCreateDto.java
@@ -6,7 +6,6 @@ import lombok.Builder;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
-import lombok.extern.jackson.Jacksonized;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
@@ -44,7 +43,7 @@ public class IdentifierCreateDto {
@Schema(example = "12")
private Integer publicationMonth;
- @Parameter(name = "publisher", example = "TU Wien")
+ @Schema(example = "TU Wien")
private String publisher;
@NotNull
diff --git a/fda-metadata-db/api/src/main/java/at/tuwien/api/identifier/IdentifierDto.java b/fda-metadata-db/api/src/main/java/at/tuwien/api/identifier/IdentifierDto.java
index 5d7c259c6f..5f57e0b0b0 100644
--- a/fda-metadata-db/api/src/main/java/at/tuwien/api/identifier/IdentifierDto.java
+++ b/fda-metadata-db/api/src/main/java/at/tuwien/api/identifier/IdentifierDto.java
@@ -54,7 +54,7 @@ public class IdentifierDto {
@NotBlank
@JsonProperty("query_hash")
- @Parameter(description = "query hash in sha512")
+ @Schema(description = "query hash in sha512")
private String queryHash;
@NotNull
@@ -63,7 +63,6 @@ public class IdentifierDto {
@NotBlank
@JsonProperty("result_hash")
- @Parameter(name = "result hash in sha512")
private String resultHash;
@NotNull
@@ -78,7 +77,7 @@ public class IdentifierDto {
@Schema(example = "10.1038/nphys1170")
private String doi;
- @Parameter(name = "publisher", example = "TU Wien")
+ @Schema(example = "TU Wien")
private String publisher;
@NotNull
--
GitLab