diff --git a/src/back/src/com/flagg10ma/taf/dto/CompleteEventDto.java b/src/back/src/com/flagg10ma/taf/dto/CompleteEventDto.java new file mode 100644 index 0000000..71fad02 --- /dev/null +++ b/src/back/src/com/flagg10ma/taf/dto/CompleteEventDto.java @@ -0,0 +1,9 @@ +package com.flagg10ma.taf.dto; + +import java.util.Collection; + +public record CompleteEventDto( + EventDto event, + Collection labels +) { +} diff --git a/src/back/src/com/flagg10ma/taf/dto/EventDto.java b/src/back/src/com/flagg10ma/taf/dto/EventDto.java new file mode 100644 index 0000000..c73449c --- /dev/null +++ b/src/back/src/com/flagg10ma/taf/dto/EventDto.java @@ -0,0 +1,26 @@ +package com.flagg10ma.taf.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.time.LocalDate; +import java.util.Collection; + +public record EventDto( + @JsonProperty("event_id") String id, + String title, + String description, + + @JsonProperty("start_date") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "dd/MM/yyyy") + LocalDate startDate, + + @JsonProperty("end_date") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "dd/MM/yyyy") + LocalDate endDate, + + @JsonProperty("color_code") String color, + @JsonProperty("task_count") int taskCount, + Collection tasks +) { +} diff --git a/src/back/src/com/flagg10ma/taf/dto/EventListDto.java b/src/back/src/com/flagg10ma/taf/dto/EventListDto.java new file mode 100644 index 0000000..031f1a8 --- /dev/null +++ b/src/back/src/com/flagg10ma/taf/dto/EventListDto.java @@ -0,0 +1,9 @@ +package com.flagg10ma.taf.dto; + +import java.util.Collection; + +public record EventListDto( + Collection events, + Collection labels +) { +} diff --git a/src/back/src/com/flagg10ma/taf/dto/EventTaskDto.java b/src/back/src/com/flagg10ma/taf/dto/EventTaskDto.java new file mode 100644 index 0000000..bbe8848 --- /dev/null +++ b/src/back/src/com/flagg10ma/taf/dto/EventTaskDto.java @@ -0,0 +1,23 @@ +package com.flagg10ma.taf.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.time.LocalDate; +import java.util.Collection; + +public record EventTaskDto( + @JsonProperty("task_id") String id, + String title, + String description, + boolean delayed, + + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "dd/MM/yyyy") + @JsonProperty("date_assigned") LocalDate assignedDate, + + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "dd/MM/yyyy") + @JsonProperty("date_completed") LocalDate completionDate, + + @JsonProperty("label_ids") Collection labels +) { +} diff --git a/src/back/src/com/flagg10ma/taf/dto/EventFromListDto.java b/src/back/src/com/flagg10ma/taf/dto/SimplifiedEventDto.java similarity index 80% rename from src/back/src/com/flagg10ma/taf/dto/EventFromListDto.java rename to src/back/src/com/flagg10ma/taf/dto/SimplifiedEventDto.java index 3e5d151..e055daa 100644 --- a/src/back/src/com/flagg10ma/taf/dto/EventFromListDto.java +++ b/src/back/src/com/flagg10ma/taf/dto/SimplifiedEventDto.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import java.time.LocalDate; -public record EventFromListDto( +public record SimplifiedEventDto( @JsonProperty("event_id") String id, String title, String description, @@ -18,6 +18,7 @@ public record EventFromListDto( @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "dd/MM/yyyy") LocalDate endDate, - @JsonProperty("color_code") String color + @JsonProperty("color_code") String color, + @JsonProperty("task_count") int taskCount ) { } diff --git a/src/back/src/com/flagg10ma/taf/dto/SimplifiedTaskDto.java b/src/back/src/com/flagg10ma/taf/dto/SimplifiedTaskDto.java new file mode 100644 index 0000000..e278fb6 --- /dev/null +++ b/src/back/src/com/flagg10ma/taf/dto/SimplifiedTaskDto.java @@ -0,0 +1,24 @@ +package com.flagg10ma.taf.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.time.LocalDate; +import java.util.Collection; + +public record SimplifiedTaskDto( + @JsonProperty("task_id") String id, + String title, + String description, + boolean delayed, + + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "dd/MM/yyyy") + @JsonProperty("date_assigned") LocalDate assignedDate, + + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "dd/MM/yyyy") + @JsonProperty("date_completed") LocalDate completionDate, + + @JsonProperty("event_id") String event, + @JsonProperty("label_ids") Collection labels +) { +} diff --git a/src/back/src/com/flagg10ma/taf/dto/TaskDto.java b/src/back/src/com/flagg10ma/taf/dto/TaskDto.java new file mode 100644 index 0000000..4961c19 --- /dev/null +++ b/src/back/src/com/flagg10ma/taf/dto/TaskDto.java @@ -0,0 +1,24 @@ +package com.flagg10ma.taf.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.time.LocalDate; +import java.util.Collection; + +public record TaskDto( + @JsonProperty("task_id") String id, + String title, + String description, + boolean delayed, + + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "dd/MM/yyyy") + @JsonProperty("date_assigned") LocalDate assignedDate, + + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "dd/MM/yyyy") + @JsonProperty("date_completed") LocalDate completionDate, + + SimplifiedEventDto event, + @JsonProperty("label_ids") Collection labels +) { +} diff --git a/src/back/src/com/flagg10ma/taf/dto/TaskListDto.java b/src/back/src/com/flagg10ma/taf/dto/TaskListDto.java new file mode 100644 index 0000000..919a7cc --- /dev/null +++ b/src/back/src/com/flagg10ma/taf/dto/TaskListDto.java @@ -0,0 +1,10 @@ +package com.flagg10ma.taf.dto; + +import java.util.Collection; + +public record TaskListDto( + Collection tasks, + Collection events, + Collection labels +) { +}