Merge pull request #88 from Sports-day/feature/sport-reference-to-tea…

…m-tag TeamTagにSportを外部キーとして登録
Sports-day · May 9, 2024 · d22b9e2 · d22b9e2
2 parents f27aa7b + e2cd2ce
commit d22b9e2
Show file tree

Hide file tree

Showing 11 changed files with 876 additions and 762 deletions.
diff --git a/dbdoc/README.md b/dbdoc/README.md
@@ -18,7 +18,7 @@
 | [roles](roles.md) | 6 |  | BASE TABLE |
 | [sports](sports.md) | 9 |  | BASE TABLE |
 | [tags](tags.md) | 5 |  | BASE TABLE |
-| [team_tags](team_tags.md) | 4 |  | BASE TABLE |
+| [team_tags](team_tags.md) | 5 |  | BASE TABLE |
 | [team_users](team_users.md) | 2 |  | BASE TABLE |
 | [teams](teams.md) | 7 |  | BASE TABLE |
 | [tournament_path](tournament_path.md) | 2 |  | BASE TABLE |

diff --git a/dbdoc/schema.json b/dbdoc/schema.json
diff --git a/dbdoc/schema.svg b/dbdoc/schema.svg
diff --git a/dbdoc/sports.md b/dbdoc/sports.md
@@ -30,7 +30,7 @@ CREATE TABLE `sports` (
 
 | Name | Type | Default | Nullable | Extra Definition | Children | Parents | Comment |
 | ---- | ---- | ------- | -------- | ---------------- | -------- | ------- | ------- |
-| id | int |  | false | auto_increment | [games](games.md) [matches](matches.md) |  |  |
+| id | int |  | false | auto_increment | [games](games.md) [matches](matches.md) [team_tags](team_tags.md) |  |  |
 | name | varchar(64) |  | false |  |  |  |  |
 | description | text |  | false |  |  |  |  |
 | icon_image | int |  | true |  |  | [images](images.md) |  |

diff --git a/dbdoc/sports.svg b/dbdoc/sports.svg
diff --git a/dbdoc/team_tags.md b/dbdoc/team_tags.md
@@ -9,9 +9,12 @@
 CREATE TABLE `team_tags` (
   `id` int NOT NULL AUTO_INCREMENT,
   `name` varchar(64) NOT NULL,
+  `sport` int DEFAULT NULL,
   `created_at` datetime(6) NOT NULL,
   `updated_at` datetime(6) NOT NULL,
-  PRIMARY KEY (`id`)
+  PRIMARY KEY (`id`),
+  KEY `fk_team_tags_sport__id` (`sport`),
+  CONSTRAINT `fk_team_tags_sport__id` FOREIGN KEY (`sport`) REFERENCES `sports` (`id`) ON DELETE SET NULL ON UPDATE RESTRICT
 ) ENGINE=InnoDB AUTO_INCREMENT=[Redacted by tbls] DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 ```
 
@@ -23,19 +26,22 @@ CREATE TABLE `team_tags` (
 | ---- | ---- | ------- | -------- | ---------------- | -------- | ------- | ------- |
 | id | int |  | false | auto_increment | [teams](teams.md) |  |  |
 | name | varchar(64) |  | false |  |  |  |  |
+| sport | int |  | true |  |  | [sports](sports.md) |  |
 | created_at | datetime(6) |  | false |  |  |  |  |
 | updated_at | datetime(6) |  | false |  |  |  |  |
 
 ## Constraints
 
 | Name | Type | Definition |
 | ---- | ---- | ---------- |
+| fk_team_tags_sport__id | FOREIGN KEY | FOREIGN KEY (sport) REFERENCES sports (id) |
 | PRIMARY | PRIMARY KEY | PRIMARY KEY (id) |
 
 ## Indexes
 
 | Name | Definition |
 | ---- | ---------- |
+| fk_team_tags_sport__id | KEY fk_team_tags_sport__id (sport) USING BTREE |
 | PRIMARY | PRIMARY KEY (id) USING BTREE |
 
 ## Relations

diff --git a/dbdoc/team_tags.svg b/dbdoc/team_tags.svg
diff --git a/dbdoc/teams.svg b/dbdoc/teams.svg
diff --git a/src/main/kotlin/net/sportsday/bin/Seeder.kt b/src/main/kotlin/net/sportsday/bin/Seeder.kt
@@ -148,15 +148,57 @@ fun main() {
             },
         )
 
+        //  tag
+        val tags = listOf(
+            TagEntity.new {
+                name = "晴天時"
+                enabled = true
+                createdAt = LocalDateTime.now()
+                updatedAt = LocalDateTime.now()
+            },
+            TagEntity.new {
+                name = "雨天時"
+                enabled = true
+                createdAt = LocalDateTime.now()
+                updatedAt = LocalDateTime.now()
+            },
+        )
+
+        //  sports
+        val sports = listOf(
+            SportEntity.new {
+                name = "バスケットボール晴天時"
+                description = "バスケットボール晴天時"
+                iconImage = null
+                weight = 10
+                ruleId = 1
+                tag = tags[0]
+                createdAt = LocalDateTime.now()
+                updatedAt = LocalDateTime.now()
+            },
+            SportEntity.new {
+                name = "バスケットボール雨天時"
+                description = "バスケットボール雨天時"
+                iconImage = null
+                weight = 5
+                ruleId = 1
+                tag = tags[1]
+                createdAt = LocalDateTime.now()
+                updatedAt = LocalDateTime.now()
+            },
+        )
+
         //  TeamTag
         val teamTags = listOf(
             TeamTagEntity.new {
                 name = "バスケットボール晴天時"
+                sport = sports[0]
                 createdAt = LocalDateTime.now()
                 updatedAt = LocalDateTime.now()
             },
             TeamTagEntity.new {
                 name = "バスケットボール雨天時"
+                sport = sports[1]
                 createdAt = LocalDateTime.now()
                 updatedAt = LocalDateTime.now()
             }
@@ -265,46 +307,6 @@ fun main() {
             },
         )
 
-        //  tag
-        val tags = listOf(
-            TagEntity.new {
-                name = "晴天時"
-                enabled = true
-                createdAt = LocalDateTime.now()
-                updatedAt = LocalDateTime.now()
-            },
-            TagEntity.new {
-                name = "雨天時"
-                enabled = true
-                createdAt = LocalDateTime.now()
-                updatedAt = LocalDateTime.now()
-            },
-        )
-
-        //  sports
-        val sports = listOf(
-            SportEntity.new {
-                name = "バスケットボール晴天時"
-                description = "バスケットボール晴天時"
-                iconImage = null
-                weight = 10
-                ruleId = 1
-                tag = tags[0]
-                createdAt = LocalDateTime.now()
-                updatedAt = LocalDateTime.now()
-            },
-            SportEntity.new {
-                name = "バスケットボール雨天時"
-                description = "バスケットボール雨天時"
-                iconImage = null
-                weight = 5
-                ruleId = 1
-                tag = tags[1]
-                createdAt = LocalDateTime.now()
-                updatedAt = LocalDateTime.now()
-            },
-        )
-
         //  game
         val games = listOf(
             GameEntity.new {

diff --git a/src/main/kotlin/net/sportsday/models/TeamTag.kt b/src/main/kotlin/net/sportsday/models/TeamTag.kt
@@ -5,6 +5,7 @@ import org.jetbrains.exposed.dao.IntEntity
 import org.jetbrains.exposed.dao.IntEntityClass
 import org.jetbrains.exposed.dao.id.EntityID
 import org.jetbrains.exposed.dao.id.IntIdTable
+import org.jetbrains.exposed.sql.ReferenceOption
 import org.jetbrains.exposed.sql.javatime.datetime
 
 /**
@@ -14,6 +15,7 @@ import org.jetbrains.exposed.sql.javatime.datetime
 
 object TeamTags : IntIdTable("team_tags") {
     val name = varchar("name", 64)
+    val sport = reference("sport", Sports, onDelete = ReferenceOption.SET_NULL).nullable()
     val createdAt = datetime("created_at")
     val updatedAt = datetime("updated_at")
 }
@@ -22,6 +24,7 @@ class TeamTagEntity(id: EntityID<Int>) : IntEntity(id) {
     companion object : IntEntityClass<TeamTagEntity>(TeamTags)
 
     var name by TeamTags.name
+    var sport by SportEntity optionalReferencedOn TeamTags.sport
     var createdAt by TeamTags.createdAt
     var updatedAt by TeamTags.updatedAt
     val teams by TeamEntity optionalReferrersOn Teams.teamTag
@@ -30,6 +33,7 @@ class TeamTagEntity(id: EntityID<Int>) : IntEntity(id) {
         return TeamTag(
             id.value,
             name,
+            sport?.id?.value,
             createdAt.toString(),
             updatedAt.toString(),
         )
@@ -40,11 +44,13 @@ class TeamTagEntity(id: EntityID<Int>) : IntEntity(id) {
 data class TeamTag(
     val id: Int,
     val name: String,
+    val sportId: Int?,
     val createdAt: String,
     val updatedAt: String,
 )
 
 @Serializable
 data class OmittedTeamTag(
     val name: String,
+    val sportId: Int?,
 )
diff --git a/src/main/kotlin/net/sportsday/services/TeamTagsService.kt b/src/main/kotlin/net/sportsday/services/TeamTagsService.kt
@@ -2,6 +2,7 @@ package net.sportsday.services
 
 import io.ktor.server.plugins.*
 import net.sportsday.models.OmittedTeamTag
+import net.sportsday.models.SportEntity
 import net.sportsday.models.TeamTag
 import net.sportsday.models.TeamTagEntity
 import org.jetbrains.exposed.sql.transactions.transaction
@@ -42,8 +43,13 @@ object TeamTagsService {
 
     fun create(omittedTeamTag: OmittedTeamTag): Result<TeamTag> {
         val model = transaction {
+            val sport = omittedTeamTag.sportId?.let {
+                SportEntity.findById(it) ?: throw NotFoundException("invalid sport id")
+            }
+
             val teamTag = TeamTagEntity.new {
                 this.name = omittedTeamTag.name
+                this.sport = sport
                 this.createdAt = LocalDateTime.now()
                 this.updatedAt = LocalDateTime.now()
             }
@@ -57,8 +63,12 @@ object TeamTagsService {
     fun edit(id: Int, omittedTeamTag: OmittedTeamTag): Result<TeamTag> {
         val model = transaction {
             val teamTag = TeamTagEntity.findById(id) ?: throw NotFoundException("TeamTag not found.")
+            val sport = omittedTeamTag.sportId?.let {
+                SportEntity.findById(it) ?: throw NotFoundException("invalid sport id")
+            }
 
             teamTag.name = omittedTeamTag.name
+            teamTag.sport = sport
             teamTag.updatedAt = LocalDateTime.now()
 
             teamTag.serializableModel()