Skip to content
Snippets Groups Projects
Unverified Commit a4f02a0e authored by Martin Weise's avatar Martin Weise
Browse files

Removed untracked files, updated some schema metadata

parent 4fd6e83c
No related branches found
No related tags found
1 merge request!88Resolve "Fix AMQP permissions"
Showing with 7 additions and 74 deletions
...@@ -9,7 +9,4 @@ api_identifier/ ...@@ -9,7 +9,4 @@ api_identifier/
api_analyse/ api_analyse/
## Cache ## Cache
api_authentication/__pycache__/ **/__pycache__/
api_broker/__pycache__/
api_units/__pacache__/
api_metadata/__pycache__/
File deleted
File deleted
File deleted
...@@ -23,7 +23,6 @@ import java.util.List; ...@@ -23,7 +23,6 @@ import java.util.List;
public class DatabaseDto { public class DatabaseDto {
@NotNull @NotNull
<<<<<<< HEAD
private Long id; private Long id;
@NotBlank @NotBlank
...@@ -35,38 +34,10 @@ public class DatabaseDto { ...@@ -35,38 +34,10 @@ public class DatabaseDto {
private String exchange; private String exchange;
@NotNull @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; private UserBriefDto creator;
@NotBlank @NotBlank
@JsonProperty("internal_name") @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") @Schema(example = "weather_australia")
private String internalName; private String internalName;
...@@ -79,26 +50,11 @@ public class DatabaseDto { ...@@ -79,26 +50,11 @@ public class DatabaseDto {
private LicenseDto license; private LicenseDto license;
@Schema(example = "Weather Australia 2009-2021") @Schema(example = "Weather Australia 2009-2021")
>>>>>>> dev
private String description; private String description;
@Schema(example = "TU Wien") @Schema(example = "TU Wien")
private String publisher; 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") @JsonProperty("publication_year")
private Integer publicationYear; private Integer publicationYear;
...@@ -106,16 +62,12 @@ public class DatabaseDto { ...@@ -106,16 +62,12 @@ public class DatabaseDto {
private Integer publicationMonth; private Integer publicationMonth;
@JsonProperty("publication_day") @JsonProperty("publication_day")
>>>>>>> dev
private Integer publicationDay; private Integer publicationDay;
private List<TableBriefDto> tables; private List<TableBriefDto> tables;
@JsonProperty("is_public") @JsonProperty("is_public")
<<<<<<< HEAD @Schema(example = "true")
@Schema(description = "database publicity", example = "true")
=======
>>>>>>> dev
private Boolean isPublic; private Boolean isPublic;
private ImageDto image; private ImageDto image;
...@@ -126,11 +78,7 @@ public class DatabaseDto { ...@@ -126,11 +78,7 @@ public class DatabaseDto {
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", timezone = "UTC") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", timezone = "UTC")
private Instant created; private Instant created;
<<<<<<< HEAD
@Schema(example = "2020-08-04 11:13:00") @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") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", timezone = "UTC")
private Instant deleted; private Instant deleted;
......
package at.tuwien.api.database; package at.tuwien.api.database;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;
...@@ -9,7 +8,6 @@ import javax.validation.constraints.Max; ...@@ -9,7 +8,6 @@ import javax.validation.constraints.Max;
import javax.validation.constraints.Min; import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.sql.Date;
import java.util.List; import java.util.List;
@Getter @Getter
...@@ -22,19 +20,11 @@ public class DatabaseModifyDto { ...@@ -22,19 +20,11 @@ public class DatabaseModifyDto {
private List<String> subjects; private List<String> subjects;
<<<<<<< HEAD @Schema(example = "Sample")
@NotBlank
@Schema(example = "Air Quality in Austria")
private String description;
@Schema(example = "TU Wien")
=======
@Parameter(name = "database description", example = "Sample")
private String description; private String description;
@NotBlank @NotBlank
@Parameter(name = "database publisher", example = "TU Wien") @Schema(example = "TU Wien")
>>>>>>> dev
private String publisher; private String publisher;
@NotNull @NotNull
......
...@@ -6,7 +6,6 @@ import lombok.Builder; ...@@ -6,7 +6,6 @@ import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import lombok.extern.jackson.Jacksonized;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
...@@ -44,7 +43,7 @@ public class IdentifierCreateDto { ...@@ -44,7 +43,7 @@ public class IdentifierCreateDto {
@Schema(example = "12") @Schema(example = "12")
private Integer publicationMonth; private Integer publicationMonth;
@Parameter(name = "publisher", example = "TU Wien") @Schema(example = "TU Wien")
private String publisher; private String publisher;
@NotNull @NotNull
......
...@@ -54,7 +54,7 @@ public class IdentifierDto { ...@@ -54,7 +54,7 @@ public class IdentifierDto {
@NotBlank @NotBlank
@JsonProperty("query_hash") @JsonProperty("query_hash")
@Parameter(description = "query hash in sha512") @Schema(description = "query hash in sha512")
private String queryHash; private String queryHash;
@NotNull @NotNull
...@@ -63,7 +63,6 @@ public class IdentifierDto { ...@@ -63,7 +63,6 @@ public class IdentifierDto {
@NotBlank @NotBlank
@JsonProperty("result_hash") @JsonProperty("result_hash")
@Parameter(name = "result hash in sha512")
private String resultHash; private String resultHash;
@NotNull @NotNull
...@@ -78,7 +77,7 @@ public class IdentifierDto { ...@@ -78,7 +77,7 @@ public class IdentifierDto {
@Schema(example = "10.1038/nphys1170") @Schema(example = "10.1038/nphys1170")
private String doi; private String doi;
@Parameter(name = "publisher", example = "TU Wien") @Schema(example = "TU Wien")
private String publisher; private String publisher;
@NotNull @NotNull
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment