From c43cfc082fd203cf94c1cd6d5d9faa0957bb445f Mon Sep 17 00:00:00 2001 From: chanhengseang Date: Sun, 25 May 2025 22:51:47 -0700 Subject: [PATCH] add draft --- .../V9__add_event_check_in_and_group_count.sql | 4 ++++ sport/src/main/java/com/srr/domain/Event.java | 10 ++++++++++ sport/src/main/java/com/srr/dto/EventDto.java | 6 ++++++ .../src/main/java/com/srr/enumeration/EventStatus.java | 5 ++++- 4 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 eladmin-system/src/main/resources/db/migration/V9__add_event_check_in_and_group_count.sql diff --git a/eladmin-system/src/main/resources/db/migration/V9__add_event_check_in_and_group_count.sql b/eladmin-system/src/main/resources/db/migration/V9__add_event_check_in_and_group_count.sql new file mode 100644 index 00000000..4cd60ca2 --- /dev/null +++ b/eladmin-system/src/main/resources/db/migration/V9__add_event_check_in_and_group_count.sql @@ -0,0 +1,4 @@ +-- Add check_in_at and group_count columns to event table +ALTER TABLE event +ADD COLUMN check_in_at TIMESTAMP NULL COMMENT 'Check-in time', +ADD COLUMN group_count INT NULL COMMENT 'Number of groups'; diff --git a/sport/src/main/java/com/srr/domain/Event.java b/sport/src/main/java/com/srr/domain/Event.java index 5f8adf97..b4ee0a61 100644 --- a/sport/src/main/java/com/srr/domain/Event.java +++ b/sport/src/main/java/com/srr/domain/Event.java @@ -41,6 +41,8 @@ import java.util.List; @Entity @Data @Table(name="event") +@SQLDelete(sql = "update event set status = 'DELETED' where id = ?", check = ResultCheckStyle.COUNT) +@Where(clause = "status != 'DELETED'") public class Event implements Serializable { @Id @@ -86,6 +88,14 @@ public class Event implements Serializable { @ApiModelProperty(value = "Update time", hidden = true) private Timestamp updateTime; + @Column(name = "`check_in_at`") + @ApiModelProperty(value = "Check in time", hidden = true) + private Timestamp checkInAt; + + @Column(name = "`group_count`") + @ApiModelProperty(value = "Number of groups") + private Integer groupCount; + @Column(name = "`sort`") @ApiModelProperty(value = "Sort") private Integer sort; diff --git a/sport/src/main/java/com/srr/dto/EventDto.java b/sport/src/main/java/com/srr/dto/EventDto.java index 6e58dc44..6b0361e7 100644 --- a/sport/src/main/java/com/srr/dto/EventDto.java +++ b/sport/src/main/java/com/srr/dto/EventDto.java @@ -87,6 +87,12 @@ public class EventDto implements Serializable { private boolean allowWaitList; + @ApiModelProperty(value = "Check-in time") + private Timestamp checkInAt; + + @ApiModelProperty(value = "Number of groups") + private Integer groupCount; + @ApiModelProperty(value = "Co-host players") private List coHostPlayers; } \ No newline at end of file diff --git a/sport/src/main/java/com/srr/enumeration/EventStatus.java b/sport/src/main/java/com/srr/enumeration/EventStatus.java index aa10d100..c354b704 100644 --- a/sport/src/main/java/com/srr/enumeration/EventStatus.java +++ b/sport/src/main/java/com/srr/enumeration/EventStatus.java @@ -1,7 +1,10 @@ package com.srr.enumeration; public enum EventStatus { + DRAFT, OPEN, + CHECK_IN, IN_PROGRESS, - CLOSED + CLOSED, + DELETED }