Removed untracked files, updated some schema metadata

.jupyter/.gitignore

@@ -9,7 +9,4 @@ api_identifier/
 api_analyse/
 
 ## Cache
-api_authentication/__pycache__/
-api_broker/__pycache__/
-api_units/__pacache__/
-api_metadata/__pycache__/
+**/__pycache__/

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;
 

fda-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseModifyDto.java

 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

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

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