From a90e9b0e5109ac59c27778fec3cbacec1e7489be Mon Sep 17 00:00:00 2001 From: Vincent Huang iMac Date: Wed, 7 Dec 2022 01:14:51 +0800 Subject: [PATCH 01/12] :recycle: refactor: api refine --- README.md | 2 + yugioh-20221012/build.gradle.kts | 7 +- yugioh-20221012/http/Test.http | 11 - yugioh-20221012/http/test-java.http | 160 ++++++++++++ yugioh-20221012/http/test-kotlin.http | 160 ++++++++++++ .../yugioh/{domain => data}/dto/CardDto.java | 17 +- .../dto/CardReqDto.java} | 11 +- .../DeckDto.java => data/dto/CardsDto.java} | 4 +- .../{domain => data}/dto/DuelFieldDto.java | 8 +- .../{domain => data}/dto/DuelistDto.java | 4 +- .../yugioh/{domain => data}/dto/ZoneDto.java | 10 +- .../tw/gaas/yugioh/data/entity/DuelField.java | 240 ++++++++++++++++++ .../tw/gaas/yugioh/data/entity/Duelist.java | 78 ++++++ .../java/tw/gaas/yugioh/data/entity/Zone.java | 118 +++++++++ .../tw/gaas/yugioh/data/entity/card/Card.java | 31 +++ .../gaas/yugioh/data/entity/card/Cards.java | 86 +++++++ .../tw/gaas/yugioh/data/entity/card/Deck.java | 26 ++ .../data/entity/card/GraveYardCards.java | 16 ++ .../yugioh/data/entity/card/HandCards.java | 56 ++++ .../yugioh/data/entity/card/MonsterCard.java | 73 ++++++ .../yugioh/data/entity/card/MonsterCards.java | 45 ++++ .../data/entity/card/SpellAndTrapCards.java | 18 ++ .../yugioh/data/entity/card/SpellCard.java | 57 +++++ .../yugioh/data/entity/card/TrapCard.java | 57 +++++ .../{domain/card => data}/enu/Attribute.java | 2 +- .../card => data}/enu/MonsterType.java | 2 +- .../{domain/card => data}/enu/Phase.java | 5 +- .../java/tw/gaas/yugioh/data/enu/Side.java | 9 + .../{domain/card => data}/enu/SpellType.java | 2 +- .../java/tw/gaas/yugioh/data/enu/State.java | 9 + .../{domain/card => data}/enu/TrapType.java | 2 +- .../{domain/card => data}/enu/Type.java | 2 +- .../java/tw/gaas/yugioh/domain/card/Card.java | 22 -- .../gaas/yugioh/domain/card/MonsterCard.java | 69 ----- .../tw/gaas/yugioh/domain/card/SpellCard.java | 52 ---- .../tw/gaas/yugioh/domain/card/TrapCard.java | 52 ---- .../domain/dto/SpellAndTrapCardsDto.java | 17 -- .../tw/gaas/yugioh/domain/field/Cards.java | 15 -- .../tw/gaas/yugioh/domain/field/Deck.java | 24 -- .../gaas/yugioh/domain/field/DuelField.java | 48 ---- .../tw/gaas/yugioh/domain/field/Duelist.java | 24 -- .../yugioh/domain/field/GraveYardCards.java | 25 -- .../gaas/yugioh/domain/field/HandCards.java | 14 - .../yugioh/domain/field/MonsterCards.java | 24 -- .../domain/field/SpellAndTrapCards.java | 24 -- .../tw/gaas/yugioh/domain/field/Zone.java | 30 --- .../tw/gaas/yugioh/manager/GameManager.java | 68 +---- .../gaas/yugioh/manager/NetworkManager.java | 64 +++++ .../java/tw/gaas/yugioh/web/Controller.java | 58 ----- .../yugioh/web/controller/AuthController.java | 49 ++++ .../web/controller/DuelFieldController.java | 198 +++++++++++++++ .../yugioh/web/security/JwtTokenFilter.java | 42 +++ .../yugioh/web/security/JwtTokenService.java | 37 +++ .../security/LoginRequestDto.java} | 10 +- .../web/security/SpringControllerAdvice.java | 38 +++ .../web/security/SpringSecurityConfig.java | 64 +++++ .../security/SpringUserDetailsService.java | 37 +++ .../security/exception/DuelFieldNotFound.java | 8 + .../exception/NotCardInMonsterCards.java | 8 + .../security/exception/NotDuelistInZone.java | 8 + .../exception/NotMonsterCardInHand.java | 8 + .../exception/NotSpellCardInHand.java | 8 + .../security/exception/NotTrapCardInHand.java | 8 + .../web/security/exception/WrongPhase.java | 8 + .../tw/gaas/yugioh/domain/card/KCard.kt | 10 +- .../tw/gaas/yugioh/domain/field/KDuelField.kt | 2 +- .../kotlin/tw/gaas/yugioh/web/KController.kt | 2 +- 67 files changed, 1895 insertions(+), 608 deletions(-) delete mode 100644 yugioh-20221012/http/Test.http create mode 100644 yugioh-20221012/http/test-java.http create mode 100644 yugioh-20221012/http/test-kotlin.http rename yugioh-20221012/src/main/java/tw/gaas/yugioh/{domain => data}/dto/CardDto.java (60%) rename yugioh-20221012/src/main/java/tw/gaas/yugioh/{domain/dto/GraveYardCardsDto.java => data/dto/CardReqDto.java} (51%) rename yugioh-20221012/src/main/java/tw/gaas/yugioh/{domain/dto/DeckDto.java => data/dto/CardsDto.java} (79%) rename yugioh-20221012/src/main/java/tw/gaas/yugioh/{domain => data}/dto/DuelFieldDto.java (69%) rename yugioh-20221012/src/main/java/tw/gaas/yugioh/{domain => data}/dto/DuelistDto.java (77%) rename yugioh-20221012/src/main/java/tw/gaas/yugioh/{domain => data}/dto/ZoneDto.java (53%) create mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/DuelField.java create mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/Duelist.java create mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/Zone.java create mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/Card.java create mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/Cards.java create mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/Deck.java create mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/GraveYardCards.java create mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/HandCards.java create mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/MonsterCard.java create mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/MonsterCards.java create mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/SpellAndTrapCards.java create mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/SpellCard.java create mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/TrapCard.java rename yugioh-20221012/src/main/java/tw/gaas/yugioh/{domain/card => data}/enu/Attribute.java (81%) rename yugioh-20221012/src/main/java/tw/gaas/yugioh/{domain/card => data}/enu/MonsterType.java (94%) rename yugioh-20221012/src/main/java/tw/gaas/yugioh/{domain/card => data}/enu/Phase.java (85%) create mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/data/enu/Side.java rename yugioh-20221012/src/main/java/tw/gaas/yugioh/{domain/card => data}/enu/SpellType.java (82%) create mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/data/enu/State.java rename yugioh-20221012/src/main/java/tw/gaas/yugioh/{domain/card => data}/enu/TrapType.java (73%) rename yugioh-20221012/src/main/java/tw/gaas/yugioh/{domain/card => data}/enu/Type.java (71%) delete mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/card/Card.java delete mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/card/MonsterCard.java delete mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/card/SpellCard.java delete mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/card/TrapCard.java delete mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/dto/SpellAndTrapCardsDto.java delete mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/field/Cards.java delete mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/field/Deck.java delete mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/field/DuelField.java delete mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/field/Duelist.java delete mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/field/GraveYardCards.java delete mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/field/HandCards.java delete mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/field/MonsterCards.java delete mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/field/SpellAndTrapCards.java delete mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/field/Zone.java create mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/manager/NetworkManager.java delete mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/web/Controller.java create mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/web/controller/AuthController.java create mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/web/controller/DuelFieldController.java create mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/JwtTokenFilter.java create mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/JwtTokenService.java rename yugioh-20221012/src/main/java/tw/gaas/yugioh/{domain/dto/MonsterCardsDto.java => web/security/LoginRequestDto.java} (57%) create mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/SpringControllerAdvice.java create mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/SpringSecurityConfig.java create mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/SpringUserDetailsService.java create mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/exception/DuelFieldNotFound.java create mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/exception/NotCardInMonsterCards.java create mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/exception/NotDuelistInZone.java create mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/exception/NotMonsterCardInHand.java create mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/exception/NotSpellCardInHand.java create mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/exception/NotTrapCardInHand.java create mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/exception/WrongPhase.java diff --git a/README.md b/README.md index 93b52e3..ce45886 100644 --- a/README.md +++ b/README.md @@ -37,3 +37,5 @@ 2. 忘記了，大家下次記得提醒偶 3. [遊戲王第三次開會](https://youtu.be/HZFNxIcTyQM) 4. [遊戲王第四次開會](https://youtu.be/yCsG4E655xU) +5. [遊戲王第五次開會](https://youtu.be/F6Cfz6IpBgo) + diff --git a/yugioh-20221012/build.gradle.kts b/yugioh-20221012/build.gradle.kts index 1822c78..7f76eff 100644 --- a/yugioh-20221012/build.gradle.kts +++ b/yugioh-20221012/build.gradle.kts @@ -26,10 +26,14 @@ repositories { } dependencies { - implementation("com.github.PureFuncInc:emoji-jvm-string:1.5.1") + implementation("com.github.PureFuncInc:emoji-jvm-string:1.6.1") + + implementation("io.jsonwebtoken:jjwt-impl:0.11.2") + implementation("io.jsonwebtoken:jjwt-jackson:0.11.2") implementation("org.springframework.boot:spring-boot-starter-data-jpa") implementation("org.springframework.boot:spring-boot-starter-data-redis") + implementation("org.springframework.boot:spring-boot-starter-security") implementation("org.springframework.boot:spring-boot-starter-web") implementation("com.fasterxml.jackson.module:jackson-module-kotlin") implementation("org.jetbrains.kotlin:kotlin-reflect") @@ -39,6 +43,7 @@ dependencies { runtimeOnly("org.postgresql:postgresql") annotationProcessor("org.projectlombok:lombok") testImplementation("org.springframework.boot:spring-boot-starter-test") + testImplementation("org.springframework.security:spring-security-test") } tasks.withType { diff --git a/yugioh-20221012/http/Test.http b/yugioh-20221012/http/Test.http deleted file mode 100644 index 3908a00..0000000 --- a/yugioh-20221012/http/Test.http +++ /dev/null @@ -1,11 +0,0 @@ -### Java status endpoint -GET http://localhost:8080/java/api/v1.0/status - -### Kotlin status endpoint -GET http://localhost:8080/kotlin/api/v1.0/status - -### Join Games -POST http://localhost:8080/java/api/v1.0/games/vvv1 - -### Join Games -POST http://localhost:8080/java/api/v1.0/games/vvv2 \ No newline at end of file diff --git a/yugioh-20221012/http/test-java.http b/yugioh-20221012/http/test-java.http new file mode 100644 index 0000000..76fab5c --- /dev/null +++ b/yugioh-20221012/http/test-java.http @@ -0,0 +1,160 @@ +### Java status endpoint +GET http://localhost:8080/java/api/v1.0/status + +> {% +client.test("Request executed successfully", function() { + client.log(client.global.get("bearerTokenV").toString()); + client.log(client.global.get("bearerTokenQ").toString()); + client.log(client.global.get("bearerTokenM").toString()); + client.log(client.global.get("uuid").toString()); + client.assert(response.status === 200, "Response status is not 200"); +}); +%} + + +### Vincent Login +POST http://localhost:8080/java/api/v1.0/auth:login +Content-Type: application/json + +{ + "username": "vincent", + "password": "123456" +} + +> {% client.global.set("bearerTokenV", response.headers.valueOf("Authorization")); %} + + +### qrtt1 Login +POST http://localhost:8080/java/api/v1.0/auth:login +Content-Type: application/json + +{ + "username": "qrtt1", + "password": "123456" +} + +> {% client.global.set("bearerTokenQ", response.headers.valueOf("Authorization")); %} + + +### Musk Login +POST http://localhost:8080/java/api/v1.0/auth:login +Content-Type: application/json + +{ + "username": "musk", + "password": "123456" +} + +> {% client.global.set("bearerTokenM", response.headers.valueOf("Authorization")); %} + + +### Vincent Join Games +POST http://localhost:8080/java/api/v1.0/duelField:join +Authorization: Bearer {{bearerTokenV}} + +> {% client.global.set("uuid", response.body.duelFieldUuid.toString()); %} + + +### qrtt1 Join Games +POST http://localhost:8080/java/api/v1.0/duelField:join +Authorization: Bearer {{bearerTokenQ}} + + +### Vincent Get DuelField By Uuid (Duelist) +GET http://localhost:8080/java/api/v1.0/duelField/{{uuid}} +Authorization: Bearer {{bearerTokenV}} + + +### Musk Get DuelField By Uuid +GET http://localhost:8080/java/api/v1.0/duelField/{{uuid}} +Authorization: Bearer {{bearerTokenM}} + + +### Vincent Draw Card +POST http://localhost:8080/java/api/v1.0/duelField/{{uuid}}/LEFT:drawCard +Authorization: Bearer {{bearerTokenV}} + + +### Vincent Summon Monster +POST http://localhost:8080/java/api/v1.0/duelField/{{uuid}}/LEFT:summonMonster +Authorization: Bearer {{bearerTokenV}} +Content-Type: application/json + +{ + "uuid": "d0f01132-9ad7-4e5c-bae1-a067e18fbbf9" +} + + +### Vincent Apply Spell +POST http://localhost:8080/java/api/v1.0/duelField/{{uuid}}/LEFT:applySpell?skip=true +Authorization: Bearer {{bearerTokenV}} +Content-Type: application/json + +{ + "uuid": "860481ab-1cdd-4539-8910-b5c80b92a2e6" +} + + +### Vincent Cover Trap +POST http://localhost:8080/java/api/v1.0/duelField/{{uuid}}/LEFT:coverTrap +Authorization: Bearer {{bearerTokenV}} +Content-Type: application/json + +{ + "uuid": "99dff81d-a922-4346-b806-6339304c3c61", + "state": "BACK" +} + +### Vincent Start Battle +POST http://localhost:8080/java/api/v1.0/duelField/{{uuid}}/LEFT:startBattle +Authorization: Bearer {{bearerTokenV}} +Content-Type: application/json + +{ + "uuid": "5ba31681-6ce6-4805-9dd7-98c778dd63b8" +} + + +### qrtt1 Draw Card +POST http://localhost:8080/java/api/v1.0/duelField/{{uuid}}/RIGHT:drawCard +Authorization: Bearer {{bearerTokenQ}} + + +### qrtt1 Summon Monster +POST http://localhost:8080/java/api/v1.0/duelField/{{uuid}}/RIGHT:summonMonster +Authorization: Bearer {{bearerTokenQ}} +Content-Type: application/json + +{ + "uuid": "65178d75-ba3a-4f3f-806e-318b6b2a72ac" +} + + +### qrtt1 Apply Spell +POST http://localhost:8080/java/api/v1.0/duelField/{{uuid}}/RIGHT:applySpell +Authorization: Bearer {{bearerTokenQ}} +Content-Type: application/json + +{ + "uuid": "94ab5d8d-a763-459e-88d2-c5e8e44a7a51" +} + + +### qrtt1 Cover Trap +POST http://localhost:8080/java/api/v1.0/duelField/{{uuid}}/RIGHT:coverTrap +Authorization: Bearer {{bearerTokenQ}} +Content-Type: application/json + +{ + "uuid": "86d54dda-777f-4243-b842-dfa430f5a535", + "state": "BACK" +} + +### qrtt1 Start Battle +POST http://localhost:8080/java/api/v1.0/duelField/{{uuid}}/RIGHT:startBattle?skip=true +Authorization: Bearer {{bearerTokenQ}} +Content-Type: application/json + +{ + "uuid": "9c67000f-feac-4024-ad7a-632ac89d9fa0" +} diff --git a/yugioh-20221012/http/test-kotlin.http b/yugioh-20221012/http/test-kotlin.http new file mode 100644 index 0000000..ad00b03 --- /dev/null +++ b/yugioh-20221012/http/test-kotlin.http @@ -0,0 +1,160 @@ +### Kotlin status endpoint +GET http://localhost:8080/kotlin/api/v1.0/status + +> {% +client.test("Request executed successfully", function() { + client.log(client.global.get("bearerTokenV").toString()); + client.log(client.global.get("bearerTokenQ").toString()); + client.log(client.global.get("bearerTokenM").toString()); + client.log(client.global.get("uuid").toString()); + client.assert(response.status === 200, "Response status is not 200"); +}); +%} + + +### Vincent Login +POST http://localhost:8080/java/api/v1.0/auth:login +Content-Type: application/json + +{ + "username": "vincent", + "password": "123456" +} + +> {% client.global.set("bearerTokenV", response.headers.valueOf("Authorization")); %} + + +### qrtt1 Login +POST http://localhost:8080/java/api/v1.0/auth:login +Content-Type: application/json + +{ + "username": "qrtt1", + "password": "123456" +} + +> {% client.global.set("bearerTokenQ", response.headers.valueOf("Authorization")); %} + + +### Musk Login +POST http://localhost:8080/java/api/v1.0/auth:login +Content-Type: application/json + +{ + "username": "musk", + "password": "123456" +} + +> {% client.global.set("bearerTokenM", response.headers.valueOf("Authorization")); %} + + +### Vincent Join Games +POST http://localhost:8080/java/api/v1.0/duelField:join +Authorization: Bearer {{bearerTokenV}} + +> {% client.global.set("uuid", response.body.duelFieldUuid.toString()); %} + + +### qrtt1 Join Games +POST http://localhost:8080/java/api/v1.0/duelField:join +Authorization: Bearer {{bearerTokenQ}} + + +### Vincent Get DuelField By Uuid (Duelist) +GET http://localhost:8080/java/api/v1.0/duelField/{{uuid}} +Authorization: Bearer {{bearerTokenV}} + + +### Musk Get DuelField By Uuid +GET http://localhost:8080/java/api/v1.0/duelField/{{uuid}} +Authorization: Bearer {{bearerTokenM}} + + +### Vincent Draw Card +POST http://localhost:8080/java/api/v1.0/duelField/{{uuid}}/left:drawCard +Authorization: Bearer {{bearerTokenV}} + + +### Vincent Summon Monster +POST http://localhost:8080/java/api/v1.0/duelField/{{uuid}}/left:summonMonster +Authorization: Bearer {{bearerTokenV}} +Content-Type: application/json + +{ + "uuid": "cf889eb6-01bc-4ff7-b4da-f1e3040e7efb" +} + + +### Vincent Apply Spell +POST http://localhost:8080/java/api/v1.0/duelField/{{uuid}}/left:applySpell +Authorization: Bearer {{bearerTokenV}} +Content-Type: application/json + +{ + "uuid": "f438be30-39db-4a95-9b9a-fb5939731650" +} + + +### Vincent Cover Trap +POST http://localhost:8080/java/api/v1.0/duelField/{{uuid}}/left:coverTrap +Authorization: Bearer {{bearerTokenV}} +Content-Type: application/json + +{ + "uuid": "4dc4120a-a8c4-4dec-b2e3-3f5c5b138a1d", + "state": "BACK" +} + +### Vincent Start Battle +POST http://localhost:8080/java/api/v1.0/duelField/{{uuid}}/left:startBattle +Authorization: Bearer {{bearerTokenV}} +Content-Type: application/json + +{ + "uuid": "" +} + + +### qrtt1 Draw Card +POST http://localhost:8080/java/api/v1.0/duelField/{{uuid}}/right:drawCard +Authorization: Bearer {{bearerTokenQ}} + + +### qrtt1 Summon Monster +POST http://localhost:8080/java/api/v1.0/duelField/{{uuid}}/right:summonMonster +Authorization: Bearer {{bearerTokenQ}} +Content-Type: application/json + +{ + "uuid": "" +} + + +### qrtt1 Apply Spell +POST http://localhost:8080/java/api/v1.0/duelField/{{uuid}}/right:applySpell +Authorization: Bearer {{bearerTokenQ}} +Content-Type: application/json + +{ + "uuid": "" +} + + +### qrtt1 Cover Trap +POST http://localhost:8080/java/api/v1.0/duelField/{{uuid}}/right:coverTrap +Authorization: Bearer {{bearerTokenQ}} +Content-Type: application/json + +{ + "uuid": "", + "state": "BACK" +} + +### qrtt1 Start Battle +POST http://localhost:8080/java/api/v1.0/duelField/{{uuid}}/right:startBattle +Authorization: Bearer {{bearerTokenQ}} +Content-Type: application/json + +{ + "uuid": "" +} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/dto/CardDto.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/dto/CardDto.java similarity index 60% rename from yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/dto/CardDto.java rename to yugioh-20221012/src/main/java/tw/gaas/yugioh/data/dto/CardDto.java index 6fb778c..3a158ee 100644 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/dto/CardDto.java +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/dto/CardDto.java @@ -1,14 +1,15 @@ -package tw.gaas.yugioh.domain.dto; +package tw.gaas.yugioh.data.dto; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import tw.gaas.yugioh.domain.card.enu.Attribute; -import tw.gaas.yugioh.domain.card.enu.MonsterType; -import tw.gaas.yugioh.domain.card.enu.SpellType; -import tw.gaas.yugioh.domain.card.enu.TrapType; -import tw.gaas.yugioh.domain.card.enu.Type; +import tw.gaas.yugioh.data.enu.Attribute; +import tw.gaas.yugioh.data.enu.MonsterType; +import tw.gaas.yugioh.data.enu.SpellType; +import tw.gaas.yugioh.data.enu.State; +import tw.gaas.yugioh.data.enu.TrapType; +import tw.gaas.yugioh.data.enu.Type; @Builder @Data @@ -16,6 +17,10 @@ @AllArgsConstructor public class CardDto { + private String uuid; + + private State state; + private String name; private Type type; diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/dto/GraveYardCardsDto.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/dto/CardReqDto.java similarity index 51% rename from yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/dto/GraveYardCardsDto.java rename to yugioh-20221012/src/main/java/tw/gaas/yugioh/data/dto/CardReqDto.java index 6e1b563..944e065 100644 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/dto/GraveYardCardsDto.java +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/dto/CardReqDto.java @@ -1,17 +1,18 @@ -package tw.gaas.yugioh.domain.dto; +package tw.gaas.yugioh.data.dto; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; - -import java.util.List; +import tw.gaas.yugioh.data.enu.State; @Builder @Data @NoArgsConstructor @AllArgsConstructor -public class GraveYardCardsDto { +public class CardReqDto { + + private String uuid; - private List elements; + private State state = State.FRONT; } diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/dto/DeckDto.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/dto/CardsDto.java similarity index 79% rename from yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/dto/DeckDto.java rename to yugioh-20221012/src/main/java/tw/gaas/yugioh/data/dto/CardsDto.java index de2068c..cff307f 100644 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/dto/DeckDto.java +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/dto/CardsDto.java @@ -1,4 +1,4 @@ -package tw.gaas.yugioh.domain.dto; +package tw.gaas.yugioh.data.dto; import lombok.AllArgsConstructor; import lombok.Builder; @@ -11,7 +11,7 @@ @Data @NoArgsConstructor @AllArgsConstructor -public class DeckDto { +public class CardsDto { private List elements; } diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/dto/DuelFieldDto.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/dto/DuelFieldDto.java similarity index 69% rename from yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/dto/DuelFieldDto.java rename to yugioh-20221012/src/main/java/tw/gaas/yugioh/data/dto/DuelFieldDto.java index b590f03..8141f57 100644 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/dto/DuelFieldDto.java +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/dto/DuelFieldDto.java @@ -1,10 +1,12 @@ -package tw.gaas.yugioh.domain.dto; +package tw.gaas.yugioh.data.dto; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import tw.gaas.yugioh.domain.card.enu.Phase; +import tw.gaas.yugioh.data.enu.Phase; + +import java.util.List; @Builder @Data @@ -12,6 +14,8 @@ @AllArgsConstructor public class DuelFieldDto { + private List boardMessages; + private String uuid; private ZoneDto left; diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/dto/DuelistDto.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/dto/DuelistDto.java similarity index 77% rename from yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/dto/DuelistDto.java rename to yugioh-20221012/src/main/java/tw/gaas/yugioh/data/dto/DuelistDto.java index ae946ed..9cc4e7b 100644 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/dto/DuelistDto.java +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/dto/DuelistDto.java @@ -1,4 +1,4 @@ -package tw.gaas.yugioh.domain.dto; +package tw.gaas.yugioh.data.dto; import lombok.AllArgsConstructor; import lombok.Builder; @@ -15,5 +15,5 @@ public class DuelistDto { private Integer lp; - private Integer handCardsAmount; + private CardsDto handCards; } diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/dto/ZoneDto.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/dto/ZoneDto.java similarity index 53% rename from yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/dto/ZoneDto.java rename to yugioh-20221012/src/main/java/tw/gaas/yugioh/data/dto/ZoneDto.java index a901ae4..68f8cd0 100644 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/dto/ZoneDto.java +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/dto/ZoneDto.java @@ -1,4 +1,4 @@ -package tw.gaas.yugioh.domain.dto; +package tw.gaas.yugioh.data.dto; import lombok.AllArgsConstructor; import lombok.Builder; @@ -13,11 +13,11 @@ public class ZoneDto { private DuelistDto duelist; - private MonsterCardsDto monsterCards; + private CardsDto monsterCards; - private SpellAndTrapCardsDto spellAndTrapCards; + private CardsDto spellAndTrapCards; - private GraveYardCardsDto graveYardCards; + private CardsDto graveYardCards; - private DeckDto deck; + private CardsDto deck; } diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/DuelField.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/DuelField.java new file mode 100644 index 0000000..d857768 --- /dev/null +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/DuelField.java @@ -0,0 +1,240 @@ +package tw.gaas.yugioh.data.entity; + +import lombok.ToString; +import net.purefunc.emoji.Emoji0; +import net.purefunc.emoji.Emoji2; +import net.purefunc.emoji.Emoji3; +import tw.gaas.yugioh.data.dto.DuelFieldDto; +import tw.gaas.yugioh.data.dto.ZoneDto; +import tw.gaas.yugioh.data.enu.Phase; +import tw.gaas.yugioh.data.enu.Side; +import tw.gaas.yugioh.data.enu.State; +import tw.gaas.yugioh.web.security.exception.NotCardInMonsterCards; +import tw.gaas.yugioh.web.security.exception.NotDuelistInZone; +import tw.gaas.yugioh.web.security.exception.NotMonsterCardInHand; +import tw.gaas.yugioh.web.security.exception.NotSpellCardInHand; +import tw.gaas.yugioh.web.security.exception.NotTrapCardInHand; +import tw.gaas.yugioh.web.security.exception.WrongPhase; + +import java.util.LinkedList; +import java.util.List; + +@ToString +public class DuelField { + + private List boardMessages = new LinkedList<>(); + // UUID + private String uuid; + // 左邊場地 + private Zone left; + // 右邊場地 + private Zone right; + // 階段 + private Phase phase; + private Boolean firstRound = true; + + public DuelField(String uuid) { + this.uuid = uuid; + boardMessages.add(String.format("%s DuelField %s Init", Emoji2.TROPHY, uuid)); + } + + public void setLeft(Zone left) { + this.left = left; + boardMessages.add(String.format("%s Left Duelist %s Entered", Emoji2.MILITARY_MEDAL, left.getDuelist().getName())); + } + + public void setRight(Zone zone) { + this.right = zone; + boardMessages.add(String.format("%s Right Duelist %s Entered", Emoji2.MILITARY_MEDAL, left.getDuelist().getName())); + } + + public void waitDuelist() { + this.phase = Phase.INIT; + } + + public void start() { + left.setup(); + right.setup(); + this.phase = Phase.LEFT_DRAW; + boardMessages.add(String.format("%s Game Start. Waiting for %s Draw", Emoji3.TRIANGULAR_FLAG, left.getDuelist().getName())); + } + + public void validPhase(Phase phase) { + if (this.phase != phase) throw new WrongPhase(this.phase.name() + " != " + phase.name()); + } + + public void validDuelist(Side side, String username) { + if (side == Side.LEFT) { + if (!left.validIsDuelist(username)) throw new NotDuelistInZone(username); + } else { + if (!right.validIsDuelist(username)) throw new NotDuelistInZone(username); + } + } + + public void duelistDraw(Side side) { + if (side == Side.LEFT) { + left.duelistDraw(); + this.phase = Phase.LEFT_MONSTER; + boardMessages.add(String.format("%s Finished Draw. Waiting for %s Summon Monster", Emoji0.RAISED_BACK_OF_HAND, left.getDuelist().getName())); + } else { + right.duelistDraw(); + this.phase = Phase.RIGHT_MONSTER; + boardMessages.add(String.format("%s Finished Draw. Waiting for %s Summon Monster", Emoji0.RAISED_BACK_OF_HAND, right.getDuelist().getName())); + } + } + + public void duelistSkipSummonMonster(Side side) { + if (side == Side.LEFT) { + this.phase = Phase.LEFT_SPELL; + boardMessages.add(String.format("%s Skip Summon Monster. Waiting for %s Apply Spell", Emoji0.OGRE, left.getDuelist().getName())); + } else { + this.phase = Phase.RIGHT_SPELL; + boardMessages.add(String.format("%s Skip Summon Monster. Waiting for %s Apply Spell", Emoji0.OGRE, right.getDuelist().getName())); + } + } + + public void validDuelistSummonMonster(Side side, String uuid) { + if (side == Side.LEFT) { + if (!left.validIsDuelistMonsterHandCard(uuid)) + throw new NotMonsterCardInHand("Not Monster in Hand " + uuid); + } else { + if (!right.validIsDuelistMonsterHandCard(uuid)) + throw new NotMonsterCardInHand("Not Monster in Hand " + uuid); + } + } + + public void duelistSummonMonster(Side side, String uuid, State state) { + if (side == Side.LEFT) { + left.duelistSummonMonster(uuid, state); + this.phase = Phase.LEFT_SPELL; + boardMessages.add(String.format("%s Finished Summon Monster. Waiting for %s Apply Spell", Emoji0.OGRE, left.getDuelist().getName())); + } else { + right.duelistSummonMonster(uuid, state); + this.phase = Phase.RIGHT_SPELL; + boardMessages.add(String.format("%s Finished Summon Monster. Waiting for %s Apply Spell", Emoji0.OGRE, right.getDuelist().getName())); + } + } + + public void duelistSkipApplySpell(Side side) { + if (side == Side.LEFT) { + this.phase = Phase.LEFT_TRAP; + boardMessages.add(String.format("%s Skip Apply Spell. Waiting for %s Cover Trap", Emoji0.DIZZY, left.getDuelist().getName())); + } else { + this.phase = Phase.RIGHT_TRAP; + boardMessages.add(String.format("%s Skip Apply Spell. Waiting for %s Cover Trap", Emoji0.DIZZY, right.getDuelist().getName())); + } + } + + public void validDuelistApplySpell(Side side, String uuid) { + if (side == Side.LEFT) { + if (!left.validIsDuelistSpellHandCard(uuid)) throw new NotSpellCardInHand("Not Spell in Hand " + uuid); + } else { + if (!right.validIsDuelistSpellHandCard(uuid)) throw new NotSpellCardInHand("Not Spell in Hand " + uuid); + } + } + + public void duelistApplySpell(Side side, String uuid) { + if (side == Side.LEFT) { + left.duelistApplySpell(uuid); + this.phase = Phase.LEFT_TRAP; + boardMessages.add(String.format("%s Finished Apply Spell. Waiting for %s Cover Trap", Emoji0.DIZZY, left.getDuelist().getName())); + } else { + right.duelistApplySpell(uuid); + this.phase = Phase.RIGHT_TRAP; + boardMessages.add(String.format("%s Finished Apply Spell. Waiting for %s Cover Trap", Emoji0.DIZZY, right.getDuelist().getName())); + } + } + + public void duelistSkipCoverTrap(Side side) { + if (side == Side.LEFT) { + this.phase = Phase.LEFT_BATTLE; + boardMessages.add(String.format("%s Skip Cover Trap. Waiting for %s Battle", Emoji3.WHITE_LARGE_SQUARE, left.getDuelist().getName())); + } else { + this.phase = Phase.RIGHT_BATTLE; + boardMessages.add(String.format("%s Skip Cover Trap. Waiting for %s Battle", Emoji3.WHITE_LARGE_SQUARE, right.getDuelist().getName())); + } + } + + public void validDuelistCoverTrap(Side side, String uuid) { + if (side == Side.LEFT) { + if (!left.validIsDuelistTrapHandCard(uuid)) throw new NotTrapCardInHand("Not Trap in Hand " + uuid); + } else { + if (!right.validIsDuelistTrapHandCard(uuid)) throw new NotTrapCardInHand("Not Trap in Hand " + uuid); + } + } + + public void duelistCoverTrap(Side side, String uuid, State state) { + if (side == Side.LEFT) { + left.duelistCoverTrap(uuid, state); + this.phase = Phase.LEFT_BATTLE; + boardMessages.add(String.format("%s Finished Cover Trap. Waiting for %s Battle", Emoji3.WHITE_LARGE_SQUARE, left.getDuelist().getName())); + } else { + right.duelistCoverTrap(uuid, state); + this.phase = Phase.RIGHT_BATTLE; + boardMessages.add(String.format("%s Finished Cover Trap. Waiting for %s Battle", Emoji3.WHITE_LARGE_SQUARE, right.getDuelist().getName())); + } + } + + public void duelistSkipStartBattle(Side side) { + if (side == Side.LEFT) { + this.phase = Phase.RIGHT_DRAW; + boardMessages.add(String.format("%s Skip Battle. Switch to %s", Emoji3.TRIDENT_EMBLEM, right.getDuelist().getName())); + } else { + this.phase = Phase.LEFT_DRAW; + boardMessages.add(String.format("%s Skip Battle. Switch to %s", Emoji3.TRIDENT_EMBLEM, left.getDuelist().getName())); + } + } + + public void skipFirstRoundBattle() { + if (firstRound) { + this.firstRound = false; + this.phase = Phase.RIGHT_DRAW; + boardMessages.add(String.format("%s Skip First Round Battle. Switch to %s", Emoji3.TRIDENT_EMBLEM, right.getDuelist().getName())); + } + } + + public void validDuelistStartBattle(Side side, String uuid) { + if (side == Side.LEFT) { + if (!left.validIsDuelistMonsterCard(uuid)) throw new NotCardInMonsterCards(uuid); + } else { + if (!right.validIsDuelistMonsterCard(uuid)) throw new NotCardInMonsterCards(uuid); + } + } + + public void duelistStartBattle(Side side, String uuid) { + if (side == Side.LEFT) { + left.duelistStartBattle(uuid, right); + this.phase = Phase.RIGHT_DRAW; + boardMessages.add(String.format("%s Finished Battle. Switch to %s", Emoji3.TRIDENT_EMBLEM, right.getDuelist().getName())); + } else { + right.duelistStartBattle(uuid, left); + this.phase = Phase.LEFT_DRAW; + boardMessages.add(String.format("%s Finished Battle. Switch to %s", Emoji3.TRIDENT_EMBLEM, left.getDuelist().getName())); + } + } + + public Boolean checkIsDuelist(Side side, String username) { + return side == Side.LEFT ? left.validIsDuelist(username) : right.validIsDuelist(username); + } + + public DuelFieldDto toDto(Boolean isLeftDuelist, Boolean isRightDuelist) { + ZoneDto leftDto = null; + if (left != null) { + leftDto = left.toDto(isLeftDuelist); + } + + ZoneDto rightDto = null; + if (right != null) { + rightDto = right.toDto(isRightDuelist); + } + + return DuelFieldDto + .builder() + .boardMessages(boardMessages) + .uuid(uuid) + .left(leftDto) + .right(rightDto) + .phase(phase) + .build(); + } +} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/Duelist.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/Duelist.java new file mode 100644 index 0000000..8b462b4 --- /dev/null +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/Duelist.java @@ -0,0 +1,78 @@ +package tw.gaas.yugioh.data.entity; + +import lombok.ToString; +import tw.gaas.yugioh.data.dto.DuelistDto; +import tw.gaas.yugioh.data.entity.card.Card; +import tw.gaas.yugioh.data.entity.card.HandCards; + +import java.util.Arrays; + +@ToString +public class Duelist { + + // 名稱 + private String name; + // 生命值 + private Integer lp; + // 手牌 + private HandCards handCards; + + public Duelist(String name) { + this.name = name; + this.lp = 0; + this.handCards = new HandCards(); + } + + public String getName() { + return name; + } + + public void initLp() { + this.lp = 4000; + } + + public void drawCards(Card... draw) { + Arrays.stream(draw).forEach(v -> handCards.draw(v)); + } + + public boolean validIsDuelist(String username) { + return this.name.equals(username); + } + + public boolean validIsDuelistMonsterHandCard(String uuid) { + return handCards.containsThisMonsterCard(uuid); + } + + public Card summonMonster(String uuid) { + return handCards.submit(uuid); + } + + public boolean validIsDuelistSpellHandCard(String uuid) { + return handCards.containsThisSpellCard(uuid); + } + + public Card applySpell(String uuid) { + return handCards.submit(uuid); + } + + public boolean validIsDuelistTrapHandCard(String uuid) { + return handCards.containsThisTrapCard(uuid); + } + + public Card coverTrap(String uuid) { + return handCards.submit(uuid); + } + + public void updateScore(Integer scoreDelta) { + this.lp = this.lp - scoreDelta; + } + + public DuelistDto toDto(Boolean isDuelist) { + return DuelistDto + .builder() + .name(name) + .lp(lp) + .handCards(handCards.toDto(isDuelist)) + .build(); + } +} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/Zone.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/Zone.java new file mode 100644 index 0000000..c09b197 --- /dev/null +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/Zone.java @@ -0,0 +1,118 @@ +package tw.gaas.yugioh.data.entity; + +import lombok.ToString; +import tw.gaas.yugioh.data.dto.ZoneDto; +import tw.gaas.yugioh.data.entity.card.Card; +import tw.gaas.yugioh.data.entity.card.Deck; +import tw.gaas.yugioh.data.entity.card.GraveYardCards; +import tw.gaas.yugioh.data.entity.card.MonsterCard; +import tw.gaas.yugioh.data.entity.card.MonsterCards; +import tw.gaas.yugioh.data.entity.card.SpellAndTrapCards; +import tw.gaas.yugioh.data.enu.State; + +@ToString +public class Zone { + + // 玩家 + private final Duelist duelist; + // 主要怪獸區 + private final MonsterCards monsterCards; + // 魔法陷阱區 + private final SpellAndTrapCards spellAndTrapCards; + // 墓地 + private final GraveYardCards graveYardCards; + // 牌堆 + private final Deck deck; + + public Zone(Duelist duelist) { + this.duelist = duelist; + this.monsterCards = new MonsterCards(); + this.spellAndTrapCards = new SpellAndTrapCards(); + this.graveYardCards = new GraveYardCards(); + this.deck = new Deck(); + } + + public Duelist getDuelist() { + return duelist; + } + + public void setup() { + duelist.initLp(); + deck.shuffling(); + duelist.drawCards(deck.draw(), deck.draw(), deck.draw(), deck.draw(), deck.draw(), deck.draw()); + } + + public boolean validIsDuelist(String username) { + return duelist.validIsDuelist(username); + } + + public void duelistDraw() { + duelist.drawCards(deck.draw()); + } + + public boolean validIsDuelistMonsterHandCard(String uuid) { + return duelist.validIsDuelistMonsterHandCard(uuid); + } + + public void duelistSummonMonster(String uuid, State state) { + Card card = duelist.summonMonster(uuid); + monsterCards.summon(card, state); + } + + public boolean validIsDuelistSpellHandCard(String uuid) { + return duelist.validIsDuelistSpellHandCard(uuid); + } + + public void duelistApplySpell(String uuid) { + Card card = duelist.applySpell(uuid); + + // TODO: apply effect + } + + public boolean validIsDuelistTrapHandCard(String uuid) { + return duelist.validIsDuelistTrapHandCard(uuid); + } + + public void duelistCoverTrap(String uuid, State state) { + final Card card = duelist.coverTrap(uuid); + spellAndTrapCards.cover(card, state); + } + + public boolean validIsDuelistMonsterCard(String uuid) { + return monsterCards.validIsDuelistMonsterCard(uuid); + } + + public void duelistStartBattle(String uuid, Zone zone) { + final MonsterCard monsterCard = (MonsterCard) monsterCards.startBattle(uuid); + final MonsterCard target = zone.monsterCards.chooseTarget(); + + final Integer scoreDelta = monsterCard.battle(target); + if (scoreDelta > 0) { + if (null != target) { + zone.monsterCards.moveToGraveYard(target); + zone.graveYardCards.put(target); + } + zone.duelist.updateScore(scoreDelta); + } else if (scoreDelta < 0) { + this.monsterCards.moveToGraveYard(monsterCard); + this.graveYardCards.put(monsterCard); + duelist.updateScore(scoreDelta); + } else { + zone.monsterCards.moveToGraveYard(target); + zone.graveYardCards.put(target); + this.monsterCards.moveToGraveYard(monsterCard); + this.graveYardCards.put(monsterCard); + } + } + + public ZoneDto toDto(Boolean isDuelist) { + return ZoneDto + .builder() + .duelist(duelist.toDto(isDuelist)) + .monsterCards(monsterCards.toDto(null)) + .spellAndTrapCards(spellAndTrapCards.toDto(null)) + .graveYardCards(graveYardCards.toDto(null)) + .deck(deck.toDto(null)) + .build(); + } +} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/Card.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/Card.java new file mode 100644 index 0000000..dd8eec7 --- /dev/null +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/Card.java @@ -0,0 +1,31 @@ +package tw.gaas.yugioh.data.entity.card; + +import lombok.ToString; +import lombok.experimental.SuperBuilder; +import tw.gaas.yugioh.data.dto.CardDto; +import tw.gaas.yugioh.data.enu.State; +import tw.gaas.yugioh.data.enu.Type; + +@SuperBuilder +@ToString +public abstract class Card { + + // UUID + protected String uuid; + // 表示狀態 + protected State state; + // 名稱 + protected String name; + // 類型 + protected Type type; + // 描述 + protected String description; + + public void changeState(State state) { + this.state = state; + } + + public abstract Card copy(); + + public abstract CardDto toDto(Boolean isDuelist); +} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/Cards.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/Cards.java new file mode 100644 index 0000000..b8891e8 --- /dev/null +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/Cards.java @@ -0,0 +1,86 @@ +package tw.gaas.yugioh.data.entity.card; + +import lombok.ToString; +import tw.gaas.yugioh.data.dto.CardsDto; +import tw.gaas.yugioh.data.enu.Attribute; +import tw.gaas.yugioh.data.enu.MonsterType; +import tw.gaas.yugioh.data.enu.SpellType; +import tw.gaas.yugioh.data.enu.State; +import tw.gaas.yugioh.data.enu.TrapType; +import tw.gaas.yugioh.data.enu.Type; + +import java.util.LinkedList; +import java.util.List; +import java.util.stream.Collectors; + +@ToString +public abstract class Cards { + + private static final MonsterCard BlueEyesShiningDragon = + MonsterCard + .builder() + .state(State.BACK) + .name("青眼の白龍") + .type(Type.MONSTER) + .description("高い攻撃力を誇る伝説のドラゴン。どんな相手でも粉砕する、その破壊力は計り知れない。") + .attribute(Attribute.LIGHT) + .monsterType(MonsterType.DRAGON) + .rank(8) + .attack(3000) + .defense(2500) + .build(); + + private static final MonsterCard Dark_Magician = + MonsterCard + .builder() + .state(State.BACK) + .name("ブラック・マジシャン") + .type(Type.MONSTER) + .description("魔法使いとしては、攻撃力・守備力ともに最高クラス。") + .attribute(Attribute.DARK) + .monsterType(MonsterType.SPELLCASTER) + .rank(7) + .attack(2500) + .defense(2100) + .build(); + + private static final SpellCard MONSTER_REBORN = + SpellCard + .builder() + .state(State.BACK) + .name("死者蘇生") + .type(Type.SPELL) + .description("自分または相手の墓地のモンスター１体を対象として発動できる。そのモンスターを自分フィールドに特殊召喚する。") + .spellType(SpellType.NORMAL) + .build(); + + + private static final TrapCard MIRROR_FORCE = + TrapCard + .builder() + .state(State.BACK) + .name("聖なるバリア －ミラーフォース－") + .type(Type.TRAP) + .description("相手モンスターの攻撃宣言時に発動できる。相手フィールドの攻撃表示モンスターを全て破壊する。") + .trapType(TrapType.NORMAL) + .build(); + + protected static final List library = List.of( + BlueEyesShiningDragon, + Dark_Magician, + MONSTER_REBORN, + MIRROR_FORCE + ); + + // 上限 + protected Integer limit; + // 元素 + protected LinkedList elements = new LinkedList<>(); + + public CardsDto toDto(Boolean isDuelist) { + return CardsDto + .builder() + .elements(elements.stream().map(v -> v.toDto(isDuelist)).collect(Collectors.toList())) + .build(); + } +} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/Deck.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/Deck.java new file mode 100644 index 0000000..c4100ee --- /dev/null +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/Deck.java @@ -0,0 +1,26 @@ +package tw.gaas.yugioh.data.entity.card; + +import lombok.ToString; + +import java.security.SecureRandom; +import java.util.Random; + +@ToString(callSuper = true) +public class Deck extends Cards { + + private final Random random = new SecureRandom(); + + public Deck() { + limit = 60; + } + + public void shuffling() { + for (int i = 0; i < 10; i++) { + elements.offer(library.get(random.nextInt(library.size())).copy()); + } + } + + public Card draw() { + return elements.poll(); + } +} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/GraveYardCards.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/GraveYardCards.java new file mode 100644 index 0000000..aeb9794 --- /dev/null +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/GraveYardCards.java @@ -0,0 +1,16 @@ +package tw.gaas.yugioh.data.entity.card; + + +import lombok.ToString; + +@ToString(callSuper = true) +public class GraveYardCards extends Cards { + + public GraveYardCards() { + limit = 99; + } + + public void put(MonsterCard target) { + elements.add(target); + } +} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/HandCards.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/HandCards.java new file mode 100644 index 0000000..ad01ed7 --- /dev/null +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/HandCards.java @@ -0,0 +1,56 @@ +package tw.gaas.yugioh.data.entity.card; + +import lombok.ToString; +import tw.gaas.yugioh.data.enu.Type; + +import java.util.function.Function; +import java.util.stream.Collectors; + +@ToString(callSuper = true) +public class HandCards extends Cards { + + public HandCards() { + limit = 6; + } + + public void draw(Card card) { + elements.offer(card); + } + + public boolean containsThisMonsterCard(String uuid) { + final Card card = elements + .stream() + .collect(Collectors.toMap(v -> v.uuid, Function.identity())) + .get(uuid); + + return null != card && card.type == Type.MONSTER; + } + + public Card submit(String uuid) { + final Card card = elements + .stream() + .collect(Collectors.toMap(v -> v.uuid, Function.identity())) + .get(uuid); + elements.remove(card); + + return card; + } + + public boolean containsThisSpellCard(String uuid) { + final Card card = elements + .stream() + .collect(Collectors.toMap(v -> v.uuid, Function.identity())) + .get(uuid); + + return null != card && card.type == Type.SPELL; + } + + public boolean containsThisTrapCard(String uuid) { + final Card card = elements + .stream() + .collect(Collectors.toMap(v -> v.uuid, Function.identity())) + .get(uuid); + + return null != card && card.type == Type.TRAP; + } +} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/MonsterCard.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/MonsterCard.java new file mode 100644 index 0000000..435942d --- /dev/null +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/MonsterCard.java @@ -0,0 +1,73 @@ +package tw.gaas.yugioh.data.entity.card; + +import lombok.ToString; +import lombok.experimental.SuperBuilder; +import tw.gaas.yugioh.data.dto.CardDto; +import tw.gaas.yugioh.data.enu.Attribute; +import tw.gaas.yugioh.data.enu.MonsterType; +import tw.gaas.yugioh.data.enu.State; + +import java.util.UUID; + +@SuperBuilder +@ToString(callSuper = true) +public class MonsterCard extends Card { + + // 屬性 + protected Attribute attribute; + // 種族 + protected MonsterType monsterType; + // 等級 + protected Integer rank; + // 攻擊 + protected Integer attack; + // 防禦 + protected Integer defense; + + public Integer battle(MonsterCard target) { + return (null == target) ? this.attack : this.attack - target.attack; + } + + @Override + public Card copy() { + return MonsterCard + .builder() + .uuid(UUID.randomUUID().toString()) + .state(state) + .name(name) + .type(type) + .description(description) + .attribute(attribute) + .monsterType(monsterType) + .rank(rank) + .attack(attack) + .defense(defense) + .build(); + } + + @Override + public CardDto toDto(Boolean isDuelist) { + if ((null != isDuelist && isDuelist) || state == State.FRONT) { + return CardDto + .builder() + .uuid(uuid) + .state(state) + .name(name) + .type(type) + .description(description) + .attribute(attribute) + .monsterType(monsterType) + .spellType(null) + .trapType(null) + .rank(rank) + .attack(attack) + .defense(defense) + .build(); + } else { + return CardDto.builder() + .uuid(uuid) + .state(state) + .build(); + } + } +} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/MonsterCards.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/MonsterCards.java new file mode 100644 index 0000000..cb260fd --- /dev/null +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/MonsterCards.java @@ -0,0 +1,45 @@ +package tw.gaas.yugioh.data.entity.card; + +import lombok.ToString; +import tw.gaas.yugioh.data.enu.State; + +import java.util.Comparator; +import java.util.function.Function; +import java.util.stream.Collectors; + +import static java.util.stream.Collectors.toList; + +@ToString(callSuper = true) +public class MonsterCards extends Cards { + + public MonsterCards() { + limit = 5; + } + + public void summon(Card card, State state) { + card.changeState(state); + + elements.add(card); + } + + public boolean validIsDuelistMonsterCard(String uuid) { + return elements.stream().map(v -> v.uuid).collect(toList()).contains(uuid); + } + + public Card startBattle(String uuid) { + return elements + .stream() + .collect(Collectors.toMap(v -> v.uuid, Function.identity())) + .get(uuid); + } + + public MonsterCard chooseTarget() { + return elements.size() > 0 + ? elements.stream().map(v -> (MonsterCard) v).sorted(Comparator.comparingInt(v -> v.attack)).collect(toList()).get(0) + : null; + } + + public void moveToGraveYard(Card card) { + elements.remove(card); + } +} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/SpellAndTrapCards.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/SpellAndTrapCards.java new file mode 100644 index 0000000..40f79f7 --- /dev/null +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/SpellAndTrapCards.java @@ -0,0 +1,18 @@ +package tw.gaas.yugioh.data.entity.card; + +import lombok.ToString; +import tw.gaas.yugioh.data.enu.State; + +@ToString(callSuper = true) +public class SpellAndTrapCards extends Cards { + + public SpellAndTrapCards() { + limit = 5; + } + + public void cover(Card card, State state) { + card.changeState(state); + + elements.add(card); + } +} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/SpellCard.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/SpellCard.java new file mode 100644 index 0000000..8bea069 --- /dev/null +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/SpellCard.java @@ -0,0 +1,57 @@ +package tw.gaas.yugioh.data.entity.card; + +import lombok.ToString; +import lombok.experimental.SuperBuilder; +import tw.gaas.yugioh.data.dto.CardDto; +import tw.gaas.yugioh.data.enu.SpellType; +import tw.gaas.yugioh.data.enu.State; + +import java.util.UUID; + +@SuperBuilder +@ToString(callSuper = true) +public class SpellCard extends Card { + + // 魔法卡類型 + protected SpellType spellType; + + @Override + public Card copy() { + return SpellCard + .builder() + .uuid(UUID.randomUUID().toString()) + .state(state) + .name(name) + .type(type) + .description(description) + .spellType(spellType) + .build(); + } + + @Override + public CardDto toDto(Boolean isDuelist) { + if ((null != isDuelist && isDuelist) || state == State.FRONT) { + return CardDto + .builder() + .uuid(uuid) + .state(state) + .name(name) + .type(type) + .description(description) + .attribute(null) + .monsterType(null) + .spellType(spellType) + .trapType(null) + .rank(null) + .attack(null) + .defense(null) + .build(); + } else { + return CardDto + .builder() + .uuid(uuid) + .state(state) + .build(); + } + } +} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/TrapCard.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/TrapCard.java new file mode 100644 index 0000000..5187a65 --- /dev/null +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/TrapCard.java @@ -0,0 +1,57 @@ +package tw.gaas.yugioh.data.entity.card; + +import lombok.ToString; +import lombok.experimental.SuperBuilder; +import tw.gaas.yugioh.data.dto.CardDto; +import tw.gaas.yugioh.data.enu.State; +import tw.gaas.yugioh.data.enu.TrapType; + +import java.util.UUID; + +@SuperBuilder +@ToString(callSuper = true) +public class TrapCard extends Card { + + // 陷阱卡類型 + protected TrapType trapType; + + @Override + public Card copy() { + return TrapCard + .builder() + .uuid(UUID.randomUUID().toString()) + .state(state) + .name(name) + .type(type) + .description(description) + .trapType(trapType) + .build(); + } + + @Override + public CardDto toDto(Boolean isDuelist) { + if ((null != isDuelist && isDuelist) || state == State.FRONT) { + return CardDto + .builder() + .name(name) + .uuid(uuid) + .state(state) + .type(type) + .description(description) + .attribute(null) + .monsterType(null) + .spellType(null) + .trapType(trapType) + .rank(null) + .attack(null) + .defense(null) + .build(); + } else { + return CardDto + .builder() + .uuid(uuid) + .state(state) + .build(); + } + } +} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/card/enu/Attribute.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/enu/Attribute.java similarity index 81% rename from yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/card/enu/Attribute.java rename to yugioh-20221012/src/main/java/tw/gaas/yugioh/data/enu/Attribute.java index c5ce9db..e914d4e 100644 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/card/enu/Attribute.java +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/enu/Attribute.java @@ -1,4 +1,4 @@ -package tw.gaas.yugioh.domain.card.enu; +package tw.gaas.yugioh.data.enu; public enum Attribute { diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/card/enu/MonsterType.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/enu/MonsterType.java similarity index 94% rename from yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/card/enu/MonsterType.java rename to yugioh-20221012/src/main/java/tw/gaas/yugioh/data/enu/MonsterType.java index 5ad70a3..d6dcc1d 100644 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/card/enu/MonsterType.java +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/enu/MonsterType.java @@ -1,4 +1,4 @@ -package tw.gaas.yugioh.domain.card.enu; +package tw.gaas.yugioh.data.enu; public enum MonsterType { diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/card/enu/Phase.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/enu/Phase.java similarity index 85% rename from yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/card/enu/Phase.java rename to yugioh-20221012/src/main/java/tw/gaas/yugioh/data/enu/Phase.java index 5700c30..89e1ae9 100644 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/card/enu/Phase.java +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/enu/Phase.java @@ -1,4 +1,4 @@ -package tw.gaas.yugioh.domain.card.enu; +package tw.gaas.yugioh.data.enu; public enum Phase { @@ -26,4 +26,7 @@ public enum Phase { RIGHT_TRAP, // 攻擊 RIGHT_BATTLE, + + // 遊戲結束 + GAME_OVER } diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/enu/Side.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/enu/Side.java new file mode 100644 index 0000000..481f7b6 --- /dev/null +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/enu/Side.java @@ -0,0 +1,9 @@ +package tw.gaas.yugioh.data.enu; + +public enum Side { + + // 左側 + LEFT, + // 右側 + RIGHT, +} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/card/enu/SpellType.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/enu/SpellType.java similarity index 82% rename from yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/card/enu/SpellType.java rename to yugioh-20221012/src/main/java/tw/gaas/yugioh/data/enu/SpellType.java index a5020ce..45db692 100644 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/card/enu/SpellType.java +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/enu/SpellType.java @@ -1,4 +1,4 @@ -package tw.gaas.yugioh.domain.card.enu; +package tw.gaas.yugioh.data.enu; public enum SpellType { diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/enu/State.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/enu/State.java new file mode 100644 index 0000000..e985b44 --- /dev/null +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/enu/State.java @@ -0,0 +1,9 @@ +package tw.gaas.yugioh.data.enu; + +public enum State { + + // 表側 + FRONT, + // 裡側 + BACK, +} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/card/enu/TrapType.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/enu/TrapType.java similarity index 73% rename from yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/card/enu/TrapType.java rename to yugioh-20221012/src/main/java/tw/gaas/yugioh/data/enu/TrapType.java index 9603c02..ddb6d0e 100644 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/card/enu/TrapType.java +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/enu/TrapType.java @@ -1,4 +1,4 @@ -package tw.gaas.yugioh.domain.card.enu; +package tw.gaas.yugioh.data.enu; public enum TrapType { diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/card/enu/Type.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/enu/Type.java similarity index 71% rename from yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/card/enu/Type.java rename to yugioh-20221012/src/main/java/tw/gaas/yugioh/data/enu/Type.java index 3d4289d..706e090 100644 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/card/enu/Type.java +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/enu/Type.java @@ -1,4 +1,4 @@ -package tw.gaas.yugioh.domain.card.enu; +package tw.gaas.yugioh.data.enu; public enum Type { diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/card/Card.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/card/Card.java deleted file mode 100644 index 64842ae..0000000 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/card/Card.java +++ /dev/null @@ -1,22 +0,0 @@ -package tw.gaas.yugioh.domain.card; - -import lombok.ToString; -import lombok.experimental.SuperBuilder; -import tw.gaas.yugioh.domain.card.enu.Type; -import tw.gaas.yugioh.domain.dto.CardDto; - -@SuperBuilder -@ToString -public abstract class Card { - - // 名稱 - protected String name; - // 類型 - protected Type type; - // 描述 - protected String description; - - public abstract Card copy(); - - public abstract CardDto toDto(); -} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/card/MonsterCard.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/card/MonsterCard.java deleted file mode 100644 index d40746f..0000000 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/card/MonsterCard.java +++ /dev/null @@ -1,69 +0,0 @@ -package tw.gaas.yugioh.domain.card; - -import lombok.ToString; -import lombok.experimental.SuperBuilder; -import tw.gaas.yugioh.domain.card.enu.Attribute; -import tw.gaas.yugioh.domain.card.enu.MonsterType; -import tw.gaas.yugioh.domain.card.enu.Type; -import tw.gaas.yugioh.domain.dto.CardDto; - -@SuperBuilder -@ToString(callSuper = true) -public class MonsterCard extends Card { - - public static final MonsterCard BlueEyesShiningDragon = - MonsterCard - .builder() - .name("青眼の白龍") - .type(Type.MONSTER) - .description("高い攻撃力を誇る伝説のドラゴン。どんな相手でも粉砕する、その破壊力は計り知れない。") - .attribute(Attribute.LIGHT) - .monsterType(MonsterType.DRAGON) - .rank(8) - .attack(3000) - .defense(2500) - .build(); - - // 屬性 - private Attribute attribute; - // 種族 - private MonsterType monsterType; - // 等級 - private Integer rank; - // 攻擊 - private Integer attack; - // 防禦 - private Integer defense; - - @Override - public Card copy() { - return MonsterCard - .builder() - .name(name) - .type(type) - .description(description) - .attribute(attribute) - .monsterType(monsterType) - .rank(rank) - .attack(attack) - .defense(defense) - .build(); - } - - @Override - public CardDto toDto() { - return CardDto - .builder() - .name(name) - .type(type) - .description(description) - .attribute(attribute) - .monsterType(monsterType) - .spellType(null) - .trapType(null) - .rank(rank) - .attack(attack) - .defense(defense) - .build(); - } -} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/card/SpellCard.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/card/SpellCard.java deleted file mode 100644 index e768565..0000000 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/card/SpellCard.java +++ /dev/null @@ -1,52 +0,0 @@ -package tw.gaas.yugioh.domain.card; - -import lombok.ToString; -import lombok.experimental.SuperBuilder; -import tw.gaas.yugioh.domain.card.enu.SpellType; -import tw.gaas.yugioh.domain.card.enu.Type; -import tw.gaas.yugioh.domain.dto.CardDto; - -@SuperBuilder -@ToString(callSuper = true) -public class SpellCard extends Card { - - public static final SpellCard MONSTER_REBORN = - SpellCard - .builder() - .name("死者蘇生") - .type(Type.SPELL) - .description("自分または相手の墓地のモンスター１体を対象として発動できる。そのモンスターを自分フィールドに特殊召喚する。") - .spellType(SpellType.NORMAL) - .build(); - - // 魔法卡類型 - private SpellType spellType; - - @Override - public Card copy() { - return SpellCard - .builder() - .name(name) - .type(type) - .description(description) - .spellType(spellType) - .build(); - } - - @Override - public CardDto toDto() { - return CardDto - .builder() - .name(name) - .type(type) - .description(description) - .attribute(null) - .monsterType(null) - .spellType(spellType) - .trapType(null) - .rank(null) - .attack(null) - .defense(null) - .build(); - } -} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/card/TrapCard.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/card/TrapCard.java deleted file mode 100644 index 1fd48dc..0000000 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/card/TrapCard.java +++ /dev/null @@ -1,52 +0,0 @@ -package tw.gaas.yugioh.domain.card; - -import lombok.ToString; -import lombok.experimental.SuperBuilder; -import tw.gaas.yugioh.domain.card.enu.TrapType; -import tw.gaas.yugioh.domain.card.enu.Type; -import tw.gaas.yugioh.domain.dto.CardDto; - -@SuperBuilder -@ToString(callSuper = true) -public class TrapCard extends Card { - - public static final TrapCard MIRROR_FORCE = - TrapCard - .builder() - .name("聖なるバリア －ミラーフォース－") - .type(Type.TRAP) - .description("相手モンスターの攻撃宣言時に発動できる。相手フィールドの攻撃表示モンスターを全て破壊する。") - .trapType(TrapType.NORMAL) - .build(); - - // 陷阱卡類型 - private TrapType trapType; - - @Override - public Card copy() { - return TrapCard - .builder() - .name(name) - .type(type) - .description(description) - .trapType(trapType) - .build(); - } - - @Override - public CardDto toDto() { - return CardDto - .builder() - .name(name) - .type(type) - .description(description) - .attribute(null) - .monsterType(null) - .spellType(null) - .trapType(trapType) - .rank(null) - .attack(null) - .defense(null) - .build(); - } -} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/dto/SpellAndTrapCardsDto.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/dto/SpellAndTrapCardsDto.java deleted file mode 100644 index 83934b4..0000000 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/dto/SpellAndTrapCardsDto.java +++ /dev/null @@ -1,17 +0,0 @@ -package tw.gaas.yugioh.domain.dto; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.List; - -@Builder -@Data -@NoArgsConstructor -@AllArgsConstructor -public class SpellAndTrapCardsDto { - - private List elements; -} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/field/Cards.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/field/Cards.java deleted file mode 100644 index 6b3468f..0000000 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/field/Cards.java +++ /dev/null @@ -1,15 +0,0 @@ -package tw.gaas.yugioh.domain.field; - -import lombok.ToString; -import tw.gaas.yugioh.domain.card.Card; - -import java.util.LinkedList; - -@ToString -public abstract class Cards { - - // 上限 - protected Integer limit; - // 元素 - protected LinkedList elements; -} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/field/Deck.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/field/Deck.java deleted file mode 100644 index e1631c5..0000000 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/field/Deck.java +++ /dev/null @@ -1,24 +0,0 @@ -package tw.gaas.yugioh.domain.field; - -import lombok.ToString; -import tw.gaas.yugioh.domain.card.Card; -import tw.gaas.yugioh.domain.dto.DeckDto; - -import java.util.LinkedList; -import java.util.stream.Collectors; - -@ToString(callSuper = true) -public class Deck extends Cards { - - public Deck() { - limit = 60; - elements = new LinkedList<>(); - } - - public DeckDto toDto() { - return DeckDto - .builder() - .elements(elements.stream().map(Card::toDto).collect(Collectors.toList())) - .build(); - } -} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/field/DuelField.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/field/DuelField.java deleted file mode 100644 index 638ff97..0000000 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/field/DuelField.java +++ /dev/null @@ -1,48 +0,0 @@ -package tw.gaas.yugioh.domain.field; - -import lombok.ToString; -import tw.gaas.yugioh.domain.card.enu.Phase; -import tw.gaas.yugioh.domain.dto.DuelFieldDto; -import tw.gaas.yugioh.domain.dto.ZoneDto; - -@ToString -public class DuelField { - - // UUID - private String uuid; - // 左邊場地 - private Zone left; - // 右邊場地 - private Zone right; - // 階段 - private Phase phase; - - public DuelField(String uuid, Phase phase) { - this.uuid = uuid; - this.phase = phase; - } - - public void setPhase(Phase phase) { - this.phase = phase; - } - - public DuelFieldDto toDto() { - ZoneDto leftDto = null; - if (left != null) { - leftDto = left.toDto(); - } - - ZoneDto rightDto = null; - if (right != null) { - rightDto = right.toDto(); - } - - return DuelFieldDto - .builder() - .uuid(uuid) - .left(leftDto) - .right(rightDto) - .phase(phase) - .build(); - } -} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/field/Duelist.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/field/Duelist.java deleted file mode 100644 index 2d15070..0000000 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/field/Duelist.java +++ /dev/null @@ -1,24 +0,0 @@ -package tw.gaas.yugioh.domain.field; - -import lombok.ToString; -import tw.gaas.yugioh.domain.dto.DuelistDto; - -@ToString -public class Duelist { - - // 名稱 - private String name; - // 生命值 - private Integer lp; - // 手牌 - private HandCards handCards; - - public DuelistDto toDto() { - return DuelistDto - .builder() - .name(name) - .lp(lp) - .handCardsAmount(handCards.elements.size()) - .build(); - } -} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/field/GraveYardCards.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/field/GraveYardCards.java deleted file mode 100644 index f123b15..0000000 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/field/GraveYardCards.java +++ /dev/null @@ -1,25 +0,0 @@ -package tw.gaas.yugioh.domain.field; - - -import lombok.ToString; -import tw.gaas.yugioh.domain.card.Card; -import tw.gaas.yugioh.domain.dto.GraveYardCardsDto; - -import java.util.LinkedList; -import java.util.stream.Collectors; - -@ToString(callSuper = true) -public class GraveYardCards extends Cards { - - public GraveYardCards() { - limit = -1; - elements = new LinkedList<>(); - } - - public GraveYardCardsDto toDto() { - return GraveYardCardsDto - .builder() - .elements(elements.stream().map(Card::toDto).collect(Collectors.toList())) - .build(); - } -} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/field/HandCards.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/field/HandCards.java deleted file mode 100644 index 49b105c..0000000 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/field/HandCards.java +++ /dev/null @@ -1,14 +0,0 @@ -package tw.gaas.yugioh.domain.field; - -import lombok.ToString; - -import java.util.LinkedList; - -@ToString(callSuper = true) -public class HandCards extends Cards { - - public HandCards() { - limit = 6; - elements = new LinkedList<>(); - } -} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/field/MonsterCards.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/field/MonsterCards.java deleted file mode 100644 index 4eaf9d6..0000000 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/field/MonsterCards.java +++ /dev/null @@ -1,24 +0,0 @@ -package tw.gaas.yugioh.domain.field; - -import lombok.ToString; -import tw.gaas.yugioh.domain.card.Card; -import tw.gaas.yugioh.domain.dto.MonsterCardsDto; - -import java.util.LinkedList; -import java.util.stream.Collectors; - -@ToString(callSuper = true) -public class MonsterCards extends Cards { - - public MonsterCards() { - limit = 5; - elements = new LinkedList<>(); - } - - public MonsterCardsDto toDto() { - return MonsterCardsDto - .builder() - .elements(elements.stream().map(Card::toDto).collect(Collectors.toList())) - .build(); - } -} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/field/SpellAndTrapCards.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/field/SpellAndTrapCards.java deleted file mode 100644 index b775d96..0000000 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/field/SpellAndTrapCards.java +++ /dev/null @@ -1,24 +0,0 @@ -package tw.gaas.yugioh.domain.field; - -import lombok.ToString; -import tw.gaas.yugioh.domain.card.Card; -import tw.gaas.yugioh.domain.dto.SpellAndTrapCardsDto; - -import java.util.LinkedList; -import java.util.stream.Collectors; - -@ToString(callSuper = true) -public class SpellAndTrapCards extends Cards { - - public SpellAndTrapCards() { - limit = 5; - elements = new LinkedList<>(); - } - - public SpellAndTrapCardsDto toDto() { - return SpellAndTrapCardsDto - .builder() - .elements(elements.stream().map(Card::toDto).collect(Collectors.toList())) - .build(); - } -} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/field/Zone.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/field/Zone.java deleted file mode 100644 index fc994e0..0000000 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/field/Zone.java +++ /dev/null @@ -1,30 +0,0 @@ -package tw.gaas.yugioh.domain.field; - -import lombok.ToString; -import tw.gaas.yugioh.domain.dto.ZoneDto; - -@ToString -public class Zone { - - // 玩家 - private Duelist duelist; - // 主要怪獸區 - private MonsterCards monsterCards; - // 魔法陷阱區 - private SpellAndTrapCards spellAndTrapCards; - // 墓地 - private GraveYardCards graveYardCards; - // 牌堆 - private Deck deck; - - public ZoneDto toDto() { - return ZoneDto - .builder() - .duelist(duelist.toDto()) - .monsterCards(monsterCards.toDto()) - .spellAndTrapCards(spellAndTrapCards.toDto()) - .graveYardCards(graveYardCards.toDto()) - .deck(deck.toDto()) - .build(); - } -} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/manager/GameManager.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/manager/GameManager.java index 383ae28..35134e9 100644 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/manager/GameManager.java +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/manager/GameManager.java @@ -1,82 +1,34 @@ package tw.gaas.yugioh.manager; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import lombok.extern.slf4j.Slf4j; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import org.springframework.web.servlet.mvc.method.annotation.SseEmitter; -import tw.gaas.yugioh.domain.card.enu.Phase; -import tw.gaas.yugioh.domain.field.DuelField; +import tw.gaas.yugioh.data.entity.DuelField; -import java.io.IOException; -import java.time.OffsetDateTime; -import java.util.List; -import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedQueue; -@Slf4j @Component public class GameManager { - private final ObjectMapper objectMapper = new ObjectMapper(); private final ConcurrentLinkedQueue pairPool = new ConcurrentLinkedQueue<>(); - private final ConcurrentHashMap gameUuidAndDuelField = new ConcurrentHashMap<>(); - private final ConcurrentHashMap> gameUuidAndSseEmitters = new ConcurrentHashMap<>(); + private final ConcurrentHashMap uuidAndDuelField = new ConcurrentHashMap<>(); public String requestPair() { return pairPool.poll(); } - public String enterLeft(String gameUuid) { - gameUuidAndDuelField.put(gameUuid, new DuelField(gameUuid, Phase.INIT)); - pairPool.offer(gameUuid); - return "curl -H \"Accept:text/event-stream\" http://localhost:8080/java/api/v1.0/games/" + gameUuid; + public void submitPairRequest(String duelFieldUuid) { + pairPool.offer(duelFieldUuid); } - public String enterRight(String pairGameUuid) { - final DuelField duelField = gameUuidAndDuelField.get(pairGameUuid); - duelField.setPhase(Phase.LEFT_DRAW); - return "curl -H \"Accept:text/event-stream\" http://localhost:8080/java/api/v1.0/games/" + pairGameUuid; + public void putDuelFieldWithUuid(String uuid, DuelField duelField) { + uuidAndDuelField.put(uuid, duelField); } - public SseEmitter register(String gameUuid, SseEmitter sseEmitter) { - if (gameUuidAndSseEmitters.containsKey(gameUuid)) { - gameUuidAndSseEmitters.get(gameUuid).add(sseEmitter); - } else { - gameUuidAndSseEmitters.put(gameUuid, List.of(sseEmitter)); - } - - return sseEmitter; + public DuelField findDuelFieldByUuid(String duelFieldUuid) { + return uuidAndDuelField.get(duelFieldUuid); } - @Scheduled(cron = "*/5 * * * * *") - void broadcastDuelFieldsTask() { - gameUuidAndDuelField - .forEach((gameUuid, duelField) -> - Optional - .ofNullable(gameUuidAndSseEmitters.get(gameUuid)) - .ifPresent(emitters -> { - try { - log.info("\n" + objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(duelField.toDto())); - } catch (JsonProcessingException ex) { - log.error(ex.getMessage(), ex); - } - - emitters.forEach(e -> { - try { - e.send( - SseEmitter - .event() - .id(OffsetDateTime.now().toString()) - .name(String.format("Game:%s", gameUuid)) - .data(objectMapper.writeValueAsString(duelField.toDto())) - ); - } catch (IOException ex) { - log.error(ex.getMessage(), ex); - } - }); - })); + public ConcurrentHashMap allDuelFields() { + return uuidAndDuelField; } } diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/manager/NetworkManager.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/manager/NetworkManager.java new file mode 100644 index 0000000..b91727a --- /dev/null +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/manager/NetworkManager.java @@ -0,0 +1,64 @@ +package tw.gaas.yugioh.manager; + +import com.fasterxml.jackson.databind.ObjectMapper; +import lombok.extern.slf4j.Slf4j; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; +import org.springframework.web.servlet.mvc.method.annotation.SseEmitter; + +import java.io.IOException; +import java.time.OffsetDateTime; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.concurrent.ConcurrentHashMap; + +@Slf4j +@Component +public class NetworkManager { + + private final GameManager gameManager; + private final ObjectMapper objectMapper = new ObjectMapper(); + private final ConcurrentHashMap> duelFieldUuidAndSseEmitters = new ConcurrentHashMap<>(); + + public NetworkManager(GameManager gameManager) { + this.gameManager = gameManager; + } + + public SseEmitter register(String duelFieldUuid, SseEmitter sseEmitter) { + if (duelFieldUuidAndSseEmitters.containsKey(duelFieldUuid)) { + duelFieldUuidAndSseEmitters.get(duelFieldUuid).add(sseEmitter); + } else { + duelFieldUuidAndSseEmitters.put(duelFieldUuid, new ArrayList<>() {{ + add(sseEmitter); + }}); + } + + return sseEmitter; + } + + @Scheduled(cron = "*/5 * * * * *") + void broadcastDuelFieldsTask() { + gameManager + .allDuelFields() + .forEach((uuid, duelField) -> + Optional + .ofNullable(duelFieldUuidAndSseEmitters.get(uuid)) + .ifPresent(emitters -> emitters + .forEach(emitter -> { + try { + emitter.send( + SseEmitter + .event() + .id(OffsetDateTime.now().toString()) + .name(String.format("Game:%s", uuid)) + .data(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(duelField.toDto(null, null))) + ); + } catch (IOException ex) { + log.error(ex.getMessage(), ex); + } + }) + ) + ); + } +} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/Controller.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/Controller.java deleted file mode 100644 index 591e61c..0000000 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/Controller.java +++ /dev/null @@ -1,58 +0,0 @@ -package tw.gaas.yugioh.web; - -import lombok.extern.slf4j.Slf4j; -import net.purefunc.emoji.Emoji2; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.servlet.mvc.method.annotation.SseEmitter; -import tw.gaas.yugioh.manager.GameManager; - -import java.io.IOException; -import java.time.LocalDateTime; -import java.util.UUID; - -@Slf4j -@RestController -@RequestMapping("/java/api/v1.0") -public class Controller { - - private final GameManager gameManager; - - public Controller(GameManager gameManager) { - this.gameManager = gameManager; - } - - @GetMapping("/status") - String getStatus() { - return String.format("Hello Duels! %s", Emoji2.MILITARY_MEDAL); - } - - @PostMapping("/games/{username}") - String joinGames(@PathVariable String username) { - final String pairGameUuid = gameManager.requestPair(); - - if (pairGameUuid == null) { - final String uuid = UUID.randomUUID().toString(); - return gameManager.enterLeft(uuid); - } else { - return gameManager.enterRight(pairGameUuid); - } - } - - @GetMapping("/games/{gameUuid}") - SseEmitter registerDuelFieldsListener(@PathVariable String gameUuid) throws IOException { - SseEmitter sseEmitter = new SseEmitter(0L); - sseEmitter.send( - SseEmitter - .event() - .id(LocalDateTime.now().toString()) - .name("Connected, you're listening " + gameUuid + " duel field.") - .reconnectTime(1000) - ); - - return gameManager.register(gameUuid, sseEmitter); - } -} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/controller/AuthController.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/controller/AuthController.java new file mode 100644 index 0000000..e7a61de --- /dev/null +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/controller/AuthController.java @@ -0,0 +1,49 @@ +package tw.gaas.yugioh.web.controller; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import tw.gaas.yugioh.web.security.JwtTokenService; +import tw.gaas.yugioh.web.security.LoginRequestDto; + +import java.util.UUID; + +@Slf4j +@RestController +@RequestMapping("/java/api/v1.0") +public class AuthController { + + private final AuthenticationManager authenticationManager; + + private final JwtTokenService jwtTokenService; + + private final UserDetailsService springUserDetailsService; + + public AuthController(AuthenticationManager authenticationManager, JwtTokenService jwtTokenService, UserDetailsService springUserDetailsService) { + this.authenticationManager = authenticationManager; + this.jwtTokenService = jwtTokenService; + this.springUserDetailsService = springUserDetailsService; + } + + @PostMapping("/auth:login") + public ResponseEntity login(@RequestBody LoginRequestDto loginRequestDto) { + authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(loginRequestDto.getUsername(), loginRequestDto.getPassword())); + + final UserDetails userDetails = springUserDetailsService.loadUserByUsername(loginRequestDto.getUsername()); + final String bearerToken = jwtTokenService.generate(userDetails.getUsername(), UUID.randomUUID().toString()); + + return ResponseEntity + .status(HttpStatus.OK) + .header(HttpHeaders.AUTHORIZATION, bearerToken) + .body(null); + } +} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/controller/DuelFieldController.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/controller/DuelFieldController.java new file mode 100644 index 0000000..1dded60 --- /dev/null +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/controller/DuelFieldController.java @@ -0,0 +1,198 @@ +package tw.gaas.yugioh.web.controller; + +import lombok.extern.slf4j.Slf4j; +import net.purefunc.emoji.Emoji2; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.servlet.mvc.method.annotation.SseEmitter; +import tw.gaas.yugioh.data.dto.CardReqDto; +import tw.gaas.yugioh.data.dto.DuelFieldDto; +import tw.gaas.yugioh.data.entity.DuelField; +import tw.gaas.yugioh.data.entity.Duelist; +import tw.gaas.yugioh.data.entity.Zone; +import tw.gaas.yugioh.data.enu.Phase; +import tw.gaas.yugioh.data.enu.Side; +import tw.gaas.yugioh.manager.GameManager; +import tw.gaas.yugioh.manager.NetworkManager; +import tw.gaas.yugioh.web.security.exception.DuelFieldNotFound; + +import java.io.IOException; +import java.security.Principal; +import java.time.LocalDateTime; +import java.util.Map; +import java.util.Optional; +import java.util.UUID; + +@Slf4j +@RestController +@RequestMapping("/java/api/v1.0") +public class DuelFieldController { + + private final GameManager gameManager; + private final NetworkManager networkManager; + + public DuelFieldController(GameManager gameManager, NetworkManager networkManager) { + this.gameManager = gameManager; + this.networkManager = networkManager; + } + + @GetMapping("/status") + public String getStatus() { + return String.format("Hello Duelist! %s%s%s", Emoji2.MILITARY_MEDAL, Emoji2.MILITARY_MEDAL, Emoji2.MILITARY_MEDAL); + } + + @PreAuthorize("hasRole('USER')") + @PostMapping("/duelField:join") + public Map joinFuelField(Principal principal) { + final String pairDuelFieldUuid = gameManager.requestPair(); + final String duelFieldUuid = UUID.randomUUID().toString(); + + final Duelist duelist = new Duelist(principal.getName()); + final Zone zone = new Zone(duelist); + + if (isLeftDuelist(pairDuelFieldUuid)) { + final DuelField duelField = new DuelField(duelFieldUuid); + duelField.setLeft(zone); + duelField.waitDuelist(); + + gameManager.putDuelFieldWithUuid(duelFieldUuid, duelField); + gameManager.submitPairRequest(duelFieldUuid); + + return Map.of( + "sse", "curl -H \"Accept:text/event-stream\" http://localhost:8080/java/api/v1.0/duelField/" + duelFieldUuid + ":sse", + "duelFieldUuid", duelFieldUuid + ); + } else { + final DuelField duelField = gameManager.findDuelFieldByUuid(pairDuelFieldUuid); + duelField.setRight(zone); + duelField.start(); + + return Map.of( + "sse", "curl -H \"Accept:text/event-stream\" http://localhost:8080/java/api/v1.0/duelField/" + pairDuelFieldUuid + ":sse", + "duelFieldUuid", pairDuelFieldUuid + ); + } + } + + @PreAuthorize("hasRole('USER')") + @PostMapping("/duelField/{uuid}/{side}:drawCard") + public void duelistDrawCard(@PathVariable String uuid, @PathVariable Side side, Principal principal) { + final DuelField duelField = Optional + .of(gameManager.findDuelFieldByUuid(uuid)) + .orElseThrow(() -> new DuelFieldNotFound("DuelField with " + uuid + " not found")); + final Phase phase = side == Side.LEFT ? Phase.LEFT_DRAW : Phase.RIGHT_DRAW; + duelField.validPhase(phase); + duelField.validDuelist(side, principal.getName()); + + duelField.duelistDraw(side); + } + + @PreAuthorize("hasRole('USER')") + @PostMapping("/duelField/{uuid}/{side}:summonMonster") + public void duelistSummonMonster(@PathVariable String uuid, @PathVariable Side side, @RequestParam(required = false, defaultValue = "false") Boolean skip, @RequestBody CardReqDto cardReqDto, Principal principal) { + final DuelField duelField = Optional + .of(gameManager.findDuelFieldByUuid(uuid)) + .orElseThrow(() -> new DuelFieldNotFound("DuelField with " + uuid + " not found")); + final Phase phase = side == Side.LEFT ? Phase.LEFT_MONSTER : Phase.RIGHT_MONSTER; + duelField.validPhase(phase); + duelField.validDuelist(side, principal.getName()); + + if (skip) { + duelField.duelistSkipSummonMonster(side); + } else { + duelField.validDuelistSummonMonster(side, cardReqDto.getUuid()); + duelField.duelistSummonMonster(side, cardReqDto.getUuid(), cardReqDto.getState()); + } + } + + @PreAuthorize("hasRole('USER')") + @PostMapping("/duelField/{uuid}/{side}:applySpell") + public void duelistApplySpell(@PathVariable String uuid, @PathVariable Side side, @RequestParam(required = false, defaultValue = "false") Boolean skip, @RequestBody CardReqDto cardReqDto, Principal principal) { + final DuelField duelField = Optional + .of(gameManager.findDuelFieldByUuid(uuid)) + .orElseThrow(() -> new DuelFieldNotFound("DuelField with " + uuid + " not found")); + final Phase phase = side == Side.LEFT ? Phase.LEFT_SPELL : Phase.RIGHT_SPELL; + duelField.validPhase(phase); + duelField.validDuelist(side, principal.getName()); + + if (skip) { + duelField.duelistSkipApplySpell(side); + } else { + duelField.validDuelistApplySpell(side, cardReqDto.getUuid()); + duelField.duelistApplySpell(side, cardReqDto.getUuid()); + } + } + + @PreAuthorize("hasRole('USER')") + @PostMapping("/duelField/{uuid}/{side}:coverTrap") + public void duelistCoverTrap(@PathVariable String uuid, @PathVariable Side side, @RequestParam(required = false, defaultValue = "false") Boolean skip, @RequestBody CardReqDto cardReqDto, Principal principal) { + final DuelField duelField = Optional + .of(gameManager.findDuelFieldByUuid(uuid)) + .orElseThrow(() -> new DuelFieldNotFound("DuelField with " + uuid + " not found")); + final Phase phase = side == Side.LEFT ? Phase.LEFT_TRAP : Phase.RIGHT_TRAP; + duelField.validPhase(phase); + duelField.validDuelist(side, principal.getName()); + + if (skip) { + duelField.duelistSkipCoverTrap(side); + } else { + duelField.validDuelistCoverTrap(side, cardReqDto.getUuid()); + duelField.duelistCoverTrap(side, cardReqDto.getUuid(), cardReqDto.getState()); + } + + duelField.skipFirstRoundBattle(); + } + + @PreAuthorize("hasRole('USER')") + @PostMapping("/duelField/{uuid}/{side}:startBattle") + public void duelistStartBattle(@PathVariable String uuid, @PathVariable Side side, @RequestParam(required = false, defaultValue = "false") Boolean skip, @RequestBody CardReqDto cardReqDto, Principal principal) { + final DuelField duelField = Optional + .of(gameManager.findDuelFieldByUuid(uuid)) + .orElseThrow(() -> new DuelFieldNotFound("DuelField with " + uuid + " not found")); + final Phase phase = side == Side.LEFT ? Phase.LEFT_BATTLE : Phase.RIGHT_BATTLE; + duelField.validPhase(phase); + duelField.validDuelist(side, principal.getName()); + + if (skip) { + duelField.duelistSkipStartBattle(side); + } else { + duelField.validDuelistStartBattle(side, cardReqDto.getUuid()); + duelField.duelistStartBattle(side, cardReqDto.getUuid()); + } + } + + @PreAuthorize("hasRole('USER')") + @GetMapping("/duelField/{uuid}") + public DuelFieldDto queryDuelField(@PathVariable String uuid, Principal principal) { + final DuelField duelField = gameManager.findDuelFieldByUuid(uuid); + final Boolean isLeftDuelist = duelField.checkIsDuelist(Side.LEFT, principal.getName()); + final Boolean isRightDuelist = duelField.checkIsDuelist(Side.RIGHT, principal.getName()); + + return duelField.toDto(isLeftDuelist, isRightDuelist); + } + + @PreAuthorize("hasRole('USER')") + @GetMapping("/duelField/{uuid}/:sse") + public SseEmitter listenDuelField(@PathVariable String uuid) throws IOException { + final SseEmitter sseEmitter = new SseEmitter(0L); + sseEmitter.send( + SseEmitter + .event() + .id(LocalDateTime.now().toString()) + .name("Connected, you're listening " + uuid + " duel field.") + .reconnectTime(1000) + ); + + return networkManager.register(uuid, sseEmitter); + } + + private boolean isLeftDuelist(String pairDuelFieldUuid) { + return pairDuelFieldUuid == null; + } +} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/JwtTokenFilter.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/JwtTokenFilter.java new file mode 100644 index 0000000..5909c34 --- /dev/null +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/JwtTokenFilter.java @@ -0,0 +1,42 @@ +package tw.gaas.yugioh.web.security; + +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.web.authentication.WebAuthenticationDetailsSource; +import org.springframework.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; + +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +@Component +public class JwtTokenFilter extends OncePerRequestFilter { + + private final JwtTokenService jwtTokenService; + + private final UserDetailsService springUserDetailsService; + + public JwtTokenFilter(JwtTokenService jwtTokenService, UserDetailsService springUserDetailsService) { + this.jwtTokenService = jwtTokenService; + this.springUserDetailsService = springUserDetailsService; + } + + @Override + protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { + final String tokenInHeader = request.getHeader("Authorization"); + if (null != tokenInHeader && tokenInHeader.startsWith("Bearer ")) { + final String username = jwtTokenService.retrieveSubject(tokenInHeader.substring(7)); + final UserDetails userDetails = springUserDetailsService.loadUserByUsername(username); + final UsernamePasswordAuthenticationToken usernamePasswordAuthenticationToken = new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities()); + usernamePasswordAuthenticationToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request)); + SecurityContextHolder.getContext().setAuthentication(usernamePasswordAuthenticationToken); + } + + filterChain.doFilter(request, response); + } +} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/JwtTokenService.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/JwtTokenService.java new file mode 100644 index 0000000..32c3ffd --- /dev/null +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/JwtTokenService.java @@ -0,0 +1,37 @@ +package tw.gaas.yugioh.web.security; + +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.SignatureAlgorithm; +import io.jsonwebtoken.security.Keys; +import org.springframework.stereotype.Component; + +import java.util.Date; + +@Component +public class JwtTokenService { + + private final String key = "HOW_DO_YOU_TURN_THIS_ON_HOW_DO_YOU_TURN_THIS_ON_HOW_DO_YOU_TURN_THIS_ON"; + + public String generate(String subject, String uuid) { + final Date now = new Date(); + return Jwts.builder() + .setIssuer("Yu-Yi-Oh") + .setSubject(subject) + .setAudience(null) + .setExpiration(new Date(System.currentTimeMillis() + (24 * 60 * 60 * 1000))) + .setNotBefore(now) + .setIssuedAt(now) + .setId(uuid) + .signWith(Keys.hmacShaKeyFor(key.getBytes()), SignatureAlgorithm.HS512) + .compact(); + } + + public String retrieveSubject(String token) { + return Jwts.parserBuilder() + .setSigningKey(Keys.hmacShaKeyFor(key.getBytes())) + .build() + .parseClaimsJws(token) + .getBody() + .getSubject(); + } +} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/dto/MonsterCardsDto.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/LoginRequestDto.java similarity index 57% rename from yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/dto/MonsterCardsDto.java rename to yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/LoginRequestDto.java index 4513d37..5ff4862 100644 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/domain/dto/MonsterCardsDto.java +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/LoginRequestDto.java @@ -1,17 +1,17 @@ -package tw.gaas.yugioh.domain.dto; +package tw.gaas.yugioh.web.security; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.List; - @Builder @Data @NoArgsConstructor @AllArgsConstructor -public class MonsterCardsDto { +public class LoginRequestDto { + + private String username; - private List elements; + private String password; } diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/SpringControllerAdvice.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/SpringControllerAdvice.java new file mode 100644 index 0000000..0f59eae --- /dev/null +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/SpringControllerAdvice.java @@ -0,0 +1,38 @@ +package tw.gaas.yugioh.web.security; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; +import tw.gaas.yugioh.web.security.exception.DuelFieldNotFound; +import tw.gaas.yugioh.web.security.exception.NotCardInMonsterCards; +import tw.gaas.yugioh.web.security.exception.NotDuelistInZone; +import tw.gaas.yugioh.web.security.exception.NotMonsterCardInHand; +import tw.gaas.yugioh.web.security.exception.NotSpellCardInHand; +import tw.gaas.yugioh.web.security.exception.NotTrapCardInHand; +import tw.gaas.yugioh.web.security.exception.WrongPhase; + +@Slf4j +@RestControllerAdvice +public class SpringControllerAdvice { + + @ExceptionHandler(Exception.class) + public ResponseEntity globalExceptionHandler(Exception ex) { + log.error(ex.getMessage(), ex); + return ResponseEntity.internalServerError().body(ex.getMessage()); + } + + @ExceptionHandler(value = { + DuelFieldNotFound.class, + NotCardInMonsterCards.class, + NotDuelistInZone.class, + NotMonsterCardInHand.class, + NotSpellCardInHand.class, + NotTrapCardInHand.class, + WrongPhase.class + }) + public ResponseEntity duelFieldNotFound(RuntimeException ex) { + log.error(ex.getMessage(), ex); + return ResponseEntity.badRequest().body(ex.getMessage()); + } +} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/SpringSecurityConfig.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/SpringSecurityConfig.java new file mode 100644 index 0000000..1511db9 --- /dev/null +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/SpringSecurityConfig.java @@ -0,0 +1,64 @@ +package tw.gaas.yugioh.web.security; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.config.http.SessionCreationPolicy; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; + +@EnableWebSecurity +@EnableGlobalMethodSecurity(prePostEnabled = true) +@Configuration +public class SpringSecurityConfig extends WebSecurityConfigurerAdapter { + + private final JwtTokenFilter jwtTokenFilter; + + private final UserDetailsService springUserDetailsService; + + public SpringSecurityConfig(JwtTokenFilter jwtTokenFilter, UserDetailsService springUserDetailsService) { + this.jwtTokenFilter = jwtTokenFilter; + this.springUserDetailsService = springUserDetailsService; + } + + @Override + protected void configure(HttpSecurity http) throws Exception { + http + .httpBasic().disable() + .formLogin().disable() + .csrf().disable() + .logout().disable() + .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS) + .and() + .authorizeRequests() + .antMatchers("/java/api/v1.0/auth:login").permitAll() + .antMatchers("/java/api/v1.0/status").permitAll() + .antMatchers("/kotlin/api/v1.0/status").permitAll() + .anyRequest().authenticated(); + + http.addFilterBefore(jwtTokenFilter, UsernamePasswordAuthenticationFilter.class); + } + + @Override + protected void configure(AuthenticationManagerBuilder auth) throws Exception { + auth.userDetailsService(springUserDetailsService).passwordEncoder(passwordEncoder()); + } + + @Bean + @Override + public AuthenticationManager authenticationManagerBean() throws Exception { + return super.authenticationManagerBean(); + } + + @Bean + public PasswordEncoder passwordEncoder() { + return new BCryptPasswordEncoder(); + } +} \ No newline at end of file diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/SpringUserDetailsService.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/SpringUserDetailsService.java new file mode 100644 index 0000000..d1ba9ec --- /dev/null +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/SpringUserDetailsService.java @@ -0,0 +1,37 @@ +package tw.gaas.yugioh.web.security; + +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.userdetails.User; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Component; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; + +@Component +public class SpringUserDetailsService implements UserDetailsService { + + private final Map userMap; + + public SpringUserDetailsService() { + final PasswordEncoder passwordEncoder = new BCryptPasswordEncoder(); + userMap = new HashMap<>() {{ + put("vincent", new User("vincent", passwordEncoder.encode("123456"), List.of(new SimpleGrantedAuthority("ROLE_USER")))); + put("qrtt1", new User("qrtt1", passwordEncoder.encode("123456"), List.of(new SimpleGrantedAuthority("ROLE_USER")))); + put("musk", new User("musk", passwordEncoder.encode("123456"), List.of(new SimpleGrantedAuthority("ROLE_USER")))); + }}; + } + + @Override + public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { + return Optional + .of(userMap.get(username)) + .orElseThrow(() -> new UsernameNotFoundException(username + " not found")); + } +} \ No newline at end of file diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/exception/DuelFieldNotFound.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/exception/DuelFieldNotFound.java new file mode 100644 index 0000000..4e69355 --- /dev/null +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/exception/DuelFieldNotFound.java @@ -0,0 +1,8 @@ +package tw.gaas.yugioh.web.security.exception; + +public class DuelFieldNotFound extends RuntimeException { + + public DuelFieldNotFound(String message) { + super(message); + } +} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/exception/NotCardInMonsterCards.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/exception/NotCardInMonsterCards.java new file mode 100644 index 0000000..975392b --- /dev/null +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/exception/NotCardInMonsterCards.java @@ -0,0 +1,8 @@ +package tw.gaas.yugioh.web.security.exception; + +public class NotCardInMonsterCards extends RuntimeException { + + public NotCardInMonsterCards(String message) { + super(message); + } +} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/exception/NotDuelistInZone.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/exception/NotDuelistInZone.java new file mode 100644 index 0000000..1f6f8f6 --- /dev/null +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/exception/NotDuelistInZone.java @@ -0,0 +1,8 @@ +package tw.gaas.yugioh.web.security.exception; + +public class NotDuelistInZone extends RuntimeException { + + public NotDuelistInZone(String message) { + super(message); + } +} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/exception/NotMonsterCardInHand.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/exception/NotMonsterCardInHand.java new file mode 100644 index 0000000..ea5c25f --- /dev/null +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/exception/NotMonsterCardInHand.java @@ -0,0 +1,8 @@ +package tw.gaas.yugioh.web.security.exception; + +public class NotMonsterCardInHand extends RuntimeException { + + public NotMonsterCardInHand(String message) { + super(message); + } +} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/exception/NotSpellCardInHand.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/exception/NotSpellCardInHand.java new file mode 100644 index 0000000..e99cc38 --- /dev/null +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/exception/NotSpellCardInHand.java @@ -0,0 +1,8 @@ +package tw.gaas.yugioh.web.security.exception; + +public class NotSpellCardInHand extends RuntimeException { + + public NotSpellCardInHand(String message) { + super(message); + } +} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/exception/NotTrapCardInHand.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/exception/NotTrapCardInHand.java new file mode 100644 index 0000000..af3d3df --- /dev/null +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/exception/NotTrapCardInHand.java @@ -0,0 +1,8 @@ +package tw.gaas.yugioh.web.security.exception; + +public class NotTrapCardInHand extends RuntimeException { + + public NotTrapCardInHand(String message) { + super(message); + } +} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/exception/WrongPhase.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/exception/WrongPhase.java new file mode 100644 index 0000000..44bfbe3 --- /dev/null +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/exception/WrongPhase.java @@ -0,0 +1,8 @@ +package tw.gaas.yugioh.web.security.exception; + +public class WrongPhase extends RuntimeException { + + public WrongPhase(String message) { + super(message); + } +} diff --git a/yugioh-20221012/src/main/kotlin/tw/gaas/yugioh/domain/card/KCard.kt b/yugioh-20221012/src/main/kotlin/tw/gaas/yugioh/domain/card/KCard.kt index 6b99f71..3759e16 100644 --- a/yugioh-20221012/src/main/kotlin/tw/gaas/yugioh/domain/card/KCard.kt +++ b/yugioh-20221012/src/main/kotlin/tw/gaas/yugioh/domain/card/KCard.kt @@ -1,10 +1,10 @@ package tw.gaas.yugioh.domain.card -import tw.gaas.yugioh.domain.card.enu.Attribute -import tw.gaas.yugioh.domain.card.enu.MonsterType -import tw.gaas.yugioh.domain.card.enu.SpellType -import tw.gaas.yugioh.domain.card.enu.TrapType -import tw.gaas.yugioh.domain.card.enu.Type +import tw.gaas.yugioh.data.enu.Attribute +import tw.gaas.yugioh.data.enu.MonsterType +import tw.gaas.yugioh.data.enu.SpellType +import tw.gaas.yugioh.data.enu.TrapType +import tw.gaas.yugioh.data.enu.Type open class KCard( protected open val name: String, diff --git a/yugioh-20221012/src/main/kotlin/tw/gaas/yugioh/domain/field/KDuelField.kt b/yugioh-20221012/src/main/kotlin/tw/gaas/yugioh/domain/field/KDuelField.kt index b4834dd..e1976eb 100644 --- a/yugioh-20221012/src/main/kotlin/tw/gaas/yugioh/domain/field/KDuelField.kt +++ b/yugioh-20221012/src/main/kotlin/tw/gaas/yugioh/domain/field/KDuelField.kt @@ -1,7 +1,7 @@ package tw.gaas.yugioh.domain.field +import tw.gaas.yugioh.data.enu.Phase import tw.gaas.yugioh.domain.card.KCard -import tw.gaas.yugioh.domain.card.enu.Phase data class KDuelField( val left: KZone, diff --git a/yugioh-20221012/src/main/kotlin/tw/gaas/yugioh/web/KController.kt b/yugioh-20221012/src/main/kotlin/tw/gaas/yugioh/web/KController.kt index b440f6f..80892a7 100644 --- a/yugioh-20221012/src/main/kotlin/tw/gaas/yugioh/web/KController.kt +++ b/yugioh-20221012/src/main/kotlin/tw/gaas/yugioh/web/KController.kt @@ -10,5 +10,5 @@ import org.springframework.web.bind.annotation.RestController class KController { @GetMapping("/status") - fun getStatus() = "Hello KDuels! ${Emoji2.MILITARY_MEDAL}" + fun getStatus() = "Hello KDuelist! ${Emoji2.MILITARY_MEDAL}${Emoji2.MILITARY_MEDAL}${Emoji2.MILITARY_MEDAL}" } \ No newline at end of file From b7cb4d45a0bda630e3a2abe21c6e549e9ee81ffc Mon Sep 17 00:00:00 2001 From: Vincent Huang iMac Date: Sun, 11 Dec 2022 01:43:13 +0800 Subject: [PATCH 02/12] :art: refactor: api refine --- yugioh-20221012/http/test-java.http | 55 ++++++++++------ .../tw/gaas/yugioh/data/entity/DuelField.java | 53 +++++++-------- .../tw/gaas/yugioh/manager/GameManager.java | 10 --- .../tw/gaas/yugioh/manager/PairManager.java | 20 ++++++ .../yugioh/web/controller/AuthController.java | 12 ++-- .../web/controller/DuelFieldController.java | 64 ++++++++----------- .../yugioh/web/security/LoginResponseDto.java | 15 +++++ .../security/SpringUserDetailsService.java | 3 +- 8 files changed, 127 insertions(+), 105 deletions(-) create mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/manager/PairManager.java create mode 100644 yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/LoginResponseDto.java diff --git a/yugioh-20221012/http/test-java.http b/yugioh-20221012/http/test-java.http index 76fab5c..46cf277 100644 --- a/yugioh-20221012/http/test-java.http +++ b/yugioh-20221012/http/test-java.http @@ -1,17 +1,3 @@ -### Java status endpoint -GET http://localhost:8080/java/api/v1.0/status - -> {% -client.test("Request executed successfully", function() { - client.log(client.global.get("bearerTokenV").toString()); - client.log(client.global.get("bearerTokenQ").toString()); - client.log(client.global.get("bearerTokenM").toString()); - client.log(client.global.get("uuid").toString()); - client.assert(response.status === 200, "Response status is not 200"); -}); -%} - - ### Vincent Login POST http://localhost:8080/java/api/v1.0/auth:login Content-Type: application/json @@ -21,7 +7,9 @@ Content-Type: application/json "password": "123456" } -> {% client.global.set("bearerTokenV", response.headers.valueOf("Authorization")); %} +> {% + client.global.set("bearerTokenV", response.body.token.toString()); +%} ### qrtt1 Login @@ -33,7 +21,9 @@ Content-Type: application/json "password": "123456" } -> {% client.global.set("bearerTokenQ", response.headers.valueOf("Authorization")); %} +> {% + client.global.set("bearerTokenQ", response.body.token.toString()); +%} ### Musk Login @@ -45,14 +35,18 @@ Content-Type: application/json "password": "123456" } -> {% client.global.set("bearerTokenM", response.headers.valueOf("Authorization")); %} +> {% + client.global.set("bearerTokenM", response.body.token.toString()); +%} ### Vincent Join Games POST http://localhost:8080/java/api/v1.0/duelField:join Authorization: Bearer {{bearerTokenV}} -> {% client.global.set("uuid", response.body.duelFieldUuid.toString()); %} +> {% + client.global.set("uuid", response.body.duelFieldUuid.toString()); +%} ### qrtt1 Join Games @@ -60,16 +54,41 @@ POST http://localhost:8080/java/api/v1.0/duelField:join Authorization: Bearer {{bearerTokenQ}} +### Java status endpoint +GET http://localhost:8080/java/api/v1.0/status + +> {% + client.test("Request executed successfully", function () { + client.log(client.global.get("bearerTokenV").toString()); + client.log(client.global.get("bearerTokenQ").toString()); + client.log(client.global.get("bearerTokenM").toString()); + client.log(client.global.get("uuid").toString()); + client.assert(response.status === 200, "Response status is not 200"); + }); +%} + + ### Vincent Get DuelField By Uuid (Duelist) GET http://localhost:8080/java/api/v1.0/duelField/{{uuid}} Authorization: Bearer {{bearerTokenV}} +### qrtt1 Get DuelField By Uuid (Duelist) +GET http://localhost:8080/java/api/v1.0/duelField/{{uuid}} +Authorization: Bearer {{bearerTokenQ}} + + ### Musk Get DuelField By Uuid GET http://localhost:8080/java/api/v1.0/duelField/{{uuid}} Authorization: Bearer {{bearerTokenM}} +### Get DuelField By Uuid SSE +GET http://localhost:8080/java/api/v1.0/duelField/{{uuid}}:sse +Authorization: Bearer {{bearerTokenV}} +Content-Type: text/event-stream + + ### Vincent Draw Card POST http://localhost:8080/java/api/v1.0/duelField/{{uuid}}/LEFT:drawCard Authorization: Bearer {{bearerTokenV}} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/DuelField.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/DuelField.java index d857768..9baf216 100644 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/DuelField.java +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/DuelField.java @@ -5,19 +5,14 @@ import net.purefunc.emoji.Emoji2; import net.purefunc.emoji.Emoji3; import tw.gaas.yugioh.data.dto.DuelFieldDto; -import tw.gaas.yugioh.data.dto.ZoneDto; import tw.gaas.yugioh.data.enu.Phase; import tw.gaas.yugioh.data.enu.Side; import tw.gaas.yugioh.data.enu.State; -import tw.gaas.yugioh.web.security.exception.NotCardInMonsterCards; -import tw.gaas.yugioh.web.security.exception.NotDuelistInZone; -import tw.gaas.yugioh.web.security.exception.NotMonsterCardInHand; -import tw.gaas.yugioh.web.security.exception.NotSpellCardInHand; -import tw.gaas.yugioh.web.security.exception.NotTrapCardInHand; -import tw.gaas.yugioh.web.security.exception.WrongPhase; +import tw.gaas.yugioh.web.security.exception.*; import java.util.LinkedList; import java.util.List; +import java.util.Optional; @ToString public class DuelField { @@ -60,14 +55,14 @@ public void start() { } public void validPhase(Phase phase) { - if (this.phase != phase) throw new WrongPhase(this.phase.name() + " != " + phase.name()); + if (this.phase != phase) throw new WrongPhase(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + this.phase.name() + " != " + phase.name()); } public void validDuelist(Side side, String username) { if (side == Side.LEFT) { - if (!left.validIsDuelist(username)) throw new NotDuelistInZone(username); + if (!left.validIsDuelist(username)) throw new NotDuelistInZone(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + username); } else { - if (!right.validIsDuelist(username)) throw new NotDuelistInZone(username); + if (!right.validIsDuelist(username)) throw new NotDuelistInZone(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + username); } } @@ -96,10 +91,10 @@ public void duelistSkipSummonMonster(Side side) { public void validDuelistSummonMonster(Side side, String uuid) { if (side == Side.LEFT) { if (!left.validIsDuelistMonsterHandCard(uuid)) - throw new NotMonsterCardInHand("Not Monster in Hand " + uuid); + throw new NotMonsterCardInHand(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + "Not Monster in Hand " + uuid); } else { if (!right.validIsDuelistMonsterHandCard(uuid)) - throw new NotMonsterCardInHand("Not Monster in Hand " + uuid); + throw new NotMonsterCardInHand(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + "Not Monster in Hand " + uuid); } } @@ -127,9 +122,9 @@ public void duelistSkipApplySpell(Side side) { public void validDuelistApplySpell(Side side, String uuid) { if (side == Side.LEFT) { - if (!left.validIsDuelistSpellHandCard(uuid)) throw new NotSpellCardInHand("Not Spell in Hand " + uuid); + if (!left.validIsDuelistSpellHandCard(uuid)) throw new NotSpellCardInHand(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + "Not Spell in Hand " + uuid); } else { - if (!right.validIsDuelistSpellHandCard(uuid)) throw new NotSpellCardInHand("Not Spell in Hand " + uuid); + if (!right.validIsDuelistSpellHandCard(uuid)) throw new NotSpellCardInHand(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + "Not Spell in Hand " + uuid); } } @@ -157,9 +152,9 @@ public void duelistSkipCoverTrap(Side side) { public void validDuelistCoverTrap(Side side, String uuid) { if (side == Side.LEFT) { - if (!left.validIsDuelistTrapHandCard(uuid)) throw new NotTrapCardInHand("Not Trap in Hand " + uuid); + if (!left.validIsDuelistTrapHandCard(uuid)) throw new NotTrapCardInHand(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + "Not Trap in Hand " + uuid); } else { - if (!right.validIsDuelistTrapHandCard(uuid)) throw new NotTrapCardInHand("Not Trap in Hand " + uuid); + if (!right.validIsDuelistTrapHandCard(uuid)) throw new NotTrapCardInHand(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + "Not Trap in Hand " + uuid); } } @@ -195,9 +190,9 @@ public void skipFirstRoundBattle() { public void validDuelistStartBattle(Side side, String uuid) { if (side == Side.LEFT) { - if (!left.validIsDuelistMonsterCard(uuid)) throw new NotCardInMonsterCards(uuid); + if (!left.validIsDuelistMonsterCard(uuid)) throw new NotCardInMonsterCards(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + uuid); } else { - if (!right.validIsDuelistMonsterCard(uuid)) throw new NotCardInMonsterCards(uuid); + if (!right.validIsDuelistMonsterCard(uuid)) throw new NotCardInMonsterCards(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + uuid); } } @@ -218,22 +213,20 @@ public Boolean checkIsDuelist(Side side, String username) { } public DuelFieldDto toDto(Boolean isLeftDuelist, Boolean isRightDuelist) { - ZoneDto leftDto = null; - if (left != null) { - leftDto = left.toDto(isLeftDuelist); - } - - ZoneDto rightDto = null; - if (right != null) { - rightDto = right.toDto(isRightDuelist); - } - return DuelFieldDto .builder() .boardMessages(boardMessages) .uuid(uuid) - .left(leftDto) - .right(rightDto) + .left(Optional + .ofNullable(left) + .map(v -> v.toDto(isLeftDuelist)) + .orElse(null) + ) + .right(Optional + .ofNullable(right) + .map(v -> v.toDto(isRightDuelist)) + .orElse(null) + ) .phase(phase) .build(); } diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/manager/GameManager.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/manager/GameManager.java index 35134e9..2158c71 100644 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/manager/GameManager.java +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/manager/GameManager.java @@ -4,22 +4,12 @@ import tw.gaas.yugioh.data.entity.DuelField; import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentLinkedQueue; @Component public class GameManager { - private final ConcurrentLinkedQueue pairPool = new ConcurrentLinkedQueue<>(); private final ConcurrentHashMap uuidAndDuelField = new ConcurrentHashMap<>(); - public String requestPair() { - return pairPool.poll(); - } - - public void submitPairRequest(String duelFieldUuid) { - pairPool.offer(duelFieldUuid); - } - public void putDuelFieldWithUuid(String uuid, DuelField duelField) { uuidAndDuelField.put(uuid, duelField); } diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/manager/PairManager.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/manager/PairManager.java new file mode 100644 index 0000000..320e7c3 --- /dev/null +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/manager/PairManager.java @@ -0,0 +1,20 @@ +package tw.gaas.yugioh.manager; + +import org.springframework.stereotype.Component; + +import java.util.Optional; +import java.util.concurrent.ConcurrentLinkedQueue; + +@Component +public class PairManager { + + private final ConcurrentLinkedQueue pairPool = new ConcurrentLinkedQueue<>(); + + public Optional requestPair() { + return Optional.ofNullable(pairPool.poll()); + } + + public void submitPairRequest(String duelFieldUuid) { + pairPool.offer(duelFieldUuid); + } +} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/controller/AuthController.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/controller/AuthController.java index e7a61de..0e57b14 100644 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/controller/AuthController.java +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/controller/AuthController.java @@ -1,8 +1,6 @@ package tw.gaas.yugioh.web.controller; import lombok.extern.slf4j.Slf4j; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; @@ -14,6 +12,7 @@ import org.springframework.web.bind.annotation.RestController; import tw.gaas.yugioh.web.security.JwtTokenService; import tw.gaas.yugioh.web.security.LoginRequestDto; +import tw.gaas.yugioh.web.security.LoginResponseDto; import java.util.UUID; @@ -35,15 +34,12 @@ public AuthController(AuthenticationManager authenticationManager, JwtTokenServi } @PostMapping("/auth:login") - public ResponseEntity login(@RequestBody LoginRequestDto loginRequestDto) { + public ResponseEntity login(@RequestBody LoginRequestDto loginRequestDto) { authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(loginRequestDto.getUsername(), loginRequestDto.getPassword())); final UserDetails userDetails = springUserDetailsService.loadUserByUsername(loginRequestDto.getUsername()); - final String bearerToken = jwtTokenService.generate(userDetails.getUsername(), UUID.randomUUID().toString()); + final String token = jwtTokenService.generate(userDetails.getUsername(), UUID.randomUUID().toString()); - return ResponseEntity - .status(HttpStatus.OK) - .header(HttpHeaders.AUTHORIZATION, bearerToken) - .body(null); + return ResponseEntity.ok(new LoginResponseDto(token)); } } diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/controller/DuelFieldController.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/controller/DuelFieldController.java index 1dded60..5eb407f 100644 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/controller/DuelFieldController.java +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/controller/DuelFieldController.java @@ -3,13 +3,7 @@ import lombok.extern.slf4j.Slf4j; import net.purefunc.emoji.Emoji2; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.mvc.method.annotation.SseEmitter; import tw.gaas.yugioh.data.dto.CardReqDto; import tw.gaas.yugioh.data.dto.DuelFieldDto; @@ -20,6 +14,7 @@ import tw.gaas.yugioh.data.enu.Side; import tw.gaas.yugioh.manager.GameManager; import tw.gaas.yugioh.manager.NetworkManager; +import tw.gaas.yugioh.manager.PairManager; import tw.gaas.yugioh.web.security.exception.DuelFieldNotFound; import java.io.IOException; @@ -35,10 +30,12 @@ public class DuelFieldController { private final GameManager gameManager; + private final PairManager pairManager; private final NetworkManager networkManager; - public DuelFieldController(GameManager gameManager, NetworkManager networkManager) { + public DuelFieldController(GameManager gameManager, PairManager pairManager, NetworkManager networkManager) { this.gameManager = gameManager; + this.pairManager = pairManager; this.networkManager = networkManager; } @@ -50,34 +47,29 @@ public String getStatus() { @PreAuthorize("hasRole('USER')") @PostMapping("/duelField:join") public Map joinFuelField(Principal principal) { - final String pairDuelFieldUuid = gameManager.requestPair(); - final String duelFieldUuid = UUID.randomUUID().toString(); - final Duelist duelist = new Duelist(principal.getName()); final Zone zone = new Zone(duelist); - if (isLeftDuelist(pairDuelFieldUuid)) { - final DuelField duelField = new DuelField(duelFieldUuid); - duelField.setLeft(zone); - duelField.waitDuelist(); - - gameManager.putDuelFieldWithUuid(duelFieldUuid, duelField); - gameManager.submitPairRequest(duelFieldUuid); - - return Map.of( - "sse", "curl -H \"Accept:text/event-stream\" http://localhost:8080/java/api/v1.0/duelField/" + duelFieldUuid + ":sse", - "duelFieldUuid", duelFieldUuid - ); - } else { - final DuelField duelField = gameManager.findDuelFieldByUuid(pairDuelFieldUuid); - duelField.setRight(zone); - duelField.start(); - - return Map.of( - "sse", "curl -H \"Accept:text/event-stream\" http://localhost:8080/java/api/v1.0/duelField/" + pairDuelFieldUuid + ":sse", - "duelFieldUuid", pairDuelFieldUuid - ); - } + return pairManager + .requestPair() + .map(pairDuelFieldUuid -> { + final DuelField duelField = gameManager.findDuelFieldByUuid(pairDuelFieldUuid); + duelField.setRight(zone); + duelField.start(); + + return Map.of("duelFieldUuid", pairDuelFieldUuid); + }) + .orElseGet(() -> { + final String duelFieldUuid = UUID.randomUUID().toString(); + final DuelField duelField = new DuelField(duelFieldUuid); + duelField.setLeft(zone); + duelField.waitDuelist(); + + pairManager.submitPairRequest(duelFieldUuid); + gameManager.putDuelFieldWithUuid(duelFieldUuid, duelField); + + return Map.of("duelFieldUuid", duelFieldUuid); + }); } @PreAuthorize("hasRole('USER')") @@ -178,7 +170,7 @@ public DuelFieldDto queryDuelField(@PathVariable String uuid, Principal principa } @PreAuthorize("hasRole('USER')") - @GetMapping("/duelField/{uuid}/:sse") + @GetMapping("/duelField/{uuid}:sse") public SseEmitter listenDuelField(@PathVariable String uuid) throws IOException { final SseEmitter sseEmitter = new SseEmitter(0L); sseEmitter.send( @@ -191,8 +183,4 @@ public SseEmitter listenDuelField(@PathVariable String uuid) throws IOException return networkManager.register(uuid, sseEmitter); } - - private boolean isLeftDuelist(String pairDuelFieldUuid) { - return pairDuelFieldUuid == null; - } } diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/LoginResponseDto.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/LoginResponseDto.java new file mode 100644 index 0000000..c1f670c --- /dev/null +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/LoginResponseDto.java @@ -0,0 +1,15 @@ +package tw.gaas.yugioh.web.security; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Builder +@Data +@NoArgsConstructor +@AllArgsConstructor +public class LoginResponseDto { + + private String token; +} diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/SpringUserDetailsService.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/SpringUserDetailsService.java index d1ba9ec..4c60a68 100644 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/SpringUserDetailsService.java +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/SpringUserDetailsService.java @@ -1,5 +1,6 @@ package tw.gaas.yugioh.web.security; +import net.purefunc.emoji.Emoji3; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.User; import org.springframework.security.core.userdetails.UserDetails; @@ -32,6 +33,6 @@ public SpringUserDetailsService() { public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { return Optional .of(userMap.get(username)) - .orElseThrow(() -> new UsernameNotFoundException(username + " not found")); + .orElseThrow(() -> new UsernameNotFoundException(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + username + " not found")); } } \ No newline at end of file From 994b788131ae5598bbdd1cdabeddab2d68af25e0 Mon Sep 17 00:00:00 2001 From: Vincent Huang iMac Date: Sun, 11 Dec 2022 20:07:31 +0800 Subject: [PATCH 03/12] :art: refactor: reorg --- .../tw/gaas/yugioh/data/entity/DuelField.java | 89 ++++++++++--------- .../tw/gaas/yugioh/data/entity/Duelist.java | 36 ++++---- .../java/tw/gaas/yugioh/data/entity/Zone.java | 58 ++++++------ 3 files changed, 91 insertions(+), 92 deletions(-) diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/DuelField.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/DuelField.java index 9baf216..8b94fae 100644 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/DuelField.java +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/DuelField.java @@ -48,21 +48,64 @@ public void waitDuelist() { } public void start() { - left.setup(); - right.setup(); + left.start(); + right.start(); this.phase = Phase.LEFT_DRAW; boardMessages.add(String.format("%s Game Start. Waiting for %s Draw", Emoji3.TRIANGULAR_FLAG, left.getDuelist().getName())); } public void validPhase(Phase phase) { - if (this.phase != phase) throw new WrongPhase(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + this.phase.name() + " != " + phase.name()); + if (this.phase != phase) + throw new WrongPhase(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + this.phase.name() + " != " + phase.name()); } public void validDuelist(Side side, String username) { if (side == Side.LEFT) { - if (!left.validIsDuelist(username)) throw new NotDuelistInZone(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + username); + if (!left.validDuelist(username)) + throw new NotDuelistInZone(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + username); } else { - if (!right.validIsDuelist(username)) throw new NotDuelistInZone(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + username); + if (!right.validDuelist(username)) + throw new NotDuelistInZone(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + username); + } + } + + public void validDuelistSummonMonster(Side side, String uuid) { + if (side == Side.LEFT) { + if (!left.validDuelistMonsterHandCard(uuid)) + throw new NotMonsterCardInHand(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + "Not Monster in Hand " + uuid); + } else { + if (!right.validDuelistMonsterHandCard(uuid)) + throw new NotMonsterCardInHand(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + "Not Monster in Hand " + uuid); + } + } + + public void validDuelistApplySpell(Side side, String uuid) { + if (side == Side.LEFT) { + if (!left.validDuelistSpellHandCard(uuid)) + throw new NotSpellCardInHand(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + "Not Spell in Hand " + uuid); + } else { + if (!right.validDuelistSpellHandCard(uuid)) + throw new NotSpellCardInHand(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + "Not Spell in Hand " + uuid); + } + } + + public void validDuelistCoverTrap(Side side, String uuid) { + if (side == Side.LEFT) { + if (!left.validDuelistTrapHandCard(uuid)) + throw new NotTrapCardInHand(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + "Not Trap in Hand " + uuid); + } else { + if (!right.validDuelistTrapHandCard(uuid)) + throw new NotTrapCardInHand(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + "Not Trap in Hand " + uuid); + } + } + + public void validDuelistStartBattle(Side side, String uuid) { + if (side == Side.LEFT) { + if (!left.validDuelistMonsterCard(uuid)) + throw new NotCardInMonsterCards(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + uuid); + } else { + if (!right.validDuelistMonsterCard(uuid)) + throw new NotCardInMonsterCards(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + uuid); } } @@ -88,16 +131,6 @@ public void duelistSkipSummonMonster(Side side) { } } - public void validDuelistSummonMonster(Side side, String uuid) { - if (side == Side.LEFT) { - if (!left.validIsDuelistMonsterHandCard(uuid)) - throw new NotMonsterCardInHand(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + "Not Monster in Hand " + uuid); - } else { - if (!right.validIsDuelistMonsterHandCard(uuid)) - throw new NotMonsterCardInHand(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + "Not Monster in Hand " + uuid); - } - } - public void duelistSummonMonster(Side side, String uuid, State state) { if (side == Side.LEFT) { left.duelistSummonMonster(uuid, state); @@ -120,14 +153,6 @@ public void duelistSkipApplySpell(Side side) { } } - public void validDuelistApplySpell(Side side, String uuid) { - if (side == Side.LEFT) { - if (!left.validIsDuelistSpellHandCard(uuid)) throw new NotSpellCardInHand(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + "Not Spell in Hand " + uuid); - } else { - if (!right.validIsDuelistSpellHandCard(uuid)) throw new NotSpellCardInHand(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + "Not Spell in Hand " + uuid); - } - } - public void duelistApplySpell(Side side, String uuid) { if (side == Side.LEFT) { left.duelistApplySpell(uuid); @@ -150,14 +175,6 @@ public void duelistSkipCoverTrap(Side side) { } } - public void validDuelistCoverTrap(Side side, String uuid) { - if (side == Side.LEFT) { - if (!left.validIsDuelistTrapHandCard(uuid)) throw new NotTrapCardInHand(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + "Not Trap in Hand " + uuid); - } else { - if (!right.validIsDuelistTrapHandCard(uuid)) throw new NotTrapCardInHand(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + "Not Trap in Hand " + uuid); - } - } - public void duelistCoverTrap(Side side, String uuid, State state) { if (side == Side.LEFT) { left.duelistCoverTrap(uuid, state); @@ -188,14 +205,6 @@ public void skipFirstRoundBattle() { } } - public void validDuelistStartBattle(Side side, String uuid) { - if (side == Side.LEFT) { - if (!left.validIsDuelistMonsterCard(uuid)) throw new NotCardInMonsterCards(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + uuid); - } else { - if (!right.validIsDuelistMonsterCard(uuid)) throw new NotCardInMonsterCards(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + uuid); - } - } - public void duelistStartBattle(Side side, String uuid) { if (side == Side.LEFT) { left.duelistStartBattle(uuid, right); @@ -209,7 +218,7 @@ public void duelistStartBattle(Side side, String uuid) { } public Boolean checkIsDuelist(Side side, String username) { - return side == Side.LEFT ? left.validIsDuelist(username) : right.validIsDuelist(username); + return side == Side.LEFT ? left.validDuelist(username) : right.validDuelist(username); } public DuelFieldDto toDto(Boolean isLeftDuelist, Boolean isRightDuelist) { diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/Duelist.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/Duelist.java index 8b462b4..c72ba8d 100644 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/Duelist.java +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/Duelist.java @@ -19,54 +19,50 @@ public class Duelist { public Duelist(String name) { this.name = name; - this.lp = 0; + this.lp = 4000; this.handCards = new HandCards(); } - public String getName() { - return name; + public Boolean validDuelist(String username) { + return this.name.equals(username); } - public void initLp() { - this.lp = 4000; + public Boolean validDuelistMonsterHandCard(String uuid) { + return handCards.containsThisMonsterCard(uuid); } - public void drawCards(Card... draw) { - Arrays.stream(draw).forEach(v -> handCards.draw(v)); + public Boolean validDuelistSpellHandCard(String uuid) { + return handCards.containsThisSpellCard(uuid); } - public boolean validIsDuelist(String username) { - return this.name.equals(username); + public Boolean validDuelistTrapHandCard(String uuid) { + return handCards.containsThisTrapCard(uuid); } - public boolean validIsDuelistMonsterHandCard(String uuid) { - return handCards.containsThisMonsterCard(uuid); + public void drawCards(Card... draw) { + Arrays.stream(draw).forEach(v -> handCards.draw(v)); } public Card summonMonster(String uuid) { return handCards.submit(uuid); } - public boolean validIsDuelistSpellHandCard(String uuid) { - return handCards.containsThisSpellCard(uuid); - } - public Card applySpell(String uuid) { return handCards.submit(uuid); } - public boolean validIsDuelistTrapHandCard(String uuid) { - return handCards.containsThisTrapCard(uuid); - } - public Card coverTrap(String uuid) { return handCards.submit(uuid); } - public void updateScore(Integer scoreDelta) { + public void startBattle(Integer scoreDelta) { this.lp = this.lp - scoreDelta; } + public String getName() { + return name; + } + public DuelistDto toDto(Boolean isDuelist) { return DuelistDto .builder() diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/Zone.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/Zone.java index c09b197..e336aec 100644 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/Zone.java +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/Zone.java @@ -2,12 +2,7 @@ import lombok.ToString; import tw.gaas.yugioh.data.dto.ZoneDto; -import tw.gaas.yugioh.data.entity.card.Card; -import tw.gaas.yugioh.data.entity.card.Deck; -import tw.gaas.yugioh.data.entity.card.GraveYardCards; -import tw.gaas.yugioh.data.entity.card.MonsterCard; -import tw.gaas.yugioh.data.entity.card.MonsterCards; -import tw.gaas.yugioh.data.entity.card.SpellAndTrapCards; +import tw.gaas.yugioh.data.entity.card.*; import tw.gaas.yugioh.data.enu.State; @ToString @@ -32,26 +27,33 @@ public Zone(Duelist duelist) { this.deck = new Deck(); } - public Duelist getDuelist() { - return duelist; - } - - public void setup() { - duelist.initLp(); + public void start() { deck.shuffling(); duelist.drawCards(deck.draw(), deck.draw(), deck.draw(), deck.draw(), deck.draw(), deck.draw()); } - public boolean validIsDuelist(String username) { - return duelist.validIsDuelist(username); + public Boolean validDuelist(String username) { + return duelist.validDuelist(username); } - public void duelistDraw() { - duelist.drawCards(deck.draw()); + public Boolean validDuelistMonsterHandCard(String uuid) { + return duelist.validDuelistMonsterHandCard(uuid); + } + + public Boolean validDuelistSpellHandCard(String uuid) { + return duelist.validDuelistSpellHandCard(uuid); + } + + public Boolean validDuelistTrapHandCard(String uuid) { + return duelist.validDuelistTrapHandCard(uuid); + } + + public Boolean validDuelistMonsterCard(String uuid) { + return monsterCards.validIsDuelistMonsterCard(uuid); } - public boolean validIsDuelistMonsterHandCard(String uuid) { - return duelist.validIsDuelistMonsterHandCard(uuid); + public void duelistDraw() { + duelist.drawCards(deck.draw()); } public void duelistSummonMonster(String uuid, State state) { @@ -59,29 +61,17 @@ public void duelistSummonMonster(String uuid, State state) { monsterCards.summon(card, state); } - public boolean validIsDuelistSpellHandCard(String uuid) { - return duelist.validIsDuelistSpellHandCard(uuid); - } - public void duelistApplySpell(String uuid) { Card card = duelist.applySpell(uuid); // TODO: apply effect } - public boolean validIsDuelistTrapHandCard(String uuid) { - return duelist.validIsDuelistTrapHandCard(uuid); - } - public void duelistCoverTrap(String uuid, State state) { final Card card = duelist.coverTrap(uuid); spellAndTrapCards.cover(card, state); } - public boolean validIsDuelistMonsterCard(String uuid) { - return monsterCards.validIsDuelistMonsterCard(uuid); - } - public void duelistStartBattle(String uuid, Zone zone) { final MonsterCard monsterCard = (MonsterCard) monsterCards.startBattle(uuid); final MonsterCard target = zone.monsterCards.chooseTarget(); @@ -92,11 +82,11 @@ public void duelistStartBattle(String uuid, Zone zone) { zone.monsterCards.moveToGraveYard(target); zone.graveYardCards.put(target); } - zone.duelist.updateScore(scoreDelta); + zone.duelist.startBattle(scoreDelta); } else if (scoreDelta < 0) { this.monsterCards.moveToGraveYard(monsterCard); this.graveYardCards.put(monsterCard); - duelist.updateScore(scoreDelta); + duelist.startBattle(scoreDelta); } else { zone.monsterCards.moveToGraveYard(target); zone.graveYardCards.put(target); @@ -105,6 +95,10 @@ public void duelistStartBattle(String uuid, Zone zone) { } } + public Duelist getDuelist() { + return duelist; + } + public ZoneDto toDto(Boolean isDuelist) { return ZoneDto .builder() From c2cd79bcdeec83f93fc3d3b4dc8ae7747dcfa227 Mon Sep 17 00:00:00 2001 From: Vincent Huang iMac Date: Tue, 13 Dec 2022 20:01:03 +0800 Subject: [PATCH 04/12] :art: refactor: rename --- yugioh-20221012/http/test-kotlin.http | 160 ------------------ .../http/{test-java.http => test.http} | 20 ++- .../tw/gaas/yugioh/data/entity/DuelField.java | 2 +- .../gaas/yugioh/data/entity/card/Cards.java | 19 +-- 4 files changed, 19 insertions(+), 182 deletions(-) delete mode 100644 yugioh-20221012/http/test-kotlin.http rename yugioh-20221012/http/{test-java.http => test.http} (90%) diff --git a/yugioh-20221012/http/test-kotlin.http b/yugioh-20221012/http/test-kotlin.http deleted file mode 100644 index ad00b03..0000000 --- a/yugioh-20221012/http/test-kotlin.http +++ /dev/null @@ -1,160 +0,0 @@ -### Kotlin status endpoint -GET http://localhost:8080/kotlin/api/v1.0/status - -> {% -client.test("Request executed successfully", function() { - client.log(client.global.get("bearerTokenV").toString()); - client.log(client.global.get("bearerTokenQ").toString()); - client.log(client.global.get("bearerTokenM").toString()); - client.log(client.global.get("uuid").toString()); - client.assert(response.status === 200, "Response status is not 200"); -}); -%} - - -### Vincent Login -POST http://localhost:8080/java/api/v1.0/auth:login -Content-Type: application/json - -{ - "username": "vincent", - "password": "123456" -} - -> {% client.global.set("bearerTokenV", response.headers.valueOf("Authorization")); %} - - -### qrtt1 Login -POST http://localhost:8080/java/api/v1.0/auth:login -Content-Type: application/json - -{ - "username": "qrtt1", - "password": "123456" -} - -> {% client.global.set("bearerTokenQ", response.headers.valueOf("Authorization")); %} - - -### Musk Login -POST http://localhost:8080/java/api/v1.0/auth:login -Content-Type: application/json - -{ - "username": "musk", - "password": "123456" -} - -> {% client.global.set("bearerTokenM", response.headers.valueOf("Authorization")); %} - - -### Vincent Join Games -POST http://localhost:8080/java/api/v1.0/duelField:join -Authorization: Bearer {{bearerTokenV}} - -> {% client.global.set("uuid", response.body.duelFieldUuid.toString()); %} - - -### qrtt1 Join Games -POST http://localhost:8080/java/api/v1.0/duelField:join -Authorization: Bearer {{bearerTokenQ}} - - -### Vincent Get DuelField By Uuid (Duelist) -GET http://localhost:8080/java/api/v1.0/duelField/{{uuid}} -Authorization: Bearer {{bearerTokenV}} - - -### Musk Get DuelField By Uuid -GET http://localhost:8080/java/api/v1.0/duelField/{{uuid}} -Authorization: Bearer {{bearerTokenM}} - - -### Vincent Draw Card -POST http://localhost:8080/java/api/v1.0/duelField/{{uuid}}/left:drawCard -Authorization: Bearer {{bearerTokenV}} - - -### Vincent Summon Monster -POST http://localhost:8080/java/api/v1.0/duelField/{{uuid}}/left:summonMonster -Authorization: Bearer {{bearerTokenV}} -Content-Type: application/json - -{ - "uuid": "cf889eb6-01bc-4ff7-b4da-f1e3040e7efb" -} - - -### Vincent Apply Spell -POST http://localhost:8080/java/api/v1.0/duelField/{{uuid}}/left:applySpell -Authorization: Bearer {{bearerTokenV}} -Content-Type: application/json - -{ - "uuid": "f438be30-39db-4a95-9b9a-fb5939731650" -} - - -### Vincent Cover Trap -POST http://localhost:8080/java/api/v1.0/duelField/{{uuid}}/left:coverTrap -Authorization: Bearer {{bearerTokenV}} -Content-Type: application/json - -{ - "uuid": "4dc4120a-a8c4-4dec-b2e3-3f5c5b138a1d", - "state": "BACK" -} - -### Vincent Start Battle -POST http://localhost:8080/java/api/v1.0/duelField/{{uuid}}/left:startBattle -Authorization: Bearer {{bearerTokenV}} -Content-Type: application/json - -{ - "uuid": "" -} - - -### qrtt1 Draw Card -POST http://localhost:8080/java/api/v1.0/duelField/{{uuid}}/right:drawCard -Authorization: Bearer {{bearerTokenQ}} - - -### qrtt1 Summon Monster -POST http://localhost:8080/java/api/v1.0/duelField/{{uuid}}/right:summonMonster -Authorization: Bearer {{bearerTokenQ}} -Content-Type: application/json - -{ - "uuid": "" -} - - -### qrtt1 Apply Spell -POST http://localhost:8080/java/api/v1.0/duelField/{{uuid}}/right:applySpell -Authorization: Bearer {{bearerTokenQ}} -Content-Type: application/json - -{ - "uuid": "" -} - - -### qrtt1 Cover Trap -POST http://localhost:8080/java/api/v1.0/duelField/{{uuid}}/right:coverTrap -Authorization: Bearer {{bearerTokenQ}} -Content-Type: application/json - -{ - "uuid": "", - "state": "BACK" -} - -### qrtt1 Start Battle -POST http://localhost:8080/java/api/v1.0/duelField/{{uuid}}/right:startBattle -Authorization: Bearer {{bearerTokenQ}} -Content-Type: application/json - -{ - "uuid": "" -} diff --git a/yugioh-20221012/http/test-java.http b/yugioh-20221012/http/test.http similarity index 90% rename from yugioh-20221012/http/test-java.http rename to yugioh-20221012/http/test.http index 46cf277..630981f 100644 --- a/yugioh-20221012/http/test-java.http +++ b/yugioh-20221012/http/test.http @@ -100,17 +100,17 @@ Authorization: Bearer {{bearerTokenV}} Content-Type: application/json { - "uuid": "d0f01132-9ad7-4e5c-bae1-a067e18fbbf9" + "uuid": "cdba5b3e-be63-4b96-997a-962670991a18" } ### Vincent Apply Spell -POST http://localhost:8080/java/api/v1.0/duelField/{{uuid}}/LEFT:applySpell?skip=true +POST http://localhost:8080/java/api/v1.0/duelField/{{uuid}}/LEFT:applySpell Authorization: Bearer {{bearerTokenV}} Content-Type: application/json { - "uuid": "860481ab-1cdd-4539-8910-b5c80b92a2e6" + "uuid": "31fbedcd-df7e-4b5c-bb78-cff0a48a10dd" } @@ -120,17 +120,18 @@ Authorization: Bearer {{bearerTokenV}} Content-Type: application/json { - "uuid": "99dff81d-a922-4346-b806-6339304c3c61", + "uuid": "152927b0-6a4d-4baa-828d-5d65b2ef58a8", "state": "BACK" } + ### Vincent Start Battle POST http://localhost:8080/java/api/v1.0/duelField/{{uuid}}/LEFT:startBattle Authorization: Bearer {{bearerTokenV}} Content-Type: application/json { - "uuid": "5ba31681-6ce6-4805-9dd7-98c778dd63b8" + "uuid": "0f11eac8-2a89-45fb-bde8-9a157694e843" } @@ -145,7 +146,7 @@ Authorization: Bearer {{bearerTokenQ}} Content-Type: application/json { - "uuid": "65178d75-ba3a-4f3f-806e-318b6b2a72ac" + "uuid": "64967479-cd92-4b8d-88d8-ce4f3804e3c0" } @@ -155,7 +156,7 @@ Authorization: Bearer {{bearerTokenQ}} Content-Type: application/json { - "uuid": "94ab5d8d-a763-459e-88d2-c5e8e44a7a51" + "uuid": "d968a1bd-bc5b-4797-be23-1ea4fd5cb2f5" } @@ -165,12 +166,13 @@ Authorization: Bearer {{bearerTokenQ}} Content-Type: application/json { - "uuid": "86d54dda-777f-4243-b842-dfa430f5a535", + "uuid": "13a0291b-74b6-4c9a-ba68-f7f0cb7e31bb", "state": "BACK" } + ### qrtt1 Start Battle -POST http://localhost:8080/java/api/v1.0/duelField/{{uuid}}/RIGHT:startBattle?skip=true +POST http://localhost:8080/java/api/v1.0/duelField/{{uuid}}/RIGHT:startBattle Authorization: Bearer {{bearerTokenQ}} Content-Type: application/json diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/DuelField.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/DuelField.java index 8b94fae..4272c18 100644 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/DuelField.java +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/DuelField.java @@ -40,7 +40,7 @@ public void setLeft(Zone left) { public void setRight(Zone zone) { this.right = zone; - boardMessages.add(String.format("%s Right Duelist %s Entered", Emoji2.MILITARY_MEDAL, left.getDuelist().getName())); + boardMessages.add(String.format("%s Right Duelist %s Entered", Emoji2.MILITARY_MEDAL, right.getDuelist().getName())); } public void waitDuelist() { diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/Cards.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/Cards.java index b8891e8..f51b324 100644 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/Cards.java +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/card/Cards.java @@ -2,12 +2,7 @@ import lombok.ToString; import tw.gaas.yugioh.data.dto.CardsDto; -import tw.gaas.yugioh.data.enu.Attribute; -import tw.gaas.yugioh.data.enu.MonsterType; -import tw.gaas.yugioh.data.enu.SpellType; -import tw.gaas.yugioh.data.enu.State; -import tw.gaas.yugioh.data.enu.TrapType; -import tw.gaas.yugioh.data.enu.Type; +import tw.gaas.yugioh.data.enu.*; import java.util.LinkedList; import java.util.List; @@ -30,7 +25,7 @@ public abstract class Cards { .defense(2500) .build(); - private static final MonsterCard Dark_Magician = + private static final MonsterCard DarkMagician = MonsterCard .builder() .state(State.BACK) @@ -44,7 +39,7 @@ public abstract class Cards { .defense(2100) .build(); - private static final SpellCard MONSTER_REBORN = + private static final SpellCard MonsterReborn = SpellCard .builder() .state(State.BACK) @@ -55,7 +50,7 @@ public abstract class Cards { .build(); - private static final TrapCard MIRROR_FORCE = + private static final TrapCard MirrorForce = TrapCard .builder() .state(State.BACK) @@ -67,9 +62,9 @@ public abstract class Cards { protected static final List library = List.of( BlueEyesShiningDragon, - Dark_Magician, - MONSTER_REBORN, - MIRROR_FORCE + DarkMagician, + MonsterReborn, + MirrorForce ); // 上限 From 274ac370b34eda853cb89944fe13d8ebb7f8404e Mon Sep 17 00:00:00 2001 From: Vincent Huang iMac Date: Tue, 13 Dec 2022 20:42:57 +0800 Subject: [PATCH 05/12] :art: refactor: fix --- .../security/SpringUserDetailsService.java | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/SpringUserDetailsService.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/SpringUserDetailsService.java index 4c60a68..1ff439a 100644 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/SpringUserDetailsService.java +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/security/SpringUserDetailsService.java @@ -1,6 +1,5 @@ package tw.gaas.yugioh.web.security; -import net.purefunc.emoji.Emoji3; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.User; import org.springframework.security.core.userdetails.UserDetails; @@ -10,29 +9,15 @@ import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Component; -import java.util.HashMap; import java.util.List; -import java.util.Map; -import java.util.Optional; @Component public class SpringUserDetailsService implements UserDetailsService { - private final Map userMap; - - public SpringUserDetailsService() { - final PasswordEncoder passwordEncoder = new BCryptPasswordEncoder(); - userMap = new HashMap<>() {{ - put("vincent", new User("vincent", passwordEncoder.encode("123456"), List.of(new SimpleGrantedAuthority("ROLE_USER")))); - put("qrtt1", new User("qrtt1", passwordEncoder.encode("123456"), List.of(new SimpleGrantedAuthority("ROLE_USER")))); - put("musk", new User("musk", passwordEncoder.encode("123456"), List.of(new SimpleGrantedAuthority("ROLE_USER")))); - }}; - } + private final PasswordEncoder passwordEncoder = new BCryptPasswordEncoder(); @Override public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { - return Optional - .of(userMap.get(username)) - .orElseThrow(() -> new UsernameNotFoundException(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + username + " not found")); + return new User(username, passwordEncoder.encode("123456"), List.of(new SimpleGrantedAuthority("ROLE_USER"))); } } \ No newline at end of file From d8d5ff68981b0791fef889503cc1b2138697d209 Mon Sep 17 00:00:00 2001 From: Vincent Huang iMac Date: Sun, 8 Jan 2023 18:23:59 +0800 Subject: [PATCH 06/12] refactor: update style --- README.md | 1 + yugioh-20221012/{http => .http}/test.http | 30 +-- .../tw/gaas/yugioh/data/entity/DuelField.java | 243 +++++++++++------- .../tw/gaas/yugioh/data/entity/Duelist.java | 6 +- .../java/tw/gaas/yugioh/data/entity/Zone.java | 15 +- .../yugioh/web/controller/AuthController.java | 28 +- .../web/controller/DuelFieldController.java | 129 +++++----- 7 files changed, 262 insertions(+), 190 deletions(-) rename yugioh-20221012/{http => .http}/test.http (89%) diff --git a/README.md b/README.md index ce45886..b3ddf50 100644 --- a/README.md +++ b/README.md @@ -38,4 +38,5 @@ 3. [遊戲王第三次開會](https://youtu.be/HZFNxIcTyQM) 4. [遊戲王第四次開會](https://youtu.be/yCsG4E655xU) 5. [遊戲王第五次開會](https://youtu.be/F6Cfz6IpBgo) +6. [遊戲王第六次開會](https://youtu.be/QzR8h71O60U) diff --git a/yugioh-20221012/http/test.http b/yugioh-20221012/.http/test.http similarity index 89% rename from yugioh-20221012/http/test.http rename to yugioh-20221012/.http/test.http index 630981f..2cc36fa 100644 --- a/yugioh-20221012/http/test.http +++ b/yugioh-20221012/.http/test.http @@ -27,17 +27,17 @@ Content-Type: application/json ### Musk Login -POST http://localhost:8080/java/api/v1.0/auth:login -Content-Type: application/json - -{ - "username": "musk", - "password": "123456" -} - -> {% - client.global.set("bearerTokenM", response.body.token.toString()); -%} +#POST http://localhost:8080/java/api/v1.0/auth:login +#Content-Type: application/json +# +#{ +# "username": "musk", +# "password": "123456" +#} +# +#> {% +# client.global.set("bearerTokenM", response.body.token.toString()); +#%} ### Vincent Join Games @@ -61,7 +61,7 @@ GET http://localhost:8080/java/api/v1.0/status client.test("Request executed successfully", function () { client.log(client.global.get("bearerTokenV").toString()); client.log(client.global.get("bearerTokenQ").toString()); - client.log(client.global.get("bearerTokenM").toString()); + // client.log(client.global.get("bearerTokenM").toString()); client.log(client.global.get("uuid").toString()); client.assert(response.status === 200, "Response status is not 200"); }); @@ -78,9 +78,9 @@ GET http://localhost:8080/java/api/v1.0/duelField/{{uuid}} Authorization: Bearer {{bearerTokenQ}} -### Musk Get DuelField By Uuid -GET http://localhost:8080/java/api/v1.0/duelField/{{uuid}} -Authorization: Bearer {{bearerTokenM}} +#### Musk Get DuelField By Uuid +#GET http://localhost:8080/java/api/v1.0/duelField/{{uuid}} +#Authorization: Bearer {{bearerTokenM}} ### Get DuelField By Uuid SSE diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/DuelField.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/DuelField.java index 4272c18..f76ce7d 100644 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/DuelField.java +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/DuelField.java @@ -17,9 +17,9 @@ @ToString public class DuelField { - private List boardMessages = new LinkedList<>(); + private final List boardMessages = new LinkedList<>(); // UUID - private String uuid; + private final String uuid; // 左邊場地 private Zone left; // 右邊場地 @@ -30,20 +30,20 @@ public class DuelField { public DuelField(String uuid) { this.uuid = uuid; - boardMessages.add(String.format("%s DuelField %s Init", Emoji2.TROPHY, uuid)); + boardcast(String.format("%s DuelField %s Init", Emoji2.TROPHY, uuid)); } - public void setLeft(Zone left) { + public void initLeft(Zone left) { this.left = left; - boardMessages.add(String.format("%s Left Duelist %s Entered", Emoji2.MILITARY_MEDAL, left.getDuelist().getName())); + boardcast(String.format("%s Left Duelist %s Entered", Emoji2.MILITARY_MEDAL, left.getDuelist().getName())); } - public void setRight(Zone zone) { + public void initRight(Zone zone) { this.right = zone; - boardMessages.add(String.format("%s Right Duelist %s Entered", Emoji2.MILITARY_MEDAL, right.getDuelist().getName())); + boardcast(String.format("%s Right Duelist %s Entered", Emoji2.MILITARY_MEDAL, right.getDuelist().getName())); } - public void waitDuelist() { + public void waitRight() { this.phase = Phase.INIT; } @@ -51,149 +51,126 @@ public void start() { left.start(); right.start(); this.phase = Phase.LEFT_DRAW; - boardMessages.add(String.format("%s Game Start. Waiting for %s Draw", Emoji3.TRIANGULAR_FLAG, left.getDuelist().getName())); + boardcast(String.format("%s Game Start. Waiting for %s Draw", Emoji3.TRIANGULAR_FLAG, left.getDuelist().getName())); } - public void validPhase(Phase phase) { - if (this.phase != phase) - throw new WrongPhase(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + this.phase.name() + " != " + phase.name()); - } - - public void validDuelist(Side side, String username) { - if (side == Side.LEFT) { - if (!left.validDuelist(username)) - throw new NotDuelistInZone(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + username); - } else { - if (!right.validDuelist(username)) - throw new NotDuelistInZone(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + username); - } - } - - public void validDuelistSummonMonster(Side side, String uuid) { - if (side == Side.LEFT) { - if (!left.validDuelistMonsterHandCard(uuid)) - throw new NotMonsterCardInHand(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + "Not Monster in Hand " + uuid); - } else { - if (!right.validDuelistMonsterHandCard(uuid)) - throw new NotMonsterCardInHand(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + "Not Monster in Hand " + uuid); - } - } - - public void validDuelistApplySpell(Side side, String uuid) { - if (side == Side.LEFT) { - if (!left.validDuelistSpellHandCard(uuid)) - throw new NotSpellCardInHand(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + "Not Spell in Hand " + uuid); - } else { - if (!right.validDuelistSpellHandCard(uuid)) - throw new NotSpellCardInHand(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + "Not Spell in Hand " + uuid); - } - } - - public void validDuelistCoverTrap(Side side, String uuid) { - if (side == Side.LEFT) { - if (!left.validDuelistTrapHandCard(uuid)) - throw new NotTrapCardInHand(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + "Not Trap in Hand " + uuid); - } else { - if (!right.validDuelistTrapHandCard(uuid)) - throw new NotTrapCardInHand(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + "Not Trap in Hand " + uuid); - } - } + public void duelistDraw( + Side side, + String duelistName + ) { + validPhase(side == Side.LEFT ? Phase.LEFT_DRAW : Phase.RIGHT_DRAW); + validDuelist(side, duelistName); - public void validDuelistStartBattle(Side side, String uuid) { - if (side == Side.LEFT) { - if (!left.validDuelistMonsterCard(uuid)) - throw new NotCardInMonsterCards(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + uuid); - } else { - if (!right.validDuelistMonsterCard(uuid)) - throw new NotCardInMonsterCards(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + uuid); - } - } - - public void duelistDraw(Side side) { if (side == Side.LEFT) { left.duelistDraw(); this.phase = Phase.LEFT_MONSTER; - boardMessages.add(String.format("%s Finished Draw. Waiting for %s Summon Monster", Emoji0.RAISED_BACK_OF_HAND, left.getDuelist().getName())); + boardcast(String.format("%s Finished Draw. Waiting for %s Summon Monster", Emoji0.RAISED_BACK_OF_HAND, left.getDuelist().getName())); } else { right.duelistDraw(); this.phase = Phase.RIGHT_MONSTER; - boardMessages.add(String.format("%s Finished Draw. Waiting for %s Summon Monster", Emoji0.RAISED_BACK_OF_HAND, right.getDuelist().getName())); + boardcast(String.format("%s Finished Draw. Waiting for %s Summon Monster", Emoji0.RAISED_BACK_OF_HAND, right.getDuelist().getName())); } } public void duelistSkipSummonMonster(Side side) { if (side == Side.LEFT) { this.phase = Phase.LEFT_SPELL; - boardMessages.add(String.format("%s Skip Summon Monster. Waiting for %s Apply Spell", Emoji0.OGRE, left.getDuelist().getName())); + boardcast(String.format("%s Skip Summon Monster. Waiting for %s Apply Spell", Emoji0.OGRE, left.getDuelist().getName())); } else { this.phase = Phase.RIGHT_SPELL; - boardMessages.add(String.format("%s Skip Summon Monster. Waiting for %s Apply Spell", Emoji0.OGRE, right.getDuelist().getName())); + boardcast(String.format("%s Skip Summon Monster. Waiting for %s Apply Spell", Emoji0.OGRE, right.getDuelist().getName())); } } - public void duelistSummonMonster(Side side, String uuid, State state) { + public void duelistSummonMonster( + Side side, + String uuid, + State state, + String duelistName + ) { + validDuelistSummonMonster(side, uuid); + validPhase(side == Side.LEFT ? Phase.LEFT_MONSTER : Phase.RIGHT_MONSTER); + validDuelist(side, duelistName); + if (side == Side.LEFT) { left.duelistSummonMonster(uuid, state); this.phase = Phase.LEFT_SPELL; - boardMessages.add(String.format("%s Finished Summon Monster. Waiting for %s Apply Spell", Emoji0.OGRE, left.getDuelist().getName())); + boardcast(String.format("%s Finished Summon Monster. Waiting for %s Apply Spell", Emoji0.OGRE, left.getDuelist().getName())); } else { right.duelistSummonMonster(uuid, state); this.phase = Phase.RIGHT_SPELL; - boardMessages.add(String.format("%s Finished Summon Monster. Waiting for %s Apply Spell", Emoji0.OGRE, right.getDuelist().getName())); + boardcast(String.format("%s Finished Summon Monster. Waiting for %s Apply Spell", Emoji0.OGRE, right.getDuelist().getName())); } } public void duelistSkipApplySpell(Side side) { if (side == Side.LEFT) { this.phase = Phase.LEFT_TRAP; - boardMessages.add(String.format("%s Skip Apply Spell. Waiting for %s Cover Trap", Emoji0.DIZZY, left.getDuelist().getName())); + boardcast(String.format("%s Skip Apply Spell. Waiting for %s Cover Trap", Emoji0.DIZZY, left.getDuelist().getName())); } else { this.phase = Phase.RIGHT_TRAP; - boardMessages.add(String.format("%s Skip Apply Spell. Waiting for %s Cover Trap", Emoji0.DIZZY, right.getDuelist().getName())); + boardcast(String.format("%s Skip Apply Spell. Waiting for %s Cover Trap", Emoji0.DIZZY, right.getDuelist().getName())); } } - public void duelistApplySpell(Side side, String uuid) { + public void duelistApplySpell( + Side side, + String uuid, + String duelistName + ) { + validDuelistApplySpell(side, uuid); + validPhase(side == Side.LEFT ? Phase.LEFT_SPELL : Phase.RIGHT_SPELL); + validDuelist(side, duelistName); + if (side == Side.LEFT) { left.duelistApplySpell(uuid); this.phase = Phase.LEFT_TRAP; - boardMessages.add(String.format("%s Finished Apply Spell. Waiting for %s Cover Trap", Emoji0.DIZZY, left.getDuelist().getName())); + boardcast(String.format("%s Finished Apply Spell. Waiting for %s Cover Trap", Emoji0.DIZZY, left.getDuelist().getName())); } else { right.duelistApplySpell(uuid); this.phase = Phase.RIGHT_TRAP; - boardMessages.add(String.format("%s Finished Apply Spell. Waiting for %s Cover Trap", Emoji0.DIZZY, right.getDuelist().getName())); + boardcast(String.format("%s Finished Apply Spell. Waiting for %s Cover Trap", Emoji0.DIZZY, right.getDuelist().getName())); } } public void duelistSkipCoverTrap(Side side) { if (side == Side.LEFT) { this.phase = Phase.LEFT_BATTLE; - boardMessages.add(String.format("%s Skip Cover Trap. Waiting for %s Battle", Emoji3.WHITE_LARGE_SQUARE, left.getDuelist().getName())); + boardcast(String.format("%s Skip Cover Trap. Waiting for %s Battle", Emoji3.WHITE_LARGE_SQUARE, left.getDuelist().getName())); } else { this.phase = Phase.RIGHT_BATTLE; - boardMessages.add(String.format("%s Skip Cover Trap. Waiting for %s Battle", Emoji3.WHITE_LARGE_SQUARE, right.getDuelist().getName())); + boardcast(String.format("%s Skip Cover Trap. Waiting for %s Battle", Emoji3.WHITE_LARGE_SQUARE, right.getDuelist().getName())); } } - public void duelistCoverTrap(Side side, String uuid, State state) { + public void duelistCoverTrap( + Side side, + String uuid, + State state, + String duelistName + ) { + validDuelistCoverTrap(side, uuid); + validPhase(side == Side.LEFT ? Phase.LEFT_TRAP : Phase.RIGHT_TRAP); + validDuelist(side, duelistName); + if (side == Side.LEFT) { left.duelistCoverTrap(uuid, state); this.phase = Phase.LEFT_BATTLE; - boardMessages.add(String.format("%s Finished Cover Trap. Waiting for %s Battle", Emoji3.WHITE_LARGE_SQUARE, left.getDuelist().getName())); + boardcast(String.format("%s Finished Cover Trap. Waiting for %s Battle", Emoji3.WHITE_LARGE_SQUARE, left.getDuelist().getName())); } else { right.duelistCoverTrap(uuid, state); this.phase = Phase.RIGHT_BATTLE; - boardMessages.add(String.format("%s Finished Cover Trap. Waiting for %s Battle", Emoji3.WHITE_LARGE_SQUARE, right.getDuelist().getName())); + boardcast(String.format("%s Finished Cover Trap. Waiting for %s Battle", Emoji3.WHITE_LARGE_SQUARE, right.getDuelist().getName())); } } public void duelistSkipStartBattle(Side side) { if (side == Side.LEFT) { this.phase = Phase.RIGHT_DRAW; - boardMessages.add(String.format("%s Skip Battle. Switch to %s", Emoji3.TRIDENT_EMBLEM, right.getDuelist().getName())); + boardcast(String.format("%s Skip Battle. Switch to %s", Emoji3.TRIDENT_EMBLEM, right.getDuelist().getName())); } else { this.phase = Phase.LEFT_DRAW; - boardMessages.add(String.format("%s Skip Battle. Switch to %s", Emoji3.TRIDENT_EMBLEM, left.getDuelist().getName())); + boardcast(String.format("%s Skip Battle. Switch to %s", Emoji3.TRIDENT_EMBLEM, left.getDuelist().getName())); } } @@ -201,27 +178,41 @@ public void skipFirstRoundBattle() { if (firstRound) { this.firstRound = false; this.phase = Phase.RIGHT_DRAW; - boardMessages.add(String.format("%s Skip First Round Battle. Switch to %s", Emoji3.TRIDENT_EMBLEM, right.getDuelist().getName())); + boardcast(String.format("%s Skip First Round Battle. Switch to %s", Emoji3.TRIDENT_EMBLEM, right.getDuelist().getName())); } } - public void duelistStartBattle(Side side, String uuid) { + public void duelistStartBattle( + Side side, + String uuid, + String duelistName + ) { + validDuelistStartBattle(side, uuid); + validPhase(side == Side.LEFT ? Phase.LEFT_BATTLE : Phase.RIGHT_BATTLE); + validDuelist(side, duelistName); + if (side == Side.LEFT) { left.duelistStartBattle(uuid, right); this.phase = Phase.RIGHT_DRAW; - boardMessages.add(String.format("%s Finished Battle. Switch to %s", Emoji3.TRIDENT_EMBLEM, right.getDuelist().getName())); + boardcast(String.format("%s Finished Battle. Switch to %s", Emoji3.TRIDENT_EMBLEM, right.getDuelist().getName())); } else { right.duelistStartBattle(uuid, left); this.phase = Phase.LEFT_DRAW; - boardMessages.add(String.format("%s Finished Battle. Switch to %s", Emoji3.TRIDENT_EMBLEM, left.getDuelist().getName())); + boardcast(String.format("%s Finished Battle. Switch to %s", Emoji3.TRIDENT_EMBLEM, left.getDuelist().getName())); } } - public Boolean checkIsDuelist(Side side, String username) { + public Boolean checkIsDuelist( + Side side, + String username + ) { return side == Side.LEFT ? left.validDuelist(username) : right.validDuelist(username); } - public DuelFieldDto toDto(Boolean isLeftDuelist, Boolean isRightDuelist) { + public DuelFieldDto toDto( + Boolean isLeftDuelist, + Boolean isRightDuelist + ) { return DuelFieldDto .builder() .boardMessages(boardMessages) @@ -239,4 +230,78 @@ public DuelFieldDto toDto(Boolean isLeftDuelist, Boolean isRightDuelist) { .phase(phase) .build(); } + + private void boardcast(String message) { + boardMessages.add(message); + } + + private void validPhase(Phase phase) { + if (this.phase != phase) + throw new WrongPhase(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + this.phase.name() + " != " + phase.name()); + } + + private void validDuelist( + Side side, + String username + ) { + if (side == Side.LEFT) { + if (!left.validDuelist(username)) + throw new NotDuelistInZone(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + username); + } else { + if (!right.validDuelist(username)) + throw new NotDuelistInZone(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + username); + } + } + + private void validDuelistSummonMonster( + Side side, + String uuid + ) { + if (side == Side.LEFT) { + if (!left.validDuelistMonsterHandCard(uuid)) + throw new NotMonsterCardInHand(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + "Not Monster in Hand " + uuid); + } else { + if (!right.validDuelistMonsterHandCard(uuid)) + throw new NotMonsterCardInHand(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + "Not Monster in Hand " + uuid); + } + } + + private void validDuelistApplySpell( + Side side, + String uuid + ) { + if (side == Side.LEFT) { + if (!left.validDuelistSpellHandCard(uuid)) + throw new NotSpellCardInHand(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + "Not Spell in Hand " + uuid); + } else { + if (!right.validDuelistSpellHandCard(uuid)) + throw new NotSpellCardInHand(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + "Not Spell in Hand " + uuid); + } + } + + private void validDuelistCoverTrap( + Side side, + String uuid + ) { + if (side == Side.LEFT) { + if (!left.validDuelistTrapHandCard(uuid)) + throw new NotTrapCardInHand(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + "Not Trap in Hand " + uuid); + } else { + if (!right.validDuelistTrapHandCard(uuid)) + throw new NotTrapCardInHand(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + "Not Trap in Hand " + uuid); + } + } + + private void validDuelistStartBattle( + Side side, + String uuid + ) { + if (side == Side.LEFT) { + if (!left.validDuelistMonsterCard(uuid)) + throw new NotCardInMonsterCards(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + uuid); + } else { + if (!right.validDuelistMonsterCard(uuid)) + throw new NotCardInMonsterCards(Emoji3.DOUBLE_EXCLAMATION_MARK + " " + uuid); + } + } } diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/Duelist.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/Duelist.java index c72ba8d..ccf2ec8 100644 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/Duelist.java +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/Duelist.java @@ -11,11 +11,11 @@ public class Duelist { // 名稱 - private String name; + private final String name; // 生命值 private Integer lp; // 手牌 - private HandCards handCards; + private final HandCards handCards; public Duelist(String name) { this.name = name; @@ -40,7 +40,7 @@ public Boolean validDuelistTrapHandCard(String uuid) { } public void drawCards(Card... draw) { - Arrays.stream(draw).forEach(v -> handCards.draw(v)); + Arrays.stream(draw).forEach(handCards::draw); } public Card summonMonster(String uuid) { diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/Zone.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/Zone.java index e336aec..51ca82b 100644 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/Zone.java +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/Zone.java @@ -56,7 +56,10 @@ public void duelistDraw() { duelist.drawCards(deck.draw()); } - public void duelistSummonMonster(String uuid, State state) { + public void duelistSummonMonster( + String uuid, + State state + ) { Card card = duelist.summonMonster(uuid); monsterCards.summon(card, state); } @@ -67,12 +70,18 @@ public void duelistApplySpell(String uuid) { // TODO: apply effect } - public void duelistCoverTrap(String uuid, State state) { + public void duelistCoverTrap( + String uuid, + State state + ) { final Card card = duelist.coverTrap(uuid); spellAndTrapCards.cover(card, state); } - public void duelistStartBattle(String uuid, Zone zone) { + public void duelistStartBattle( + String uuid, + Zone zone + ) { final MonsterCard monsterCard = (MonsterCard) monsterCards.startBattle(uuid); final MonsterCard target = zone.monsterCards.chooseTarget(); diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/controller/AuthController.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/controller/AuthController.java index 0e57b14..2e0244d 100644 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/controller/AuthController.java +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/controller/AuthController.java @@ -4,8 +4,6 @@ import org.springframework.http.ResponseEntity; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -25,21 +23,27 @@ public class AuthController { private final JwtTokenService jwtTokenService; - private final UserDetailsService springUserDetailsService; - - public AuthController(AuthenticationManager authenticationManager, JwtTokenService jwtTokenService, UserDetailsService springUserDetailsService) { + public AuthController( + AuthenticationManager authenticationManager, + JwtTokenService jwtTokenService + ) { this.authenticationManager = authenticationManager; this.jwtTokenService = jwtTokenService; - this.springUserDetailsService = springUserDetailsService; } @PostMapping("/auth:login") public ResponseEntity login(@RequestBody LoginRequestDto loginRequestDto) { - authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(loginRequestDto.getUsername(), loginRequestDto.getPassword())); - - final UserDetails userDetails = springUserDetailsService.loadUserByUsername(loginRequestDto.getUsername()); - final String token = jwtTokenService.generate(userDetails.getUsername(), UUID.randomUUID().toString()); - - return ResponseEntity.ok(new LoginResponseDto(token)); + authenticationManager.authenticate( + new UsernamePasswordAuthenticationToken( + loginRequestDto.getUsername(), + loginRequestDto.getPassword() + ) + ); + + return ResponseEntity.ok( + new LoginResponseDto( + jwtTokenService.generate(loginRequestDto.getUsername(), UUID.randomUUID().toString()) + ) + ); } } diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/controller/DuelFieldController.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/controller/DuelFieldController.java index 5eb407f..d8a5d25 100644 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/controller/DuelFieldController.java +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/controller/DuelFieldController.java @@ -10,7 +10,6 @@ import tw.gaas.yugioh.data.entity.DuelField; import tw.gaas.yugioh.data.entity.Duelist; import tw.gaas.yugioh.data.entity.Zone; -import tw.gaas.yugioh.data.enu.Phase; import tw.gaas.yugioh.data.enu.Side; import tw.gaas.yugioh.manager.GameManager; import tw.gaas.yugioh.manager.NetworkManager; @@ -33,7 +32,11 @@ public class DuelFieldController { private final PairManager pairManager; private final NetworkManager networkManager; - public DuelFieldController(GameManager gameManager, PairManager pairManager, NetworkManager networkManager) { + public DuelFieldController( + GameManager gameManager, + PairManager pairManager, + NetworkManager networkManager + ) { this.gameManager = gameManager; this.pairManager = pairManager; this.networkManager = networkManager; @@ -52,18 +55,18 @@ public Map joinFuelField(Principal principal) { return pairManager .requestPair() - .map(pairDuelFieldUuid -> { - final DuelField duelField = gameManager.findDuelFieldByUuid(pairDuelFieldUuid); - duelField.setRight(zone); + .map(duelFieldUuid -> { + final DuelField duelField = gameManager.findDuelFieldByUuid(duelFieldUuid); + duelField.initRight(zone); duelField.start(); - return Map.of("duelFieldUuid", pairDuelFieldUuid); + return Map.of("duelFieldUuid", duelFieldUuid); }) .orElseGet(() -> { final String duelFieldUuid = UUID.randomUUID().toString(); final DuelField duelField = new DuelField(duelFieldUuid); - duelField.setLeft(zone); - duelField.waitDuelist(); + duelField.initLeft(zone); + duelField.waitRight(); pairManager.submitPairRequest(duelFieldUuid); gameManager.putDuelFieldWithUuid(duelFieldUuid, duelField); @@ -74,99 +77,83 @@ public Map joinFuelField(Principal principal) { @PreAuthorize("hasRole('USER')") @PostMapping("/duelField/{uuid}/{side}:drawCard") - public void duelistDrawCard(@PathVariable String uuid, @PathVariable Side side, Principal principal) { - final DuelField duelField = Optional - .of(gameManager.findDuelFieldByUuid(uuid)) - .orElseThrow(() -> new DuelFieldNotFound("DuelField with " + uuid + " not found")); - final Phase phase = side == Side.LEFT ? Phase.LEFT_DRAW : Phase.RIGHT_DRAW; - duelField.validPhase(phase); - duelField.validDuelist(side, principal.getName()); - - duelField.duelistDraw(side); + public void duelistDrawCard( + @PathVariable String uuid, + @PathVariable Side side, + Principal principal) { + findDuelFieldByUuid(uuid).duelistDraw(side, principal.getName()); } @PreAuthorize("hasRole('USER')") @PostMapping("/duelField/{uuid}/{side}:summonMonster") - public void duelistSummonMonster(@PathVariable String uuid, @PathVariable Side side, @RequestParam(required = false, defaultValue = "false") Boolean skip, @RequestBody CardReqDto cardReqDto, Principal principal) { - final DuelField duelField = Optional - .of(gameManager.findDuelFieldByUuid(uuid)) - .orElseThrow(() -> new DuelFieldNotFound("DuelField with " + uuid + " not found")); - final Phase phase = side == Side.LEFT ? Phase.LEFT_MONSTER : Phase.RIGHT_MONSTER; - duelField.validPhase(phase); - duelField.validDuelist(side, principal.getName()); - + public void duelistSummonMonster( + @PathVariable String uuid, + @PathVariable Side side, + @RequestParam(required = false, defaultValue = "false") Boolean skip, + @RequestBody CardReqDto cardReqDto, + Principal principal) { if (skip) { - duelField.duelistSkipSummonMonster(side); + findDuelFieldByUuid(uuid).duelistSkipSummonMonster(side); } else { - duelField.validDuelistSummonMonster(side, cardReqDto.getUuid()); - duelField.duelistSummonMonster(side, cardReqDto.getUuid(), cardReqDto.getState()); + findDuelFieldByUuid(uuid).duelistSummonMonster(side, cardReqDto.getUuid(), cardReqDto.getState(), principal.getName()); } } @PreAuthorize("hasRole('USER')") @PostMapping("/duelField/{uuid}/{side}:applySpell") - public void duelistApplySpell(@PathVariable String uuid, @PathVariable Side side, @RequestParam(required = false, defaultValue = "false") Boolean skip, @RequestBody CardReqDto cardReqDto, Principal principal) { - final DuelField duelField = Optional - .of(gameManager.findDuelFieldByUuid(uuid)) - .orElseThrow(() -> new DuelFieldNotFound("DuelField with " + uuid + " not found")); - final Phase phase = side == Side.LEFT ? Phase.LEFT_SPELL : Phase.RIGHT_SPELL; - duelField.validPhase(phase); - duelField.validDuelist(side, principal.getName()); - + public void duelistApplySpell( + @PathVariable String uuid, + @PathVariable Side side, + @RequestParam(required = false, defaultValue = "false") Boolean skip, + @RequestBody CardReqDto cardReqDto, Principal principal) { if (skip) { - duelField.duelistSkipApplySpell(side); + findDuelFieldByUuid(uuid).duelistSkipApplySpell(side); } else { - duelField.validDuelistApplySpell(side, cardReqDto.getUuid()); - duelField.duelistApplySpell(side, cardReqDto.getUuid()); + findDuelFieldByUuid(uuid).duelistApplySpell(side, cardReqDto.getUuid(), principal.getName()); } } @PreAuthorize("hasRole('USER')") @PostMapping("/duelField/{uuid}/{side}:coverTrap") - public void duelistCoverTrap(@PathVariable String uuid, @PathVariable Side side, @RequestParam(required = false, defaultValue = "false") Boolean skip, @RequestBody CardReqDto cardReqDto, Principal principal) { - final DuelField duelField = Optional - .of(gameManager.findDuelFieldByUuid(uuid)) - .orElseThrow(() -> new DuelFieldNotFound("DuelField with " + uuid + " not found")); - final Phase phase = side == Side.LEFT ? Phase.LEFT_TRAP : Phase.RIGHT_TRAP; - duelField.validPhase(phase); - duelField.validDuelist(side, principal.getName()); - + public void duelistCoverTrap( + @PathVariable String uuid, + @PathVariable Side side, + @RequestParam(required = false, defaultValue = "false") Boolean skip, + @RequestBody CardReqDto cardReqDto, + Principal principal) { if (skip) { - duelField.duelistSkipCoverTrap(side); + findDuelFieldByUuid(uuid).duelistSkipCoverTrap(side); } else { - duelField.validDuelistCoverTrap(side, cardReqDto.getUuid()); - duelField.duelistCoverTrap(side, cardReqDto.getUuid(), cardReqDto.getState()); + findDuelFieldByUuid(uuid).duelistCoverTrap(side, cardReqDto.getUuid(), cardReqDto.getState(), principal.getName()); } - - duelField.skipFirstRoundBattle(); + findDuelFieldByUuid(uuid).skipFirstRoundBattle(); } @PreAuthorize("hasRole('USER')") @PostMapping("/duelField/{uuid}/{side}:startBattle") - public void duelistStartBattle(@PathVariable String uuid, @PathVariable Side side, @RequestParam(required = false, defaultValue = "false") Boolean skip, @RequestBody CardReqDto cardReqDto, Principal principal) { - final DuelField duelField = Optional - .of(gameManager.findDuelFieldByUuid(uuid)) - .orElseThrow(() -> new DuelFieldNotFound("DuelField with " + uuid + " not found")); - final Phase phase = side == Side.LEFT ? Phase.LEFT_BATTLE : Phase.RIGHT_BATTLE; - duelField.validPhase(phase); - duelField.validDuelist(side, principal.getName()); - + public void duelistStartBattle( + @PathVariable String uuid, + @PathVariable Side side, + @RequestParam(required = false, defaultValue = "false") Boolean skip, + @RequestBody CardReqDto cardReqDto, + Principal principal) { if (skip) { - duelField.duelistSkipStartBattle(side); + findDuelFieldByUuid(uuid).duelistSkipStartBattle(side); } else { - duelField.validDuelistStartBattle(side, cardReqDto.getUuid()); - duelField.duelistStartBattle(side, cardReqDto.getUuid()); + findDuelFieldByUuid(uuid).duelistStartBattle(side, cardReqDto.getUuid(), principal.getName()); } } @PreAuthorize("hasRole('USER')") @GetMapping("/duelField/{uuid}") - public DuelFieldDto queryDuelField(@PathVariable String uuid, Principal principal) { - final DuelField duelField = gameManager.findDuelFieldByUuid(uuid); - final Boolean isLeftDuelist = duelField.checkIsDuelist(Side.LEFT, principal.getName()); - final Boolean isRightDuelist = duelField.checkIsDuelist(Side.RIGHT, principal.getName()); + public DuelFieldDto queryDuelField( + @PathVariable String uuid, + Principal principal) { - return duelField.toDto(isLeftDuelist, isRightDuelist); + return findDuelFieldByUuid(uuid).toDto( + findDuelFieldByUuid(uuid).checkIsDuelist(Side.LEFT, principal.getName()), + findDuelFieldByUuid(uuid).checkIsDuelist(Side.RIGHT, principal.getName()) + ); } @PreAuthorize("hasRole('USER')") @@ -183,4 +170,10 @@ public SseEmitter listenDuelField(@PathVariable String uuid) throws IOException return networkManager.register(uuid, sseEmitter); } + + private DuelField findDuelFieldByUuid(String uuid) { + return Optional + .of(gameManager.findDuelFieldByUuid(uuid)) + .orElseThrow(() -> new DuelFieldNotFound("DuelField with " + uuid + " not found")); + } } From c81ee0531de335cdb8502cab460c7385adfa136b Mon Sep 17 00:00:00 2001 From: Vincent Huang iMac Date: Tue, 14 Feb 2023 19:27:16 +0800 Subject: [PATCH 07/12] refactor: update --- yugioh-20221012/.http/test.http | 16 +++---- .../tw/gaas/yugioh/data/entity/DuelField.java | 46 +++++++++---------- .../web/controller/DuelFieldController.java | 2 +- .../src/test/java/tw/gaas/yugioh/Main.java | 7 +++ 4 files changed, 39 insertions(+), 32 deletions(-) create mode 100644 yugioh-20221012/src/test/java/tw/gaas/yugioh/Main.java diff --git a/yugioh-20221012/.http/test.http b/yugioh-20221012/.http/test.http index 2cc36fa..0a99ebd 100644 --- a/yugioh-20221012/.http/test.http +++ b/yugioh-20221012/.http/test.http @@ -100,7 +100,7 @@ Authorization: Bearer {{bearerTokenV}} Content-Type: application/json { - "uuid": "cdba5b3e-be63-4b96-997a-962670991a18" + "uuid": "257b6fb6-875a-449a-a8ae-e12b9a4b175a" } @@ -110,12 +110,12 @@ Authorization: Bearer {{bearerTokenV}} Content-Type: application/json { - "uuid": "31fbedcd-df7e-4b5c-bb78-cff0a48a10dd" + "uuid": "e683066b-7344-44ae-9ae7-01cffaaa7dd1" } ### Vincent Cover Trap -POST http://localhost:8080/java/api/v1.0/duelField/{{uuid}}/LEFT:coverTrap +POST http://localhost:8080/java/api/v1.0/duelField/{{uuid}}/LEFT:coverTrap?skip=true Authorization: Bearer {{bearerTokenV}} Content-Type: application/json @@ -131,7 +131,7 @@ Authorization: Bearer {{bearerTokenV}} Content-Type: application/json { - "uuid": "0f11eac8-2a89-45fb-bde8-9a157694e843" + "uuid": "06474d38-00e3-4e6c-a9bc-4c5e09c10630" } @@ -146,12 +146,12 @@ Authorization: Bearer {{bearerTokenQ}} Content-Type: application/json { - "uuid": "64967479-cd92-4b8d-88d8-ce4f3804e3c0" + "uuid": "0cb87c23-6343-49c7-9187-56c43bb07f3d" } ### qrtt1 Apply Spell -POST http://localhost:8080/java/api/v1.0/duelField/{{uuid}}/RIGHT:applySpell +POST http://localhost:8080/java/api/v1.0/duelField/{{uuid}}/RIGHT:applySpell?skip=true Authorization: Bearer {{bearerTokenQ}} Content-Type: application/json @@ -166,13 +166,13 @@ Authorization: Bearer {{bearerTokenQ}} Content-Type: application/json { - "uuid": "13a0291b-74b6-4c9a-ba68-f7f0cb7e31bb", + "uuid": "c33946ce-511a-48a2-99e2-26cee99a787e", "state": "BACK" } ### qrtt1 Start Battle -POST http://localhost:8080/java/api/v1.0/duelField/{{uuid}}/RIGHT:startBattle +POST http://localhost:8080/java/api/v1.0/duelField/{{uuid}}/RIGHT:startBattle?skip=true Authorization: Bearer {{bearerTokenQ}} Content-Type: application/json diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/DuelField.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/DuelField.java index f76ce7d..d9a88ca 100644 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/DuelField.java +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/data/entity/DuelField.java @@ -30,17 +30,17 @@ public class DuelField { public DuelField(String uuid) { this.uuid = uuid; - boardcast(String.format("%s DuelField %s Init", Emoji2.TROPHY, uuid)); + boardcast(String.format("C1 %s DuelField %s Init", Emoji2.TROPHY, uuid)); } public void initLeft(Zone left) { this.left = left; - boardcast(String.format("%s Left Duelist %s Entered", Emoji2.MILITARY_MEDAL, left.getDuelist().getName())); + boardcast(String.format("C2 %s Left Duelist %s Entered", Emoji2.MILITARY_MEDAL, left.getDuelist().getName())); } public void initRight(Zone zone) { this.right = zone; - boardcast(String.format("%s Right Duelist %s Entered", Emoji2.MILITARY_MEDAL, right.getDuelist().getName())); + boardcast(String.format("C3 %s Right Duelist %s Entered", Emoji2.MILITARY_MEDAL, right.getDuelist().getName())); } public void waitRight() { @@ -51,7 +51,7 @@ public void start() { left.start(); right.start(); this.phase = Phase.LEFT_DRAW; - boardcast(String.format("%s Game Start. Waiting for %s Draw", Emoji3.TRIANGULAR_FLAG, left.getDuelist().getName())); + boardcast(String.format("L1 %s Game Start. Waiting for %s Draw", Emoji3.TRIANGULAR_FLAG, left.getDuelist().getName())); } public void duelistDraw( @@ -64,21 +64,21 @@ public void duelistDraw( if (side == Side.LEFT) { left.duelistDraw(); this.phase = Phase.LEFT_MONSTER; - boardcast(String.format("%s Finished Draw. Waiting for %s Summon Monster", Emoji0.RAISED_BACK_OF_HAND, left.getDuelist().getName())); + boardcast(String.format("L2 %s Finished Draw. Waiting for %s Summon Monster", Emoji0.RAISED_BACK_OF_HAND, left.getDuelist().getName())); } else { right.duelistDraw(); this.phase = Phase.RIGHT_MONSTER; - boardcast(String.format("%s Finished Draw. Waiting for %s Summon Monster", Emoji0.RAISED_BACK_OF_HAND, right.getDuelist().getName())); + boardcast(String.format("R2 %s Finished Draw. Waiting for %s Summon Monster", Emoji0.RAISED_BACK_OF_HAND, right.getDuelist().getName())); } } public void duelistSkipSummonMonster(Side side) { if (side == Side.LEFT) { this.phase = Phase.LEFT_SPELL; - boardcast(String.format("%s Skip Summon Monster. Waiting for %s Apply Spell", Emoji0.OGRE, left.getDuelist().getName())); + boardcast(String.format("L0 %s Skip Summon Monster. Waiting for %s Apply Spell", Emoji0.OGRE, left.getDuelist().getName())); } else { this.phase = Phase.RIGHT_SPELL; - boardcast(String.format("%s Skip Summon Monster. Waiting for %s Apply Spell", Emoji0.OGRE, right.getDuelist().getName())); + boardcast(String.format("R0 %s Skip Summon Monster. Waiting for %s Apply Spell", Emoji0.OGRE, right.getDuelist().getName())); } } @@ -95,21 +95,21 @@ public void duelistSummonMonster( if (side == Side.LEFT) { left.duelistSummonMonster(uuid, state); this.phase = Phase.LEFT_SPELL; - boardcast(String.format("%s Finished Summon Monster. Waiting for %s Apply Spell", Emoji0.OGRE, left.getDuelist().getName())); + boardcast(String.format("L3 %s Finished Summon Monster. Waiting for %s Apply Spell", Emoji0.OGRE, left.getDuelist().getName())); } else { right.duelistSummonMonster(uuid, state); this.phase = Phase.RIGHT_SPELL; - boardcast(String.format("%s Finished Summon Monster. Waiting for %s Apply Spell", Emoji0.OGRE, right.getDuelist().getName())); + boardcast(String.format("R3 %s Finished Summon Monster. Waiting for %s Apply Spell", Emoji0.OGRE, right.getDuelist().getName())); } } public void duelistSkipApplySpell(Side side) { if (side == Side.LEFT) { this.phase = Phase.LEFT_TRAP; - boardcast(String.format("%s Skip Apply Spell. Waiting for %s Cover Trap", Emoji0.DIZZY, left.getDuelist().getName())); + boardcast(String.format("L0 %s Skip Apply Spell. Waiting for %s Cover Trap", Emoji0.DIZZY, left.getDuelist().getName())); } else { this.phase = Phase.RIGHT_TRAP; - boardcast(String.format("%s Skip Apply Spell. Waiting for %s Cover Trap", Emoji0.DIZZY, right.getDuelist().getName())); + boardcast(String.format("R0 %s Skip Apply Spell. Waiting for %s Cover Trap", Emoji0.DIZZY, right.getDuelist().getName())); } } @@ -125,21 +125,21 @@ public void duelistApplySpell( if (side == Side.LEFT) { left.duelistApplySpell(uuid); this.phase = Phase.LEFT_TRAP; - boardcast(String.format("%s Finished Apply Spell. Waiting for %s Cover Trap", Emoji0.DIZZY, left.getDuelist().getName())); + boardcast(String.format("L4 %s Finished Apply Spell. Waiting for %s Cover Trap", Emoji0.DIZZY, left.getDuelist().getName())); } else { right.duelistApplySpell(uuid); this.phase = Phase.RIGHT_TRAP; - boardcast(String.format("%s Finished Apply Spell. Waiting for %s Cover Trap", Emoji0.DIZZY, right.getDuelist().getName())); + boardcast(String.format("R4 %s Finished Apply Spell. Waiting for %s Cover Trap", Emoji0.DIZZY, right.getDuelist().getName())); } } public void duelistSkipCoverTrap(Side side) { if (side == Side.LEFT) { this.phase = Phase.LEFT_BATTLE; - boardcast(String.format("%s Skip Cover Trap. Waiting for %s Battle", Emoji3.WHITE_LARGE_SQUARE, left.getDuelist().getName())); + boardcast(String.format("L0 %s Skip Cover Trap. Waiting for %s Battle", Emoji3.WHITE_LARGE_SQUARE, left.getDuelist().getName())); } else { this.phase = Phase.RIGHT_BATTLE; - boardcast(String.format("%s Skip Cover Trap. Waiting for %s Battle", Emoji3.WHITE_LARGE_SQUARE, right.getDuelist().getName())); + boardcast(String.format("R0 %s Skip Cover Trap. Waiting for %s Battle", Emoji3.WHITE_LARGE_SQUARE, right.getDuelist().getName())); } } @@ -156,21 +156,21 @@ public void duelistCoverTrap( if (side == Side.LEFT) { left.duelistCoverTrap(uuid, state); this.phase = Phase.LEFT_BATTLE; - boardcast(String.format("%s Finished Cover Trap. Waiting for %s Battle", Emoji3.WHITE_LARGE_SQUARE, left.getDuelist().getName())); + boardcast(String.format("L5 %s Finished Cover Trap. Waiting for %s Battle", Emoji3.WHITE_LARGE_SQUARE, left.getDuelist().getName())); } else { right.duelistCoverTrap(uuid, state); this.phase = Phase.RIGHT_BATTLE; - boardcast(String.format("%s Finished Cover Trap. Waiting for %s Battle", Emoji3.WHITE_LARGE_SQUARE, right.getDuelist().getName())); + boardcast(String.format("R5 %s Finished Cover Trap. Waiting for %s Battle", Emoji3.WHITE_LARGE_SQUARE, right.getDuelist().getName())); } } public void duelistSkipStartBattle(Side side) { if (side == Side.LEFT) { this.phase = Phase.RIGHT_DRAW; - boardcast(String.format("%s Skip Battle. Switch to %s", Emoji3.TRIDENT_EMBLEM, right.getDuelist().getName())); + boardcast(String.format("L0 %s Skip Battle. Switch duelist, waiting for %s Draw", Emoji3.TRIDENT_EMBLEM, right.getDuelist().getName())); } else { this.phase = Phase.LEFT_DRAW; - boardcast(String.format("%s Skip Battle. Switch to %s", Emoji3.TRIDENT_EMBLEM, left.getDuelist().getName())); + boardcast(String.format("R0 %s Skip Battle. Switch duelist, waiting for %s Draw", Emoji3.TRIDENT_EMBLEM, left.getDuelist().getName())); } } @@ -178,7 +178,7 @@ public void skipFirstRoundBattle() { if (firstRound) { this.firstRound = false; this.phase = Phase.RIGHT_DRAW; - boardcast(String.format("%s Skip First Round Battle. Switch to %s", Emoji3.TRIDENT_EMBLEM, right.getDuelist().getName())); + boardcast(String.format("L0 %s Skip First Round Battle. Switch duelist, waiting for %s Draw", Emoji3.TRIDENT_EMBLEM, right.getDuelist().getName())); } } @@ -194,11 +194,11 @@ public void duelistStartBattle( if (side == Side.LEFT) { left.duelistStartBattle(uuid, right); this.phase = Phase.RIGHT_DRAW; - boardcast(String.format("%s Finished Battle. Switch to %s", Emoji3.TRIDENT_EMBLEM, right.getDuelist().getName())); + boardcast(String.format("L6 %s Finished Battle. Switch duelist, waiting for %s Draw", Emoji3.TRIDENT_EMBLEM, right.getDuelist().getName())); } else { right.duelistStartBattle(uuid, left); this.phase = Phase.LEFT_DRAW; - boardcast(String.format("%s Finished Battle. Switch to %s", Emoji3.TRIDENT_EMBLEM, left.getDuelist().getName())); + boardcast(String.format("R6 %s Finished Battle. Switch duelist, waiting for %s Draw", Emoji3.TRIDENT_EMBLEM, left.getDuelist().getName())); } } diff --git a/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/controller/DuelFieldController.java b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/controller/DuelFieldController.java index d8a5d25..8175b5b 100644 --- a/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/controller/DuelFieldController.java +++ b/yugioh-20221012/src/main/java/tw/gaas/yugioh/web/controller/DuelFieldController.java @@ -49,7 +49,7 @@ public String getStatus() { @PreAuthorize("hasRole('USER')") @PostMapping("/duelField:join") - public Map joinFuelField(Principal principal) { + public Map joinDuelField(Principal principal) { final Duelist duelist = new Duelist(principal.getName()); final Zone zone = new Zone(duelist); diff --git a/yugioh-20221012/src/test/java/tw/gaas/yugioh/Main.java b/yugioh-20221012/src/test/java/tw/gaas/yugioh/Main.java new file mode 100644 index 0000000..3d0a0e6 --- /dev/null +++ b/yugioh-20221012/src/test/java/tw/gaas/yugioh/Main.java @@ -0,0 +1,7 @@ +package tw.gaas.yugioh; + +public class Main { + + public static void main(String[] args) { + } +} From b2e79983f06a06fec45a5d6be3382c9088c3d3cc Mon Sep 17 00:00:00 2001 From: Kehao Chen Date: Sun, 4 Dec 2022 21:47:33 +0800 Subject: [PATCH 08/12] feat: add Kehao's personal practice of the Yu-Gi-Oh! --- yugioh-kehao/.gitignore | 37 +++ yugioh-kehao/README.md | 0 yugioh-kehao/application/build.gradle | 28 ++ yugioh-kehao/domain/build.gradle | 28 ++ yugioh-kehao/framework/build.gradle | 58 +++++ .../tw/gaas/yugioh/YugiohApplication.kt | 11 + .../kotlin/tw/gaas/yugioh/api/GamesApi.kt | 77 ++++++ .../tw/gaas/yugioh/api/GamesApiController.kt | 39 +++ .../tw/gaas/yugioh/api/PingController.kt | 17 ++ .../config/SwaggerDocumentationConfig.kt | 32 +++ .../kotlin/tw/gaas/yugioh/model/dto/Card.kt | 44 ++++ .../tw/gaas/yugioh/model/dto/CardInfo.kt | 107 ++++++++ .../kotlin/tw/gaas/yugioh/model/dto/Cards.kt | 14 + .../tw/gaas/yugioh/model/dto/DeckZone.kt | 35 +++ .../tw/gaas/yugioh/model/dto/DuelField.kt | 63 +++++ .../tw/gaas/yugioh/model/dto/Duellist.kt | 40 +++ .../kotlin/tw/gaas/yugioh/model/dto/Game.kt | 64 +++++ .../tw/gaas/yugioh/model/dto/Graveyard.kt | 35 +++ .../kotlin/tw/gaas/yugioh/model/dto/Hand.kt | 45 ++++ .../tw/gaas/yugioh/model/dto/Location.kt | 43 ++++ .../gaas/yugioh/model/dto/MainMonsterZone.kt | 44 ++++ .../tw/gaas/yugioh/model/dto/SpellTrapZone.kt | 43 ++++ .../kotlin/tw/gaas/yugioh/model/dto/User.kt | 35 +++ .../tw/gaas/yugioh/model/enu/Attribute.kt | 41 +++ .../gaas/yugioh/model/enu/BattlePosition.kt | 33 +++ .../tw/gaas/yugioh/model/enu/CardPosition.kt | 33 +++ .../tw/gaas/yugioh/model/enu/CardType.kt | 33 +++ .../tw/gaas/yugioh/model/enu/DuelFieldZone.kt | 43 ++++ .../kotlin/tw/gaas/yugioh/model/enu/Icon.kt | 41 +++ .../tw/gaas/yugioh/model/enu/MonsterType.kt | 77 ++++++ .../kotlin/tw/gaas/yugioh/model/enu/Phase.kt | 41 +++ .../model/resp/FindAvailableGameResp.kt | 23 ++ .../yugioh/model/resp/GetSpecifiedGameResp.kt | 23 ++ .../src/main/resources/application.properties | 1 + .../tw/gaas/yugioh/YugiohApplicationTests.kt | 13 + .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 60756 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 + yugioh-kehao/gradlew | 240 ++++++++++++++++++ yugioh-kehao/gradlew.bat | 91 +++++++ yugioh-kehao/settings.gradle | 12 + 40 files changed, 1689 insertions(+) create mode 100644 yugioh-kehao/.gitignore create mode 100644 yugioh-kehao/README.md create mode 100644 yugioh-kehao/application/build.gradle create mode 100644 yugioh-kehao/domain/build.gradle create mode 100644 yugioh-kehao/framework/build.gradle create mode 100644 yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/YugiohApplication.kt create mode 100644 yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/api/GamesApi.kt create mode 100644 yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/api/GamesApiController.kt create mode 100644 yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/api/PingController.kt create mode 100644 yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/config/SwaggerDocumentationConfig.kt create mode 100644 yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/Card.kt create mode 100644 yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/CardInfo.kt create mode 100644 yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/Cards.kt create mode 100644 yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/DeckZone.kt create mode 100644 yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/DuelField.kt create mode 100644 yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/Duellist.kt create mode 100644 yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/Game.kt create mode 100644 yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/Graveyard.kt create mode 100644 yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/Hand.kt create mode 100644 yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/Location.kt create mode 100644 yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/MainMonsterZone.kt create mode 100644 yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/SpellTrapZone.kt create mode 100644 yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/User.kt create mode 100644 yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/Attribute.kt create mode 100644 yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/BattlePosition.kt create mode 100644 yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/CardPosition.kt create mode 100644 yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/CardType.kt create mode 100644 yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/DuelFieldZone.kt create mode 100644 yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/Icon.kt create mode 100644 yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/MonsterType.kt create mode 100644 yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/Phase.kt create mode 100644 yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/resp/FindAvailableGameResp.kt create mode 100644 yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/resp/GetSpecifiedGameResp.kt create mode 100644 yugioh-kehao/framework/src/main/resources/application.properties create mode 100644 yugioh-kehao/framework/src/test/kotlin/tw/gaas/yugioh/YugiohApplicationTests.kt create mode 100644 yugioh-kehao/gradle/wrapper/gradle-wrapper.jar create mode 100644 yugioh-kehao/gradle/wrapper/gradle-wrapper.properties create mode 100644 yugioh-kehao/gradlew create mode 100644 yugioh-kehao/gradlew.bat create mode 100644 yugioh-kehao/settings.gradle diff --git a/yugioh-kehao/.gitignore b/yugioh-kehao/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/yugioh-kehao/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/yugioh-kehao/README.md b/yugioh-kehao/README.md new file mode 100644 index 0000000..e69de29 diff --git a/yugioh-kehao/application/build.gradle b/yugioh-kehao/application/build.gradle new file mode 100644 index 0000000..f0a1273 --- /dev/null +++ b/yugioh-kehao/application/build.gradle @@ -0,0 +1,28 @@ +plugins { + id 'org.jetbrains.kotlin.jvm' version '1.7.21' +} + +group 'tw.gaas.yugioh' +version = '0.0.1-SNAPSHOT' +sourceCompatibility = '17' + +repositories { + mavenCentral() +} + +dependencies { + testImplementation 'org.jetbrains.kotlin:kotlin-test' + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" +} + +test { + useJUnitPlatform() +} + +compileKotlin { + kotlinOptions.jvmTarget = '17' +} + +compileTestKotlin { + kotlinOptions.jvmTarget = '17' +} diff --git a/yugioh-kehao/domain/build.gradle b/yugioh-kehao/domain/build.gradle new file mode 100644 index 0000000..f0a1273 --- /dev/null +++ b/yugioh-kehao/domain/build.gradle @@ -0,0 +1,28 @@ +plugins { + id 'org.jetbrains.kotlin.jvm' version '1.7.21' +} + +group 'tw.gaas.yugioh' +version = '0.0.1-SNAPSHOT' +sourceCompatibility = '17' + +repositories { + mavenCentral() +} + +dependencies { + testImplementation 'org.jetbrains.kotlin:kotlin-test' + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" +} + +test { + useJUnitPlatform() +} + +compileKotlin { + kotlinOptions.jvmTarget = '17' +} + +compileTestKotlin { + kotlinOptions.jvmTarget = '17' +} diff --git a/yugioh-kehao/framework/build.gradle b/yugioh-kehao/framework/build.gradle new file mode 100644 index 0000000..24e1690 --- /dev/null +++ b/yugioh-kehao/framework/build.gradle @@ -0,0 +1,58 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + +plugins { + id 'org.springframework.boot' version '3.0.1-SNAPSHOT' + id 'io.spring.dependency-management' version '1.1.0' + id 'org.jetbrains.kotlin.jvm' version '1.7.21' + id 'org.jetbrains.kotlin.plugin.spring' version '1.7.21' + id 'org.jetbrains.kotlin.plugin.jpa' version '1.7.21' +} + +group = 'tw.gaas' +version = '0.0.1-SNAPSHOT' +sourceCompatibility = '17' + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() + maven { url 'https://repo.spring.io/milestone' } + maven { url 'https://repo.spring.io/snapshot' } +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-security' + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-websocket' + implementation 'com.fasterxml.jackson.module:jackson-module-kotlin' + implementation 'org.jetbrains.kotlin:kotlin-reflect' + implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.0' + implementation 'javax.validation:validation-api:2.0.1.Final' + implementation 'javax.annotation:javax.annotation-api:1.3.2' + compileOnly 'org.projectlombok:lombok' + developmentOnly 'org.springframework.boot:spring-boot-devtools' + runtimeOnly 'com.h2database:h2' + runtimeOnly 'org.postgresql:postgresql' + annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.springframework.security:spring-security-test' + testImplementation 'org.springdoc:springdoc-openapi-starter-webmvc-api:2.0.0' +} + +tasks.withType(KotlinCompile).configureEach { + kotlinOptions { + freeCompilerArgs = ['-Xjsr305=strict'] + jvmTarget = '17' + } +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/YugiohApplication.kt b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/YugiohApplication.kt new file mode 100644 index 0000000..7251460 --- /dev/null +++ b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/YugiohApplication.kt @@ -0,0 +1,11 @@ +package tw.gaas.yugioh + +import org.springframework.boot.autoconfigure.SpringBootApplication +import org.springframework.boot.runApplication + +@SpringBootApplication +class YugiohApplication + +fun main(args: Array) { + runApplication(*args) +} diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/api/GamesApi.kt b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/api/GamesApi.kt new file mode 100644 index 0000000..845c852 --- /dev/null +++ b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/api/GamesApi.kt @@ -0,0 +1,77 @@ +package tw.gaas.yugioh.api + +import tw.gaas.yugioh.model.resp.FindAvailableGameResp +import tw.gaas.yugioh.model.resp.GetSpecifiedGameResp +import io.swagger.v3.oas.annotations.Operation +import io.swagger.v3.oas.annotations.Parameter +import io.swagger.v3.oas.annotations.enums.ParameterIn +import io.swagger.v3.oas.annotations.media.Content +import io.swagger.v3.oas.annotations.media.Schema +import io.swagger.v3.oas.annotations.responses.ApiResponse +import io.swagger.v3.oas.annotations.responses.ApiResponses +import org.springframework.http.ResponseEntity +import org.springframework.validation.annotation.Validated +import org.springframework.web.bind.annotation.PathVariable +import org.springframework.web.bind.annotation.RequestBody +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RequestMethod +import javax.validation.Valid + +@Validated +interface GamesApi { + @Operation( + summary = "尋找可用的對局", + description = "尋找可用的對局 - 若有等待成立的對局，則加入既有等待玩家加入的對局 - 若無等待成立的對局，則創立新對局等待其他玩家加入", + tags = ["game"] + ) + @ApiResponses( + value = [ApiResponse( + responseCode = "200", + description = "回應可用的對局", + content = arrayOf( + Content( + mediaType = "application/json", + schema = Schema(implementation = FindAvailableGameResp::class) + ) + ) + )] + ) + @RequestMapping( + value = ["/games/find"], + produces = ["application/json"], + consumes = ["application/json"], + method = [RequestMethod.POST] + ) + fun findAvailableGame( + @Parameter( + `in` = ParameterIn.DEFAULT, + description = "要求可用的對局" + ) @RequestBody body: @Valid Any? + ): ResponseEntity? + + @Operation( + summary = "取得指定的對局", + description = "取得指定的對局，在專案實作初期應是用於定時 Polling 確認對局是否成立，可開始進行遊戲", + tags = ["game"] + ) + @ApiResponses( + value = [ApiResponse( + responseCode = "200", + description = "回應指定的對局", + content = arrayOf( + Content( + mediaType = "application/json", + schema = Schema(implementation = GetSpecifiedGameResp::class) + ) + ) + )] + ) + @RequestMapping(value = ["/games/{gameId}"], produces = ["application/json"], method = [RequestMethod.GET]) + fun getGameGameId( + @Parameter( + `in` = ParameterIn.PATH, + description = "對局 ID", + required = true + ) @PathVariable("gameId") gameId: String? + ): ResponseEntity? +} diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/api/GamesApiController.kt b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/api/GamesApiController.kt new file mode 100644 index 0000000..f3ad62f --- /dev/null +++ b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/api/GamesApiController.kt @@ -0,0 +1,39 @@ +package tw.gaas.yugioh.api + +import tw.gaas.yugioh.model.resp.FindAvailableGameResp +import tw.gaas.yugioh.model.resp.GetSpecifiedGameResp +import io.swagger.v3.oas.annotations.Parameter +import io.swagger.v3.oas.annotations.enums.ParameterIn +import lombok.extern.slf4j.Slf4j +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.http.HttpStatus +import org.springframework.http.ResponseEntity +import org.springframework.web.bind.annotation.PathVariable +import org.springframework.web.bind.annotation.RequestBody +import org.springframework.web.bind.annotation.RestController +import javax.validation.Valid + +@Slf4j +@RestController +class GamesApiController @Autowired constructor() : GamesApi { + override fun findAvailableGame( + @Parameter( + `in` = ParameterIn.DEFAULT, + description = "要求可用的對局" + ) @RequestBody body: @Valid Any? + ): ResponseEntity? { + val resp = FindAvailableGameResp() + return ResponseEntity(resp, HttpStatus.NOT_IMPLEMENTED) + } + + override fun getGameGameId( + @Parameter( + `in` = ParameterIn.PATH, + description = "對局 ID", + required = true + ) @PathVariable("gameId") gameId: String? + ): ResponseEntity? { + val resp = GetSpecifiedGameResp() + return ResponseEntity(resp, HttpStatus.NOT_IMPLEMENTED) + } +} diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/api/PingController.kt b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/api/PingController.kt new file mode 100644 index 0000000..2f12dc2 --- /dev/null +++ b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/api/PingController.kt @@ -0,0 +1,17 @@ +package tw.gaas.yugioh.api + +import org.springframework.http.ResponseEntity +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RestController + +@RestController +@RequestMapping("ping") +class PingController { + @GetMapping("/") + fun pong(): ResponseEntity { + return ResponseEntity + .ok() + .body("pong") + } +} diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/config/SwaggerDocumentationConfig.kt b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/config/SwaggerDocumentationConfig.kt new file mode 100644 index 0000000..658db3e --- /dev/null +++ b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/config/SwaggerDocumentationConfig.kt @@ -0,0 +1,32 @@ +package tw.gaas.yugioh.config + +import io.swagger.v3.oas.models.OpenAPI +import io.swagger.v3.oas.models.info.Contact +import io.swagger.v3.oas.models.info.Info +import io.swagger.v3.oas.models.info.License +import org.springframework.context.annotation.Bean +import org.springframework.context.annotation.Configuration + +@Configuration +class SwaggerDocumentationConfig { + @Bean + fun openApi(): OpenAPI { + return OpenAPI() + .info( + Info() + .title("Yu-Gi-Oh") + .description("個人練習撰寫 OpenAPI Specification 文件 - [GitHubGame-as-a-Service/Yu-Gi-Oh](https://github.com/Game-as-a-Service/Yu-Gi-Oh)") + .termsOfService("") + .version("1.0") + .license( + License() + .name("") + .url("http://unlicense.org") + ) + .contact( + Contact() + .email("kehao.chen@happyhacking.ninja") + ) + ) + } +} diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/Card.kt b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/Card.kt new file mode 100644 index 0000000..e2d3db2 --- /dev/null +++ b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/Card.kt @@ -0,0 +1,44 @@ +package tw.gaas.yugioh.model.dto + +import com.fasterxml.jackson.annotation.JsonProperty +import io.swagger.v3.oas.annotations.media.Schema +import lombok.Data +import lombok.experimental.Accessors +import org.springframework.validation.annotation.Validated +import java.util.* + +/** + * 卡片 + */ +@Schema(description = "卡片") +@Validated +@Accessors(chain = true) +@Data +class Card { + /** + * Get seq + * + * @return seq + */ + @get:Schema(required = true, description = "卡片序號") + @JsonProperty("seq") + var seq: String? = null + + /** + * Get location + * + * @return location + */ + @get:Schema(required = true, description = "卡片位置") + @JsonProperty("location") + var location: Location? = null + + /** + * Get info + * + * @return info + */ + @get:Schema(description = "卡片資訊") + @JsonProperty("info") + var info: CardInfo? = null +} diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/CardInfo.kt b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/CardInfo.kt new file mode 100644 index 0000000..d23d847 --- /dev/null +++ b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/CardInfo.kt @@ -0,0 +1,107 @@ +package tw.gaas.yugioh.model.dto + +import com.fasterxml.jackson.annotation.JsonProperty +import tw.gaas.yugioh.model.enu.Icon +import tw.gaas.yugioh.model.enu.MonsterType +import io.swagger.v3.oas.annotations.media.Schema +import lombok.Data +import lombok.experimental.Accessors +import org.springframework.validation.annotation.Validated +import tw.gaas.yugioh.model.enu.Attribute +import tw.gaas.yugioh.model.enu.CardType +import java.util.* + +/** + * 卡片資訊 (牌庫資料) + */ +@Schema(description = "遊戲王卡片資訊 (牌庫資料)") +@Validated +@Accessors(chain = true) +@Data +class CardInfo { + /** + * Get id + * @return id + */ + @get:Schema(description = "遊戲王卡片編號") + @JsonProperty("id") + var id: String? = null + + /** + * Get name + * @return name + */ + @get:Schema(description = "名稱") + @JsonProperty("name") + var name: String? = null + + /** + * Get type + * @return type + */ + @get:Schema(description = "類別") + @JsonProperty("type") + var type: CardType? = null + + /** + * Get description + * @return description + */ + @get:Schema(description = "敘述") + @JsonProperty("description") + var description: String? = null + + /** + * Get attribute + * @return attribute + */ + @get:Schema(description = "屬性 (怪獸卡)") + @JsonProperty("attribute") + var attribute: Attribute? = null + + /** + * Get icon + * @return icon + */ + @get:Schema(description = "效果標記 (魔法卡/陷阱卡)") + @JsonProperty("icon") + var icon: Icon? = null + + /** + * Get monsterType + * @return monsterType + */ + @get:Schema(description = "怪獸種族 (怪獸卡)") + @JsonProperty("monsterType") + var monsterType: MonsterType? = null + + /** + * Get level + * minimum: 0 + * maximum: 12 + * @return level + */ + @get:Schema(description = "等級") + @JsonProperty("level") + var level: UByte? = null + + /** + * Get attack + * minimum: 0 + * maximum: 65535 + * @return attack + */ + @get:Schema(description = "攻擊力") + @JsonProperty("attack") + var attack: UShort? = null + + /** + * Get defense + * minimum: 0 + * maximum: 65535 + * @return defense + */ + @get:Schema(description = "守備力") + @JsonProperty("defense") + var defense: UShort? = null +} diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/Cards.kt b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/Cards.kt new file mode 100644 index 0000000..08d8bc9 --- /dev/null +++ b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/Cards.kt @@ -0,0 +1,14 @@ +package tw.gaas.yugioh.model.dto + +import io.swagger.v3.oas.annotations.media.Schema +import lombok.Data +import org.springframework.validation.annotation.Validated + +/** + * 卡片集合，目前採取 array 形式存在 + */ +@Schema(description = "卡片集合") +@Validated +@Data +class Cards : ArrayList() { +} diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/DeckZone.kt b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/DeckZone.kt new file mode 100644 index 0000000..96db611 --- /dev/null +++ b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/DeckZone.kt @@ -0,0 +1,35 @@ +package tw.gaas.yugioh.model.dto + +import com.fasterxml.jackson.annotation.JsonProperty +import io.swagger.v3.oas.annotations.media.Schema +import lombok.Data +import org.springframework.validation.annotation.Validated +import java.util.* +import javax.validation.constraints.Max +import javax.validation.constraints.Min + +/** + * 牌組區 + * - 我方決鬥場：卡片數量 + * - 敵方決鬥場：卡片數量 + */ +@Schema(description = "牌組區 " + + "- 我方決鬥場：卡片數量 " + + "- 敵方決鬥場：卡片數量") +@Validated +@Data +class DeckZone { + @JsonProperty("count") + private var count = 0 + + /** + * Get count + * minimum: 0 + * maximum: 99 + * @return count + */ + @Schema(required = true, description = "卡片數量") + fun getCount(): @Min(0) @Max(99) Int? { + return count + } +} diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/DuelField.kt b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/DuelField.kt new file mode 100644 index 0000000..2467bc8 --- /dev/null +++ b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/DuelField.kt @@ -0,0 +1,63 @@ +package tw.gaas.yugioh.model.dto + +import com.fasterxml.jackson.annotation.JsonProperty +import io.swagger.v3.oas.annotations.media.Schema +import lombok.Data +import org.springframework.validation.annotation.Validated +import java.util.* + +/** + * 決鬥場 + */ +@Schema(description = "決鬥場") +@Validated +@Data +class DuelField { + /** + * Get duellist + * @return duellist + */ + @get:Schema(required = true, description = "決鬥者") + @JsonProperty("duellist") + var duellist: Duellist? = null + + /** + * Get hand + * @return hand + */ + @get:Schema(description = "手牌") + @JsonProperty("hand") + var hand: Hand? = null + + /** + * Get mainMonsterZone + * @return mainMonsterZone + */ + @get:Schema(description = "主要怪獸區") + @JsonProperty("mainMonsterZone") + var mainMonsterZone: MainMonsterZone? = null + + /** + * Get spellTrapZone + * @return spellTrapZone + */ + @get:Schema(description = "魔法和陷阱區") + @JsonProperty("spellTrapZone") + var spellTrapZone: SpellTrapZone? = null + + /** + * Get graveyard + * @return graveyard + */ + @get:Schema(description = "墓地") + @JsonProperty("graveyard") + var graveyard: Graveyard? = null + + /** + * Get deckZone + * @return deckZone + */ + @get:Schema(description = "牌組區") + @JsonProperty("deckZone") + var deckZone: DeckZone? = null +} diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/Duellist.kt b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/Duellist.kt new file mode 100644 index 0000000..becb6ab --- /dev/null +++ b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/Duellist.kt @@ -0,0 +1,40 @@ +package tw.gaas.yugioh.model.dto + +import com.fasterxml.jackson.annotation.JsonProperty +import io.swagger.v3.oas.annotations.media.Schema +import lombok.Data +import org.springframework.validation.annotation.Validated +import java.util.* +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull + +/** + * 決鬥者，任何人只要有 300 萬美金都能參加決鬥 + */ +@Schema(description = "決鬥者") +@Validated +@Data +class Duellist { + /** + * Get user + * @return user + */ + @get:Schema(required = true, description = "遊戲微服務計劃的用戶") + @JsonProperty("user") + var user: User? = null + + @JsonProperty("lifePoints") + private var lifePoints = 8000 + + /** + * Get lifePoints + * minimum: 0 + * maximum: 65535 + * @return lifePoints + */ + @Schema(required = true, description = "生命點數") + fun getLifePoints(): @NotNull @Min(0) @Max(65535) Int? { + return lifePoints + } +} diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/Game.kt b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/Game.kt new file mode 100644 index 0000000..79b4666 --- /dev/null +++ b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/Game.kt @@ -0,0 +1,64 @@ +package tw.gaas.yugioh.model.dto + +import com.fasterxml.jackson.annotation.JsonProperty +import io.swagger.v3.oas.annotations.media.Schema +import lombok.Data +import org.springframework.validation.annotation.Validated +import tw.gaas.yugioh.model.enu.Phase +import java.util.* +import javax.validation.Valid +import javax.validation.constraints.* + +/** + * 對局 + */ +@Schema(description = "對局") +@Validated +@Data +class Game { + /** + * Get gameId + * @return gameId + */ + @get:Schema(required = true, description = "對局唯一識別值") + @JsonProperty("id") + var id: String? = null + + /** + * Get phase + * @return phase + */ + @get:Schema(required = true, description = "階段") + @JsonProperty("phase") + var phase: Phase? = null + + @JsonProperty("roundNumber") + private var roundNumber = 0 + + /** + * Get myDuelField + * @return myDuelField + */ + @get:Schema(required = true, description = "我方決鬥場") + @JsonProperty("myDuelField") + var myDuelField: DuelField? = null + + /** + * Get enemyDuelField + * @return enemyDuelField + */ + @get:Schema(description = "敵方決鬥場") + @JsonProperty("enemyDuelField") + var enemyDuelField: DuelField? = null + + /** + * Get roundNumber + * minimum: 0 + * maximum: 65535 + * @return roundNumber + */ + @Schema(required = true, description = "回合數") + fun getRoundNumber(): @NotNull @Valid @Min(0) @Max(65535) Int? { + return roundNumber + } +} diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/Graveyard.kt b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/Graveyard.kt new file mode 100644 index 0000000..0a02d57 --- /dev/null +++ b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/Graveyard.kt @@ -0,0 +1,35 @@ +package tw.gaas.yugioh.model.dto + +import com.fasterxml.jackson.annotation.JsonProperty +import io.swagger.v3.oas.annotations.media.Schema +import lombok.Data +import org.springframework.validation.annotation.Validated +import java.util.* +import javax.validation.constraints.Max +import javax.validation.constraints.Min + +/** + * 墓地 + * - 我方決鬥場：卡片數量 + * - 敵方決鬥場：卡片數量 + */ +@Schema(description = "墓地 " + + "- 我方決鬥場：卡片數量 " + + "- 敵方決鬥場：卡片數量") +@Validated +@Data +class Graveyard { + @JsonProperty("count") + private var count = 0 + + /** + * Get count + * minimum: 0 + * maximum: 99 + * @return count + */ + @Schema(required = true, description = "卡片數量") + fun getCount(): @Min(0) @Max(99) Int? { + return count + } +} diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/Hand.kt b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/Hand.kt new file mode 100644 index 0000000..eafd561 --- /dev/null +++ b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/Hand.kt @@ -0,0 +1,45 @@ +package tw.gaas.yugioh.model.dto + +import com.fasterxml.jackson.annotation.JsonProperty +import io.swagger.v3.oas.annotations.media.Schema +import lombok.Data +import org.springframework.validation.annotation.Validated +import tw.gaas.yugioh.model.dto.Cards +import java.util.* +import javax.annotation.Generated +import javax.validation.constraints.Max +import javax.validation.constraints.Min + +/** + * 手牌 + * - 我方決鬥場：卡片數量以及所有的卡片完整資訊 + * - 敵方決鬥場：卡片數量 + */ +@Schema(description = "手牌 " + + "- 我方決鬥場：卡片數量以及所有的卡片完整資訊 " + + "- 敵方決鬥場：卡片數量") +@Validated +@Data +class Hand { + @JsonProperty("count") + private var count = 0 + + /** + * Get cards + * @return cards + */ + @get:Schema(description = "") + @JsonProperty("cards") + var cards: Cards? = null + + /** + * Get count + * minimum: 0 + * maximum: 99 + * @return count + */ + @Schema(required = true, description = "卡片數量") + fun getCount(): @Min(0) @Max(99) Int? { + return count + } +} diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/Location.kt b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/Location.kt new file mode 100644 index 0000000..45dae16 --- /dev/null +++ b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/Location.kt @@ -0,0 +1,43 @@ +package tw.gaas.yugioh.model.dto + +import com.fasterxml.jackson.annotation.JsonProperty +import io.swagger.v3.oas.annotations.media.Schema +import lombok.Data +import org.springframework.validation.annotation.Validated +import tw.gaas.yugioh.model.enu.BattlePosition +import tw.gaas.yugioh.model.enu.CardPosition +import tw.gaas.yugioh.model.enu.DuelFieldZone +import java.util.* +import javax.annotation.Generated + +/** + * 卡片所在區域 + */ +@Schema(description = "卡片所在區域") +@Validated +@Data +class Location { + /** + * Get zone + * @return zone + */ + @get:Schema(description = "決鬥場區域") + @JsonProperty("zone") + var zone: DuelFieldZone? = null + + /** + * Get cardPosition + * @return cardPosition + */ + @get:Schema(description = "卡片位置") + @JsonProperty("cardPosition") + var cardPosition: CardPosition? = null + + /** + * Get battlePosition + * @return battlePosition + */ + @get:Schema(description = "戰鬥位置 (怪獸卡)") + @JsonProperty("battlePosition") + var battlePosition: BattlePosition? = null +} diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/MainMonsterZone.kt b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/MainMonsterZone.kt new file mode 100644 index 0000000..cc6f032 --- /dev/null +++ b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/MainMonsterZone.kt @@ -0,0 +1,44 @@ +package tw.gaas.yugioh.model.dto + +import com.fasterxml.jackson.annotation.JsonProperty +import io.swagger.v3.oas.annotations.media.Schema +import lombok.Data +import org.springframework.validation.annotation.Validated +import tw.gaas.yugioh.model.dto.Cards +import java.util.* +import javax.validation.constraints.Max +import javax.validation.constraints.Min + +/** + * 主要怪獸區 + * - 我方決鬥場：卡片數量以及所有的卡片完整資訊 + * - 敵方決鬥場：卡片數量以及表側表示的卡片完整資訊 + */ +@Schema(description = "主要怪獸區 " + + "- 我方決鬥場：卡片數量以及所有的卡片完整資訊 " + + "- 敵方決鬥場：卡片數量以及表側表示的卡片完整資訊") +@Validated +@Data +class MainMonsterZone { + @JsonProperty("count") + private var count = 0 + + /** + * Get cards + * @return cards + */ + @get:Schema(description = "") + @JsonProperty("cards") + var cards: Cards? = null + + /** + * Get count + * minimum: 0 + * maximum: 99 + * @return count + */ + @Schema(required = true, description = "卡片數量") + fun getCount(): @Min(0) @Max(99) Int? { + return count + } +} diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/SpellTrapZone.kt b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/SpellTrapZone.kt new file mode 100644 index 0000000..927cf50 --- /dev/null +++ b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/SpellTrapZone.kt @@ -0,0 +1,43 @@ +package tw.gaas.yugioh.model.dto + +import com.fasterxml.jackson.annotation.JsonProperty +import io.swagger.v3.oas.annotations.media.Schema +import lombok.Data +import org.springframework.validation.annotation.Validated +import java.util.* +import javax.validation.constraints.Max +import javax.validation.constraints.Min + +/** + * 魔法和陷阱區 + * - 我方決鬥場：卡片數量以及所有的卡片完整資訊 + * - 敵方決鬥場：卡片數量以及表側表示的卡片完整資訊 + */ +@Schema(description = "魔法和陷阱區 " + + "- 我方決鬥場：卡片數量以及所有的卡片完整資訊 " + + "- 敵方決鬥場：卡片數量以及表側表示的卡片完整資訊") +@Validated +@Data +class SpellTrapZone { + @JsonProperty("count") + private var count = 0 + + /** + * Get cards + * @return cards + */ + @get:Schema(description = "卡片列表") + @JsonProperty("cards") + var cards: Cards? = null + + /** + * Get count + * minimum: 0 + * maximum: 99 + * @return count + */ + @Schema(required = true, description = "卡片數量") + fun getCount(): @Min(0) @Max(99) Int? { + return count + } +} diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/User.kt b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/User.kt new file mode 100644 index 0000000..bc329bc --- /dev/null +++ b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/User.kt @@ -0,0 +1,35 @@ +package tw.gaas.yugioh.model.dto + +import com.fasterxml.jackson.annotation.JsonProperty +import io.swagger.v3.oas.annotations.media.Schema +import lombok.Data +import org.springframework.validation.annotation.Validated +import java.util.* + +/** + * 遊戲微服務計劃的用戶 + */ +@Schema(description = "遊戲微服務計劃的用戶") +@Validated +@Data +class User { + /** + * 用戶唯一識別值 + * @return id + */ + @get:Schema(description = "用戶唯一識別值") + @JsonProperty("id") + var id: String? = null + + /** + * Get title + * @return title + */ + @get:Schema(description = "稱謂") + @JsonProperty("title") + var title: String? = null + fun id(id: String?): User { + this.id = id + return this + } +} diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/Attribute.kt b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/Attribute.kt new file mode 100644 index 0000000..b06baeb --- /dev/null +++ b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/Attribute.kt @@ -0,0 +1,41 @@ +package tw.gaas.yugioh.model.enu + +import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonValue + +/** + * 怪獸屬性 + * - DARK: 闇 + * - DIVINE: 神 + * - EARTH: 地 + * - FIRE: 炎 + * - LIGHT: 光 + * - WATER: 水 + * - WIND: 風 + */ +enum class Attribute(private val value: String) { + DARK("DARK"), + DIVINE("DIVINE"), + EARTH("EARTH"), + FIRE("FIRE"), + LIGHT("LIGHT"), + WATER("WATER"), + WIND("WIND"); + + @JsonValue + override fun toString(): String { + return value + } + + companion object { + @JsonCreator + fun fromValue(text: String): Attribute? { + for (b in values()) { + if (b.value == text) { + return b + } + } + return null + } + } +} diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/BattlePosition.kt b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/BattlePosition.kt new file mode 100644 index 0000000..738f739 --- /dev/null +++ b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/BattlePosition.kt @@ -0,0 +1,33 @@ +package tw.gaas.yugioh.model.enu + +import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonValue + +/** + * 戰鬥位置，為怪獸卡特有的屬性 + * - ATTACK: 攻擊表示 + * - DEFENSE: 防護表示 + * - NOT_PLACED：尚未放置於決鬥場 + */ +enum class BattlePosition(private val value: String) { + ATTACK("ATTACK"), + DEFENSE("DEFENSE"), + NOT_PLACED("NOT_PLACED"); + + @JsonValue + override fun toString(): String { + return value + } + + companion object { + @JsonCreator + fun fromValue(text: String): BattlePosition? { + for (b in values()) { + if (b.value == text) { + return b + } + } + return null + } + } +} diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/CardPosition.kt b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/CardPosition.kt new file mode 100644 index 0000000..e3c2b32 --- /dev/null +++ b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/CardPosition.kt @@ -0,0 +1,33 @@ +package tw.gaas.yugioh.model.enu + +import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonValue + +/** + * 卡片位置 + * - FACE_UP: 表側表示 + * - FACE_DOWN：裡側表示 + * - NOT_PLACED：尚未放置於決鬥場 + */ +enum class CardPosition(private val value: String) { + FACE_UP("FACE_UP"), + FACE_DOWN("FACE_DOWN"), + NOT_PLACED("NOT_PLACED"); + + @JsonValue + override fun toString(): String { + return value + } + + companion object { + @JsonCreator + fun fromValue(text: String): CardPosition? { + for (b in values()) { + if (b.value == text) { + return b + } + } + return null + } + } +} diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/CardType.kt b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/CardType.kt new file mode 100644 index 0000000..ea985fc --- /dev/null +++ b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/CardType.kt @@ -0,0 +1,33 @@ +package tw.gaas.yugioh.model.enu + +import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonValue + +/** + * 卡片類別 + * - MONSTER: 怪獸卡 + * - SPELL: 魔法卡 + * - TRAP: 陷阱卡 + */ +enum class CardType(private val value: String) { + MONSTER("MONSTER"), + SPELL("SPELL"), + TRAP("TRAP"); + + @JsonValue + override fun toString(): String { + return value + } + + companion object { + @JsonCreator + fun fromValue(text: String): CardType? { + for (b in values()) { + if (b.value == text) { + return b + } + } + return null + } + } +} diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/DuelFieldZone.kt b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/DuelFieldZone.kt new file mode 100644 index 0000000..e3554b1 --- /dev/null +++ b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/DuelFieldZone.kt @@ -0,0 +1,43 @@ +package tw.gaas.yugioh.model.enu + +import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonValue + +/** + * 決鬥場區域 + * - HAND: 手牌 + * - MAIN_MONSTER_ZONE: 主要怪獸區 + * - SPELL_TRAP_ZONE: 魔法和陷阱區 + * - FIELD_ZONE: 場地區 + * - GRAVEYARD: 墓地 + * - EXTRA_DECK_ZONE: 額外牌組區 + * - DECK_ZONE: 牌組區 + * - EXTRA_MONSTER_ZONE: 額外怪獸區 + */ +enum class DuelFieldZone(private val value: String) { + HAND("HAND"), + MAIN_MONSTER_ZONE("MAIN_MONSTER_ZONE"), + SPELL_TRAP_ZONE("SPELL_TRAP_ZONE"), + FIELD_ZONE("FIELD_ZONE"), + GRAVEYARD("GRAVEYARD"), + EXTRA_DECK_ZONE("EXTRA_DECK_ZONE"), + DECK_ZONE("DECK_ZONE"), + EXTRA_MONSTER_ZONE("EXTRA_MONSTER_ZONE"); + + @JsonValue + override fun toString(): String { + return value + } + + companion object { + @JsonCreator + fun fromValue(text: String): DuelFieldZone? { + for (b in values()) { + if (b.value == text) { + return b + } + } + return null + } + } +} diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/Icon.kt b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/Icon.kt new file mode 100644 index 0000000..fb31caf --- /dev/null +++ b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/Icon.kt @@ -0,0 +1,41 @@ +package tw.gaas.yugioh.model.enu + +import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonValue + +/** + * 魔法卡/陷阱卡類型 + * - Normal: 通常 + * - Continuous: 永續 + * - Equip: 裝備 + * - Quick-Play: 速攻 + * - Field: 場地 + * - Ritual: 儀式 + * - Counter: 反制 + */ +enum class Icon(private val value: String) { + NORMAL("NORMAL"), + CONTINUOUS("CONTINUOUS"), + EQUIP("EQUIP"), + QUICK_PLAY("QUICK_PLAY"), + FIELD("FIELD"), + RITUAL("RITUAL"), + COUNTER("COUNTER"); + + @JsonValue + override fun toString(): String { + return value + } + + companion object { + @JsonCreator + fun fromValue(text: String): Icon? { + for (b in values()) { + if (b.value == text) { + return b + } + } + return null + } + } +} diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/MonsterType.kt b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/MonsterType.kt new file mode 100644 index 0000000..d094185 --- /dev/null +++ b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/MonsterType.kt @@ -0,0 +1,77 @@ +package tw.gaas.yugioh.model.enu + +import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonValue + +/** + * 怪獸種族 + * - Aqua + * - Beast + * - Beast-Warrior + * - Creator God + * - Cyberse + * - Dinosaur + * - Divine-Beast + * - Dragon + * - Fairy + * - Fiend + * - Fish + * - Insect + * - Machine + * - Plant + * - Psychic + * - Pyro + * - Reptile + * - Rock + * - Sea Serpent + * - Spellcaster + * - Thunder + * - Warrior + * - Winged Beast + * - Wyrm + * - Zombie + */ +enum class MonsterType(private val value: String) { + AQUA("AQUA"), + BEAST("BEAST"), + BEAST_WARRIOR("BEAST_WARRIOR"), + CREATOR_GOD("CREATOR_GOD"), + CYBERSE("CYBERSE"), + DINOSAUR("DINOSAUR"), + DIVINE_BEAST("DIVINE_BEAST"), + DRAGON("DRAGON"), + FAIRY("FAIRY"), + FIEND("FIEND"), + FISH("FISH"), + INSECT("INSECT"), + MACHINE("MACHINE"), + PLANT("PLANT"), + PSYCHIC("PSYCHIC"), + PYRO("PYRO"), + REPTILE("REPTILE"), + ROCK("ROCK"), + SEA_SERPENT("SEA_SERPENT"), + SPELLCASTER("SPELLCASTER"), + THUNDER("THUNDER"), + WARRIOR("WARRIOR"), + WINGED_BEAST("WINGED_BEAST"), + WYRM("WYRM"), + ZOMBIE("ZOMBIE"); + + @JsonValue + override fun toString(): String { + return value + } + + companion object { + @JsonCreator + fun fromValue(text: String): MonsterType? { + for (b in values()) { + if (b.value == text) { + return b + } + } + return null + } + } +} diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/Phase.kt b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/Phase.kt new file mode 100644 index 0000000..b5b85cf --- /dev/null +++ b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/Phase.kt @@ -0,0 +1,41 @@ +package tw.gaas.yugioh.model.enu + +import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonValue + +/** + * 階段 + * - WAITING: 對局等待 (需要其他玩家加入) + * - READY: 對局已準備 + * - DRAW_PHASE: 抽牌階段 + * - MAIN_PHASE_1: 主要階段 1 + * - BATTLE_PHASE: 戰鬥階段 + * - END_PHASE: 結束階段 + * - FINISHED: 對局結束 + */ +enum class Phase(private val value: String) { + WAITING("WAITING"), + READY("READY"), + DRAW_PHASE("DRAW_PHASE"), + MAIN_PHASE_1("MAIN_PHASE_1"), + BATTLE_PHASE("BATTLE_PHASE"), + END_PHASE("END_PHASE"), + FINISHED("FINISHED"); + + @JsonValue + override fun toString(): String { + return value + } + + companion object { + @JsonCreator + fun fromValue(text: String): Phase? { + for (b in values()) { + if (b.value == text) { + return b + } + } + return null + } + } +} diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/resp/FindAvailableGameResp.kt b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/resp/FindAvailableGameResp.kt new file mode 100644 index 0000000..acead1a --- /dev/null +++ b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/resp/FindAvailableGameResp.kt @@ -0,0 +1,23 @@ +package tw.gaas.yugioh.model.resp + +import com.fasterxml.jackson.annotation.JsonProperty +import io.swagger.v3.oas.annotations.media.Schema +import lombok.Data +import org.springframework.validation.annotation.Validated +import tw.gaas.yugioh.model.dto.Game +import java.util.* + +/** + * 尋找可用的對局 + */ +@Validated +@Data +class FindAvailableGameResp { + /** + * Get game + * @return game + */ + @get:Schema(description = "對局") + @JsonProperty("game") + var game: Game? = null +} diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/resp/GetSpecifiedGameResp.kt b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/resp/GetSpecifiedGameResp.kt new file mode 100644 index 0000000..e07b30b --- /dev/null +++ b/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/resp/GetSpecifiedGameResp.kt @@ -0,0 +1,23 @@ +package tw.gaas.yugioh.model.resp + +import com.fasterxml.jackson.annotation.JsonProperty +import io.swagger.v3.oas.annotations.media.Schema +import lombok.Data +import org.springframework.validation.annotation.Validated +import tw.gaas.yugioh.model.dto.Game +import java.util.* + +/** + * 取得指定的對局 + */ +@Validated +@Data +class GetSpecifiedGameResp { + /** + * Get game + * @return game + */ + @get:Schema(description = "對局") + @JsonProperty("id") + var game: Game? = null +} diff --git a/yugioh-kehao/framework/src/main/resources/application.properties b/yugioh-kehao/framework/src/main/resources/application.properties new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/yugioh-kehao/framework/src/main/resources/application.properties @@ -0,0 +1 @@ + diff --git a/yugioh-kehao/framework/src/test/kotlin/tw/gaas/yugioh/YugiohApplicationTests.kt b/yugioh-kehao/framework/src/test/kotlin/tw/gaas/yugioh/YugiohApplicationTests.kt new file mode 100644 index 0000000..82d0c33 --- /dev/null +++ b/yugioh-kehao/framework/src/test/kotlin/tw/gaas/yugioh/YugiohApplicationTests.kt @@ -0,0 +1,13 @@ +package tw.gaas.yugioh + +import org.junit.jupiter.api.Test +import org.springframework.boot.test.context.SpringBootTest + +@SpringBootTest +class YugiohApplicationTests { + + @Test + fun contextLoads() { + } + +} diff --git a/yugioh-kehao/gradle/wrapper/gradle-wrapper.jar b/yugioh-kehao/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..249e5832f090a2944b7473328c07c9755baa3196 GIT binary patch literal 60756 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/yugioh-kehao/gradlew.bat b/yugioh-kehao/gradlew.bat new file mode 100644 index 0000000..f127cfd --- /dev/null +++ b/yugioh-kehao/gradlew.bat @@ -0,0 +1,91 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/yugioh-kehao/settings.gradle b/yugioh-kehao/settings.gradle new file mode 100644 index 0000000..14a715c --- /dev/null +++ b/yugioh-kehao/settings.gradle @@ -0,0 +1,12 @@ +pluginManagement { + repositories { + maven { url 'https://repo.spring.io/milestone' } + maven { url 'https://repo.spring.io/snapshot' } + gradlePluginPortal() + } +} +rootProject.name = 'yugioh' +include 'framework' +include 'application' +include 'domain' + From f06dfe1240ab562c424b892e680f06b7ae84b810 Mon Sep 17 00:00:00 2001 From: Kehao Chen Date: Sat, 17 Dec 2022 16:40:57 +0800 Subject: [PATCH 09/12] feat: add Skaffold manifests Added Skaffold manifests to implement Walking Skeleton flow for local development environments --- yugioh-kehao/framework/build.gradle | 24 ++++++++++++++++++++++++ yugioh-kehao/k8s/deployment.yaml | 11 +++++++++++ yugioh-kehao/k8s/service.yaml | 19 +++++++++++++++++++ yugioh-kehao/skaffold.yaml | 14 ++++++++++++++ 4 files changed, 68 insertions(+) create mode 100644 yugioh-kehao/k8s/deployment.yaml create mode 100644 yugioh-kehao/k8s/service.yaml create mode 100644 yugioh-kehao/skaffold.yaml diff --git a/yugioh-kehao/framework/build.gradle b/yugioh-kehao/framework/build.gradle index 24e1690..fabb24b 100644 --- a/yugioh-kehao/framework/build.gradle +++ b/yugioh-kehao/framework/build.gradle @@ -6,12 +6,22 @@ plugins { id 'org.jetbrains.kotlin.jvm' version '1.7.21' id 'org.jetbrains.kotlin.plugin.spring' version '1.7.21' id 'org.jetbrains.kotlin.plugin.jpa' version '1.7.21' + id 'com.google.cloud.tools.jib' version '3.3.1' } group = 'tw.gaas' version = '0.0.1-SNAPSHOT' sourceCompatibility = '17' +def getGitHash = { -> + def stdout = new ByteArrayOutputStream() + exec { + commandLine 'git', 'rev-parse', '--short', 'HEAD' + standardOutput = stdout + } + return stdout.toString().trim() +} + configurations { compileOnly { extendsFrom annotationProcessor @@ -56,3 +66,17 @@ tasks.withType(KotlinCompile).configureEach { tasks.named('test') { useJUnitPlatform() } + +jib { + def gitHash = getGitHash() + def versionTag = String.format("%s-%s", project.version, gitHash) + def yugiohContainerImage = System.getenv('CR_URI') ?: 'docker.io/hhnj/yugioh' + to { + image = yugiohContainerImage + tags = [versionTag, 'latest'] as List + auth { + username = System.getenv('CR_USERNAME') ?: '' + password = System.getenv('CR_PASSWORD') ?: '' + } + } +} diff --git a/yugioh-kehao/k8s/deployment.yaml b/yugioh-kehao/k8s/deployment.yaml new file mode 100644 index 0000000..73b2357 --- /dev/null +++ b/yugioh-kehao/k8s/deployment.yaml @@ -0,0 +1,11 @@ +apiVersion: v1 +kind: Service +metadata: + name: yugioh +spec: + ports: + - port: 80 + name: http + type: LoadBalancer + selector: + app: yugioh diff --git a/yugioh-kehao/k8s/service.yaml b/yugioh-kehao/k8s/service.yaml new file mode 100644 index 0000000..2871343 --- /dev/null +++ b/yugioh-kehao/k8s/service.yaml @@ -0,0 +1,19 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: yugioh +spec: + selector: + matchLabels: + app: yugioh + template: + metadata: + labels: + app: yugioh + spec: + containers: + - name: yugioh + image: docker.io/hhnj/yugioh + imagePullPolicy: Always + ports: + - containerPort: 8080 diff --git a/yugioh-kehao/skaffold.yaml b/yugioh-kehao/skaffold.yaml new file mode 100644 index 0000000..60c6933 --- /dev/null +++ b/yugioh-kehao/skaffold.yaml @@ -0,0 +1,14 @@ +apiVersion: skaffold/v2beta5 +kind: Config +metadata: + name: yugioh +build: + artifacts: + - image: docker.io/hhnj/yugioh + jib: + project: framework + type: gradle +deploy: + kubectl: + manifests: + - "k8s/*.yaml" From 0a2a2dd9c344ac2cf698d38f5e9b94f9d98f4b46 Mon Sep 17 00:00:00 2001 From: Kehao Chen Date: Sat, 17 Dec 2022 18:18:47 +0800 Subject: [PATCH 10/12] feat: add GitHub Action manifest --- .github/workflows/github-actions-kehao.yaml | 41 +++++++++++++++++++++ yugioh-kehao/gradlew | 0 yugioh-kehao/gradlew.bat | 0 3 files changed, 41 insertions(+) create mode 100644 .github/workflows/github-actions-kehao.yaml mode change 100644 => 100755 yugioh-kehao/gradlew mode change 100644 => 100755 yugioh-kehao/gradlew.bat diff --git a/.github/workflows/github-actions-kehao.yaml b/.github/workflows/github-actions-kehao.yaml new file mode 100644 index 0000000..8d6fa38 --- /dev/null +++ b/.github/workflows/github-actions-kehao.yaml @@ -0,0 +1,41 @@ +name: Kehao's Walking Skeleton Implementation + +on: + push: + branches: + - 'practice/kehao' + +permissions: + contents: read + +jobs: + build-kehao: + environment: kehao + runs-on: ubuntu-latest + defaults: + run: + working-directory: ./yugioh-kehao + steps: + - name: Git checkout + uses: actions/checkout@v3 + + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'temurin' + + - name: Set up Gradle + uses: gradle/gradle-build-action@v2 + with: + build-root-directory: ./yugioh-kehao + + - name: Execute Gradle test task + run: ./gradlew test + + - name: Execute Gradle jib task + run: ./gradlew jib + env: + CR_URI: ${{ secrets.CR_URI }} + CR_USERNAME: ${{ secrets.CR_USERNAME }} + CR_PASSWORD: ${{ secrets.CR_PASSWORD }} diff --git a/yugioh-kehao/gradlew b/yugioh-kehao/gradlew old mode 100644 new mode 100755 diff --git a/yugioh-kehao/gradlew.bat b/yugioh-kehao/gradlew.bat old mode 100644 new mode 100755 From 2b3d65c5c534fb20ac210b1499240827db22e7aa Mon Sep 17 00:00:00 2001 From: Kehao Chen Date: Tue, 21 Mar 2023 21:04:03 +0800 Subject: [PATCH 11/12] feat: add BDD Framework to facilitate future functional verification testing --- .gitattributes | 8 +++ yugioh-kehao/application/build.gradle | 8 ++- yugioh-kehao/application/lombok.config | 2 + .../tw/gaas/yugioh/application/Presenter.kt | 7 +++ .../yugioh/application/gateway/GameGateway.kt | 10 ++++ .../yugioh/application/gateway/UserGateway.kt | 9 +++ .../interactor/FindGameInteractor.kt | 28 +++++++++ .../interactor/JoinGameInteractor.kt | 37 ++++++++++++ .../application/model/req/FindGameReq.kt | 3 + .../application/model/req/JoinGameReq.kt | 3 + .../application/model/resp/BasicResp.kt | 7 +++ .../application/model/resp/FindGameResp.kt | 11 ++++ .../application/model/resp/JoinGameResp.kt | 12 ++++ yugioh-kehao/domain/build.gradle | 7 ++- yugioh-kehao/domain/lombok.config | 2 + .../tw/gaas/yugioh/domain/entity/Card.kt | 16 ++++++ .../tw/gaas/yugioh/domain/entity/CardInfo.kt | 32 +++++++++++ .../tw/gaas/yugioh/domain/entity/Cards.kt | 9 +++ .../tw/gaas/yugioh/domain/entity/DeckZone.kt | 14 +++++ .../tw/gaas/yugioh/domain/entity/DuelField.kt | 23 ++++++++ .../tw/gaas/yugioh/domain/entity/Duellist.kt | 14 +++++ .../tw/gaas/yugioh/domain/entity/Game.kt | 46 +++++++++++++++ .../tw/gaas/yugioh/domain/entity/Graveyard.kt | 14 +++++ .../tw/gaas/yugioh/domain/entity/Hand.kt | 14 +++++ .../tw/gaas/yugioh/domain/entity/Location.kt | 19 +++++++ .../yugioh/domain/entity/MainMonsterZone.kt | 14 +++++ .../yugioh/domain/entity/SpellTrapZone.kt | 14 +++++ .../tw/gaas/yugioh/domain/entity/User.kt | 14 +++++ .../tw/gaas/yugioh/domain/enu/Attribute.kt | 21 +++++++ .../gaas/yugioh/domain/enu/BattlePosition.kt | 13 +++++ .../tw/gaas/yugioh/domain/enu/CardPosition.kt | 13 +++++ .../tw/gaas/yugioh/domain/enu/CardType.kt | 13 +++++ .../gaas/yugioh/domain/enu/DuelFieldZone.kt | 23 ++++++++ .../kotlin/tw/gaas/yugioh/domain/enu/Icon.kt | 21 +++++++ .../tw/gaas/yugioh/domain/enu/MonsterType.kt | 57 +++++++++++++++++++ .../kotlin/tw/gaas/yugioh/domain/enu/Phase.kt | 21 +++++++ .../gaas/yugioh/domain/error/DemoException.kt | 7 +++ .../gaas/yugioh/domain/event/DomainEvent.kt | 4 ++ yugioh-kehao/examples.http | 9 +++ .../src/main/resources/application.properties | 1 - .../tw/gaas/yugioh/YugiohApplicationTests.kt | 13 ----- yugioh-kehao/http-client.env.json | 5 ++ .../build.gradle | 47 ++++++++------- yugioh-kehao/interface_adapter/lombok.config | 2 + .../tw/gaas/yugioh/YugiohApplication.kt | 2 + .../kotlin/tw/gaas/yugioh/api/GamesApi.kt | 4 +- .../tw/gaas/yugioh/api/GamesApiController.kt | 0 .../tw/gaas/yugioh/api/PingController.kt | 5 +- .../tw/gaas/yugioh/config/SecurityConfig.kt | 52 +++++++++++++++++ .../config/SwaggerDocumentationConfig.kt | 0 .../kotlin/tw/gaas/yugioh/model/dto/Card.kt | 0 .../tw/gaas/yugioh/model/dto/CardInfo.kt | 0 .../kotlin/tw/gaas/yugioh/model/dto/Cards.kt | 0 .../tw/gaas/yugioh/model/dto/DeckZone.kt | 0 .../tw/gaas/yugioh/model/dto/DuelField.kt | 0 .../tw/gaas/yugioh/model/dto/Duellist.kt | 0 .../kotlin/tw/gaas/yugioh/model/dto/Game.kt | 0 .../tw/gaas/yugioh/model/dto/Graveyard.kt | 0 .../kotlin/tw/gaas/yugioh/model/dto/Hand.kt | 0 .../tw/gaas/yugioh/model/dto/Location.kt | 0 .../gaas/yugioh/model/dto/MainMonsterZone.kt | 0 .../tw/gaas/yugioh/model/dto/SpellTrapZone.kt | 0 .../kotlin/tw/gaas/yugioh/model/dto/User.kt | 0 .../tw/gaas/yugioh/model/enu/Attribute.kt | 0 .../gaas/yugioh/model/enu/BattlePosition.kt | 0 .../tw/gaas/yugioh/model/enu/CardPosition.kt | 0 .../tw/gaas/yugioh/model/enu/CardType.kt | 0 .../tw/gaas/yugioh/model/enu/DuelFieldZone.kt | 0 .../kotlin/tw/gaas/yugioh/model/enu/Icon.kt | 0 .../tw/gaas/yugioh/model/enu/MonsterType.kt | 0 .../kotlin/tw/gaas/yugioh/model/enu/Phase.kt | 0 .../model/resp/FindAvailableGameResp.kt | 0 .../yugioh/model/resp/GetSpecifiedGameResp.kt | 0 .../src/main/resources/application.yaml | 8 +++ .../CucumberTestContextConfiguration.kt | 10 ++++ .../tw/gaas/yugioh/JoinGameStepDefinitions.kt | 35 ++++++++++++ .../tw/gaas/yugioh/PingStepDefinitions.kt | 41 +++++++++++++ .../tw/gaas/yugioh/PlayerStepDefinitions.kt | 16 ++++++ .../kotlin/tw/gaas/yugioh/RunCucumberTest.kt | 13 +++++ .../tw/gaas/yugioh/join-game.feature | 6 ++ .../tw/gaas/yugioh/ping-pong.feature | 6 ++ yugioh-kehao/settings.gradle | 2 +- yugioh-kehao/skaffold.yaml | 18 +++--- yugioh-kehao/yugioh.asta | 3 + 84 files changed, 835 insertions(+), 53 deletions(-) create mode 100644 .gitattributes create mode 100644 yugioh-kehao/application/lombok.config create mode 100644 yugioh-kehao/application/src/main/kotlin/tw/gaas/yugioh/application/Presenter.kt create mode 100644 yugioh-kehao/application/src/main/kotlin/tw/gaas/yugioh/application/gateway/GameGateway.kt create mode 100644 yugioh-kehao/application/src/main/kotlin/tw/gaas/yugioh/application/gateway/UserGateway.kt create mode 100644 yugioh-kehao/application/src/main/kotlin/tw/gaas/yugioh/application/interactor/FindGameInteractor.kt create mode 100644 yugioh-kehao/application/src/main/kotlin/tw/gaas/yugioh/application/interactor/JoinGameInteractor.kt create mode 100644 yugioh-kehao/application/src/main/kotlin/tw/gaas/yugioh/application/model/req/FindGameReq.kt create mode 100644 yugioh-kehao/application/src/main/kotlin/tw/gaas/yugioh/application/model/req/JoinGameReq.kt create mode 100644 yugioh-kehao/application/src/main/kotlin/tw/gaas/yugioh/application/model/resp/BasicResp.kt create mode 100644 yugioh-kehao/application/src/main/kotlin/tw/gaas/yugioh/application/model/resp/FindGameResp.kt create mode 100644 yugioh-kehao/application/src/main/kotlin/tw/gaas/yugioh/application/model/resp/JoinGameResp.kt create mode 100644 yugioh-kehao/domain/lombok.config create mode 100644 yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/Card.kt create mode 100644 yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/CardInfo.kt create mode 100644 yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/Cards.kt create mode 100644 yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/DeckZone.kt create mode 100644 yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/DuelField.kt create mode 100644 yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/Duellist.kt create mode 100644 yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/Game.kt create mode 100644 yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/Graveyard.kt create mode 100644 yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/Hand.kt create mode 100644 yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/Location.kt create mode 100644 yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/MainMonsterZone.kt create mode 100644 yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/SpellTrapZone.kt create mode 100644 yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/User.kt create mode 100644 yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/enu/Attribute.kt create mode 100644 yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/enu/BattlePosition.kt create mode 100644 yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/enu/CardPosition.kt create mode 100644 yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/enu/CardType.kt create mode 100644 yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/enu/DuelFieldZone.kt create mode 100644 yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/enu/Icon.kt create mode 100644 yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/enu/MonsterType.kt create mode 100644 yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/enu/Phase.kt create mode 100644 yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/error/DemoException.kt create mode 100644 yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/event/DomainEvent.kt create mode 100644 yugioh-kehao/examples.http delete mode 100644 yugioh-kehao/framework/src/main/resources/application.properties delete mode 100644 yugioh-kehao/framework/src/test/kotlin/tw/gaas/yugioh/YugiohApplicationTests.kt create mode 100644 yugioh-kehao/http-client.env.json rename yugioh-kehao/{framework => interface_adapter}/build.gradle (74%) create mode 100644 yugioh-kehao/interface_adapter/lombok.config rename yugioh-kehao/{framework => interface_adapter}/src/main/kotlin/tw/gaas/yugioh/YugiohApplication.kt (76%) rename yugioh-kehao/{framework => interface_adapter}/src/main/kotlin/tw/gaas/yugioh/api/GamesApi.kt (94%) rename yugioh-kehao/{framework => interface_adapter}/src/main/kotlin/tw/gaas/yugioh/api/GamesApiController.kt (100%) rename yugioh-kehao/{framework => interface_adapter}/src/main/kotlin/tw/gaas/yugioh/api/PingController.kt (69%) create mode 100644 yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/config/SecurityConfig.kt rename yugioh-kehao/{framework => interface_adapter}/src/main/kotlin/tw/gaas/yugioh/config/SwaggerDocumentationConfig.kt (100%) rename yugioh-kehao/{framework => interface_adapter}/src/main/kotlin/tw/gaas/yugioh/model/dto/Card.kt (100%) rename yugioh-kehao/{framework => interface_adapter}/src/main/kotlin/tw/gaas/yugioh/model/dto/CardInfo.kt (100%) rename yugioh-kehao/{framework => interface_adapter}/src/main/kotlin/tw/gaas/yugioh/model/dto/Cards.kt (100%) rename yugioh-kehao/{framework => interface_adapter}/src/main/kotlin/tw/gaas/yugioh/model/dto/DeckZone.kt (100%) rename yugioh-kehao/{framework => interface_adapter}/src/main/kotlin/tw/gaas/yugioh/model/dto/DuelField.kt (100%) rename yugioh-kehao/{framework => interface_adapter}/src/main/kotlin/tw/gaas/yugioh/model/dto/Duellist.kt (100%) rename yugioh-kehao/{framework => interface_adapter}/src/main/kotlin/tw/gaas/yugioh/model/dto/Game.kt (100%) rename yugioh-kehao/{framework => interface_adapter}/src/main/kotlin/tw/gaas/yugioh/model/dto/Graveyard.kt (100%) rename yugioh-kehao/{framework => interface_adapter}/src/main/kotlin/tw/gaas/yugioh/model/dto/Hand.kt (100%) rename yugioh-kehao/{framework => interface_adapter}/src/main/kotlin/tw/gaas/yugioh/model/dto/Location.kt (100%) rename yugioh-kehao/{framework => interface_adapter}/src/main/kotlin/tw/gaas/yugioh/model/dto/MainMonsterZone.kt (100%) rename yugioh-kehao/{framework => interface_adapter}/src/main/kotlin/tw/gaas/yugioh/model/dto/SpellTrapZone.kt (100%) rename yugioh-kehao/{framework => interface_adapter}/src/main/kotlin/tw/gaas/yugioh/model/dto/User.kt (100%) rename yugioh-kehao/{framework => interface_adapter}/src/main/kotlin/tw/gaas/yugioh/model/enu/Attribute.kt (100%) rename yugioh-kehao/{framework => interface_adapter}/src/main/kotlin/tw/gaas/yugioh/model/enu/BattlePosition.kt (100%) rename yugioh-kehao/{framework => interface_adapter}/src/main/kotlin/tw/gaas/yugioh/model/enu/CardPosition.kt (100%) rename yugioh-kehao/{framework => interface_adapter}/src/main/kotlin/tw/gaas/yugioh/model/enu/CardType.kt (100%) rename yugioh-kehao/{framework => interface_adapter}/src/main/kotlin/tw/gaas/yugioh/model/enu/DuelFieldZone.kt (100%) rename yugioh-kehao/{framework => interface_adapter}/src/main/kotlin/tw/gaas/yugioh/model/enu/Icon.kt (100%) rename yugioh-kehao/{framework => interface_adapter}/src/main/kotlin/tw/gaas/yugioh/model/enu/MonsterType.kt (100%) rename yugioh-kehao/{framework => interface_adapter}/src/main/kotlin/tw/gaas/yugioh/model/enu/Phase.kt (100%) rename yugioh-kehao/{framework => interface_adapter}/src/main/kotlin/tw/gaas/yugioh/model/resp/FindAvailableGameResp.kt (100%) rename yugioh-kehao/{framework => interface_adapter}/src/main/kotlin/tw/gaas/yugioh/model/resp/GetSpecifiedGameResp.kt (100%) create mode 100644 yugioh-kehao/interface_adapter/src/main/resources/application.yaml create mode 100644 yugioh-kehao/interface_adapter/src/test/kotlin/tw/gaas/yugioh/CucumberTestContextConfiguration.kt create mode 100644 yugioh-kehao/interface_adapter/src/test/kotlin/tw/gaas/yugioh/JoinGameStepDefinitions.kt create mode 100644 yugioh-kehao/interface_adapter/src/test/kotlin/tw/gaas/yugioh/PingStepDefinitions.kt create mode 100644 yugioh-kehao/interface_adapter/src/test/kotlin/tw/gaas/yugioh/PlayerStepDefinitions.kt create mode 100644 yugioh-kehao/interface_adapter/src/test/kotlin/tw/gaas/yugioh/RunCucumberTest.kt create mode 100644 yugioh-kehao/interface_adapter/src/test/resources/tw/gaas/yugioh/join-game.feature create mode 100644 yugioh-kehao/interface_adapter/src/test/resources/tw/gaas/yugioh/ping-pong.feature create mode 100644 yugioh-kehao/yugioh.asta diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..bca3e61 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,8 @@ +*.jpg filter=lfs diff=lfs merge=lfs -text +*.gif filter=lfs diff=lfs merge=lfs -text +*.webp filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.svg filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.ico filter=lfs diff=lfs merge=lfs -text +*.asta filter=lfs diff=lfs merge=lfs -text \ No newline at end of file diff --git a/yugioh-kehao/application/build.gradle b/yugioh-kehao/application/build.gradle index f0a1273..a2e19d4 100644 --- a/yugioh-kehao/application/build.gradle +++ b/yugioh-kehao/application/build.gradle @@ -1,5 +1,7 @@ plugins { - id 'org.jetbrains.kotlin.jvm' version '1.7.21' + id 'org.jetbrains.kotlin.jvm' version '1.8.10' + id 'org.jetbrains.kotlin.plugin.lombok' version '1.8.10' + id 'io.freefair.lombok' version '5.3.0' } group 'tw.gaas.yugioh' @@ -11,8 +13,10 @@ repositories { } dependencies { + implementation project(path: ':domain') + implementation 'org.jetbrains.kotlin:kotlin-reflect' + implementation 'org.jetbrains.kotlin:kotlin-stdlib' testImplementation 'org.jetbrains.kotlin:kotlin-test' - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" } test { diff --git a/yugioh-kehao/application/lombok.config b/yugioh-kehao/application/lombok.config new file mode 100644 index 0000000..6aa51d7 --- /dev/null +++ b/yugioh-kehao/application/lombok.config @@ -0,0 +1,2 @@ +# This file is generated by the 'io.freefair.lombok' Gradle plugin +config.stopBubbling = true diff --git a/yugioh-kehao/application/src/main/kotlin/tw/gaas/yugioh/application/Presenter.kt b/yugioh-kehao/application/src/main/kotlin/tw/gaas/yugioh/application/Presenter.kt new file mode 100644 index 0000000..6d484ba --- /dev/null +++ b/yugioh-kehao/application/src/main/kotlin/tw/gaas/yugioh/application/Presenter.kt @@ -0,0 +1,7 @@ +package tw.gaas.yugioh.application + +import tw.gaas.yugioh.application.model.resp.BasicResp + +interface Presenter { + fun present(resp: BasicResp) +} diff --git a/yugioh-kehao/application/src/main/kotlin/tw/gaas/yugioh/application/gateway/GameGateway.kt b/yugioh-kehao/application/src/main/kotlin/tw/gaas/yugioh/application/gateway/GameGateway.kt new file mode 100644 index 0000000..85d24a4 --- /dev/null +++ b/yugioh-kehao/application/src/main/kotlin/tw/gaas/yugioh/application/gateway/GameGateway.kt @@ -0,0 +1,10 @@ +package tw.gaas.yugioh.application.gateway + +import tw.gaas.yugioh.domain.entity.Game + +interface GameGateway { + // FIXME: 當前是直接使用 Entity 進行資料儲存，也許需要 Data Mapper 轉換 + fun find(id: String): Game? + fun save(game: Game) + fun findAvailableGame(): Game +} diff --git a/yugioh-kehao/application/src/main/kotlin/tw/gaas/yugioh/application/gateway/UserGateway.kt b/yugioh-kehao/application/src/main/kotlin/tw/gaas/yugioh/application/gateway/UserGateway.kt new file mode 100644 index 0000000..f506baf --- /dev/null +++ b/yugioh-kehao/application/src/main/kotlin/tw/gaas/yugioh/application/gateway/UserGateway.kt @@ -0,0 +1,9 @@ +package tw.gaas.yugioh.application.gateway + +import tw.gaas.yugioh.domain.entity.User + +interface UserGateway { + // FIXME: 當前是直接使用 Entity 進行資料儲存，也許需要 Data Mapper 轉換 + fun find(id: String): User? + fun save(user: User) +} diff --git a/yugioh-kehao/application/src/main/kotlin/tw/gaas/yugioh/application/interactor/FindGameInteractor.kt b/yugioh-kehao/application/src/main/kotlin/tw/gaas/yugioh/application/interactor/FindGameInteractor.kt new file mode 100644 index 0000000..b98747e --- /dev/null +++ b/yugioh-kehao/application/src/main/kotlin/tw/gaas/yugioh/application/interactor/FindGameInteractor.kt @@ -0,0 +1,28 @@ +package tw.gaas.yugioh.application.interactor + +import tw.gaas.yugioh.application.Presenter +import tw.gaas.yugioh.application.gateway.GameGateway +import tw.gaas.yugioh.application.gateway.UserGateway +import tw.gaas.yugioh.application.model.req.FindGameReq +import tw.gaas.yugioh.application.model.resp.JoinGameResp +import tw.gaas.yugioh.domain.error.DemoException + +class FindGameInteractor( + private val userGateway: UserGateway, + private val gameGateway: GameGateway +) { + public fun find(req: FindGameReq, presenter: Presenter) { + // 查詢指定 ID 遊戲 + val game = this.gameGateway.find(req.gameId) + if (game == null) { + val error = DemoException("查無指定 ID 的遊戲") + val resp = JoinGameResp(error = error) + presenter.present(resp) + return + } + + // 推送事件 + val resp = JoinGameResp(game = game) + presenter.present(resp) + } +} diff --git a/yugioh-kehao/application/src/main/kotlin/tw/gaas/yugioh/application/interactor/JoinGameInteractor.kt b/yugioh-kehao/application/src/main/kotlin/tw/gaas/yugioh/application/interactor/JoinGameInteractor.kt new file mode 100644 index 0000000..797e804 --- /dev/null +++ b/yugioh-kehao/application/src/main/kotlin/tw/gaas/yugioh/application/interactor/JoinGameInteractor.kt @@ -0,0 +1,37 @@ +package tw.gaas.yugioh.application.interactor + +import tw.gaas.yugioh.application.Presenter +import tw.gaas.yugioh.application.gateway.GameGateway +import tw.gaas.yugioh.application.gateway.UserGateway +import tw.gaas.yugioh.application.model.req.JoinGameReq +import tw.gaas.yugioh.application.model.resp.FindGameResp +import tw.gaas.yugioh.application.model.resp.JoinGameResp +import tw.gaas.yugioh.domain.error.DemoException + +class JoinGameInteractor( + private val userGateway: UserGateway, + private val gameGateway: GameGateway +) { + fun join(joinGameReq: JoinGameReq, presenter: Presenter) { + // 查詢 User + val user = this.userGateway.find(joinGameReq.userId) + if (user == null) { + val error = DemoException("查無對應 ID 的使用者") + val resp = FindGameResp(error = error) + presenter.present(resp) + return + } + + // 尋找可加入 Game + val game = this.gameGateway.findAvailableGame() + // 觸發 Event + val event = game.join(user) + + // 儲存 Game + this.gameGateway.save(game) + + // 推送事件 + val resp = JoinGameResp(event, game) + presenter.present(resp) + } +} diff --git a/yugioh-kehao/application/src/main/kotlin/tw/gaas/yugioh/application/model/req/FindGameReq.kt b/yugioh-kehao/application/src/main/kotlin/tw/gaas/yugioh/application/model/req/FindGameReq.kt new file mode 100644 index 0000000..62678ef --- /dev/null +++ b/yugioh-kehao/application/src/main/kotlin/tw/gaas/yugioh/application/model/req/FindGameReq.kt @@ -0,0 +1,3 @@ +package tw.gaas.yugioh.application.model.req + +data class FindGameReq(val gameId: String) diff --git a/yugioh-kehao/application/src/main/kotlin/tw/gaas/yugioh/application/model/req/JoinGameReq.kt b/yugioh-kehao/application/src/main/kotlin/tw/gaas/yugioh/application/model/req/JoinGameReq.kt new file mode 100644 index 0000000..0f924b0 --- /dev/null +++ b/yugioh-kehao/application/src/main/kotlin/tw/gaas/yugioh/application/model/req/JoinGameReq.kt @@ -0,0 +1,3 @@ +package tw.gaas.yugioh.application.model.req + +data class JoinGameReq(val userId: String) diff --git a/yugioh-kehao/application/src/main/kotlin/tw/gaas/yugioh/application/model/resp/BasicResp.kt b/yugioh-kehao/application/src/main/kotlin/tw/gaas/yugioh/application/model/resp/BasicResp.kt new file mode 100644 index 0000000..c771745 --- /dev/null +++ b/yugioh-kehao/application/src/main/kotlin/tw/gaas/yugioh/application/model/resp/BasicResp.kt @@ -0,0 +1,7 @@ +package tw.gaas.yugioh.application.model.resp + +import lombok.Data + +open class BasicResp( + error: Exception? = null +) diff --git a/yugioh-kehao/application/src/main/kotlin/tw/gaas/yugioh/application/model/resp/FindGameResp.kt b/yugioh-kehao/application/src/main/kotlin/tw/gaas/yugioh/application/model/resp/FindGameResp.kt new file mode 100644 index 0000000..1521494 --- /dev/null +++ b/yugioh-kehao/application/src/main/kotlin/tw/gaas/yugioh/application/model/resp/FindGameResp.kt @@ -0,0 +1,11 @@ +package tw.gaas.yugioh.application.model.resp + +import lombok.Data +import tw.gaas.yugioh.domain.entity.Game +import tw.gaas.yugioh.domain.event.DomainEvent + +@Data +class FindGameResp( + game: Game? = null, + error: Exception? = null, +) : BasicResp(error) diff --git a/yugioh-kehao/application/src/main/kotlin/tw/gaas/yugioh/application/model/resp/JoinGameResp.kt b/yugioh-kehao/application/src/main/kotlin/tw/gaas/yugioh/application/model/resp/JoinGameResp.kt new file mode 100644 index 0000000..f415b63 --- /dev/null +++ b/yugioh-kehao/application/src/main/kotlin/tw/gaas/yugioh/application/model/resp/JoinGameResp.kt @@ -0,0 +1,12 @@ +package tw.gaas.yugioh.application.model.resp + +import lombok.Data +import tw.gaas.yugioh.domain.entity.Game +import tw.gaas.yugioh.domain.event.DomainEvent + +@Data +class JoinGameResp( + event: DomainEvent? = null, + game: Game? = null, + error: Exception? = null +) : BasicResp(error) diff --git a/yugioh-kehao/domain/build.gradle b/yugioh-kehao/domain/build.gradle index f0a1273..93aab07 100644 --- a/yugioh-kehao/domain/build.gradle +++ b/yugioh-kehao/domain/build.gradle @@ -1,5 +1,7 @@ plugins { - id 'org.jetbrains.kotlin.jvm' version '1.7.21' + id 'org.jetbrains.kotlin.jvm' version '1.8.10' + id 'org.jetbrains.kotlin.plugin.lombok' version '1.8.10' + id 'io.freefair.lombok' version '5.3.0' } group 'tw.gaas.yugioh' @@ -11,8 +13,9 @@ repositories { } dependencies { + implementation 'org.jetbrains.kotlin:kotlin-reflect' + implementation 'org.jetbrains.kotlin:kotlin-stdlib' testImplementation 'org.jetbrains.kotlin:kotlin-test' - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" } test { diff --git a/yugioh-kehao/domain/lombok.config b/yugioh-kehao/domain/lombok.config new file mode 100644 index 0000000..6aa51d7 --- /dev/null +++ b/yugioh-kehao/domain/lombok.config @@ -0,0 +1,2 @@ +# This file is generated by the 'io.freefair.lombok' Gradle plugin +config.stopBubbling = true diff --git a/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/Card.kt b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/Card.kt new file mode 100644 index 0000000..188b089 --- /dev/null +++ b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/Card.kt @@ -0,0 +1,16 @@ +package tw.gaas.yugioh.domain.entity + +import lombok.Data + +/** + * 卡片 + * @param seq 卡片序號 + * @param info 卡片資訊 (牌庫資料) + * @param location 卡片所在區域 + */ +@Data +class Card( + private val seq: String, + private val info: CardInfo, + private val location: Location = Location() +) diff --git a/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/CardInfo.kt b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/CardInfo.kt new file mode 100644 index 0000000..a9b35bd --- /dev/null +++ b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/CardInfo.kt @@ -0,0 +1,32 @@ +package tw.gaas.yugioh.domain.entity + +import tw.gaas.yugioh.domain.enu.Attribute +import tw.gaas.yugioh.domain.enu.CardType +import tw.gaas.yugioh.domain.enu.Icon +import tw.gaas.yugioh.domain.enu.MonsterType + +/** + * 卡片資訊 (牌庫資料) + * @param id 遊戲王卡片編號 + * @param name 名稱 + * @param type 類別 + * @param description 敘述 + * @param attribute 屬性 (怪獸卡) + * @param icon 效果標記 (魔法卡/陷阱卡) + * @param monsterType 怪獸種族 (怪獸卡) + * @param level 等級 + * @param attack 攻擊力 + * @param defense 守備力 + */ +data class CardInfo( + val id: String, + val name: String, + val type: CardType, + val description: String, + val attribute: Attribute?, + val icon: Icon? = null, + val monsterType: MonsterType? = null, + val level: Int? = null, + val attack: Int? = null, + val defense: Int? = null +) diff --git a/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/Cards.kt b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/Cards.kt new file mode 100644 index 0000000..4a369a3 --- /dev/null +++ b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/Cards.kt @@ -0,0 +1,9 @@ +package tw.gaas.yugioh.domain.entity + +import lombok.Data + +/** + * 卡片集合，目前採取 array 形式存在 + */ +@Data +class Cards : ArrayList() diff --git a/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/DeckZone.kt b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/DeckZone.kt new file mode 100644 index 0000000..147089a --- /dev/null +++ b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/DeckZone.kt @@ -0,0 +1,14 @@ +package tw.gaas.yugioh.domain.entity + +import lombok.Data + +/** + * 牌組區 + * @param count 卡片數量 + * @param cards 卡片集合 + */ +@Data +class DeckZone( + private var count: Int = 0, + private val cards: Cards = Cards() +) diff --git a/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/DuelField.kt b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/DuelField.kt new file mode 100644 index 0000000..8ac419a --- /dev/null +++ b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/DuelField.kt @@ -0,0 +1,23 @@ +package tw.gaas.yugioh.domain.entity + +import lombok.Data +import java.util.* + +/** + * 決鬥場 + * @param duellist 決鬥者 + * @param hand 手牌 + * @param mainMonsterZone 主要怪獸區 + * @param spellTrapZone 魔法和陷阱區 + * @param graveyard 墓地 + * @param deckZone 牌組區 + */ +@Data +class DuelField( + private val duellist: Duellist, + private val hand: Hand = Hand(), + private val mainMonsterZone: MainMonsterZone = MainMonsterZone(), + private val spellTrapZone: SpellTrapZone = SpellTrapZone(), + private val graveyard: Graveyard = Graveyard(), + private var deckZone: DeckZone = DeckZone() +) diff --git a/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/Duellist.kt b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/Duellist.kt new file mode 100644 index 0000000..c0f16a5 --- /dev/null +++ b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/Duellist.kt @@ -0,0 +1,14 @@ +package tw.gaas.yugioh.domain.entity + +import lombok.Data + +/** + * 決鬥者，任何人只要有 300 萬美金都能參加決鬥 + * @param user 遊戲微服務計劃的用戶 + * @param lifePoints 生命值 + */ +@Data +class Duellist( + private val user: User, + private var lifePoints: Int = 8000 +) diff --git a/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/Game.kt b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/Game.kt new file mode 100644 index 0000000..70a78b5 --- /dev/null +++ b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/Game.kt @@ -0,0 +1,46 @@ +package tw.gaas.yugioh.domain.entity + +import lombok.Data +import tw.gaas.yugioh.domain.enu.Phase +import tw.gaas.yugioh.domain.error.DemoException +import tw.gaas.yugioh.domain.event.DomainEvent +import java.util.Vector + +const val DEFAULT_DUEL_FIELD_SIZE = 2 + +/** + * 對局 + * @param id 對局唯一識別值 + * @param phase 階段 + * @param roundNumber 回合數 + * @param duelFields 決鬥場 (目前僅支援雙人決鬥) + */ +@Data +class Game( + private val id: String, + private var phase: Phase = Phase.WAITING, + private var roundNumber: Int = 0, + private var duelFields : Vector = Vector(DEFAULT_DUEL_FIELD_SIZE) +) { + /** + * 加入遊戲 + * @param user 遊戲微服務計劃的用戶 + */ + fun join(user: User): DomainEvent { + val isWaiting = phase == Phase.WAITING + val notEnoughDuelists = duelFields.size < duelFields.capacity() + if (!isWaiting || !notEnoughDuelists) { + throw DemoException() + } + val duellist = Duellist(user) + val duelField = DuelField(duellist) + duelFields.add(duelField) + + val enoughDuelists = duelFields.size == duelFields.capacity() + if (enoughDuelists) { + phase = Phase.READY + } + // FIXME + return DomainEvent() + } +} diff --git a/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/Graveyard.kt b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/Graveyard.kt new file mode 100644 index 0000000..e50945c --- /dev/null +++ b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/Graveyard.kt @@ -0,0 +1,14 @@ +package tw.gaas.yugioh.domain.entity + +import lombok.Data + +/** + * 墓地 + * @param count 卡片數量 + * @param cards 卡片集合 + */ +@Data +class Graveyard( + private var count: Int = 0, + private val cards: Cards = Cards() +) diff --git a/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/Hand.kt b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/Hand.kt new file mode 100644 index 0000000..43fa0c4 --- /dev/null +++ b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/Hand.kt @@ -0,0 +1,14 @@ +package tw.gaas.yugioh.domain.entity + +import lombok.Data + +/** + * 手牌 + * @param count 卡片數量 + * @param cards 卡片集合 + */ +@Data +class Hand( + private var count: Int = 0, + private val cards: Cards = Cards() +) diff --git a/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/Location.kt b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/Location.kt new file mode 100644 index 0000000..7c2775c --- /dev/null +++ b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/Location.kt @@ -0,0 +1,19 @@ +package tw.gaas.yugioh.domain.entity + +import lombok.Data +import tw.gaas.yugioh.domain.enu.BattlePosition +import tw.gaas.yugioh.domain.enu.CardPosition +import tw.gaas.yugioh.domain.enu.DuelFieldZone + +/** + * 卡片所在區域 + * @param zone 決鬥場區域 + * @param cardPosition 卡片位置 + * @param battlePosition 戰鬥位置 + */ +@Data +class Location( + private var zone: DuelFieldZone = DuelFieldZone.HAND, + private var cardPosition: CardPosition = CardPosition.NOT_PLACED, + private var battlePosition: BattlePosition = BattlePosition.NOT_PLACED +) diff --git a/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/MainMonsterZone.kt b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/MainMonsterZone.kt new file mode 100644 index 0000000..679a21f --- /dev/null +++ b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/MainMonsterZone.kt @@ -0,0 +1,14 @@ +package tw.gaas.yugioh.domain.entity + +import lombok.Data + +/** + * 主要怪獸區 + * @param count 卡片數量 + * @param cards 卡片集合 + */ +@Data +class MainMonsterZone( + private var count: Int = 0, + private var cards: Cards = Cards() +) diff --git a/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/SpellTrapZone.kt b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/SpellTrapZone.kt new file mode 100644 index 0000000..aaccc55 --- /dev/null +++ b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/SpellTrapZone.kt @@ -0,0 +1,14 @@ +package tw.gaas.yugioh.domain.entity + +import lombok.Data + +/** + * 魔法和陷阱區 + * @param count 卡片數量 + * @param cards 卡片集合 + */ +@Data +class SpellTrapZone( + private var count: Int = 0, + private val cards: Cards = Cards() +) diff --git a/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/User.kt b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/User.kt new file mode 100644 index 0000000..c6415b5 --- /dev/null +++ b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/entity/User.kt @@ -0,0 +1,14 @@ +package tw.gaas.yugioh.domain.entity + +import lombok.Data + +/** + * 遊戲微服務計劃的用戶 + * @param id 用戶唯一識別值 + * @param title 用戶頭銜 + */ +@Data +class User( + private val id: String, + private val title: String? +) diff --git a/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/enu/Attribute.kt b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/enu/Attribute.kt new file mode 100644 index 0000000..35ced12 --- /dev/null +++ b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/enu/Attribute.kt @@ -0,0 +1,21 @@ +package tw.gaas.yugioh.domain.enu + +/** + * 怪獸屬性 + * - DARK: 闇 + * - DIVINE: 神 + * - EARTH: 地 + * - FIRE: 炎 + * - LIGHT: 光 + * - WATER: 水 + * - WIND: 風 + */ +enum class Attribute(private val value: String) { + DARK("DARK"), + DIVINE("DIVINE"), + EARTH("EARTH"), + FIRE("FIRE"), + LIGHT("LIGHT"), + WATER("WATER"), + WIND("WIND"); +} diff --git a/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/enu/BattlePosition.kt b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/enu/BattlePosition.kt new file mode 100644 index 0000000..a3b3ac0 --- /dev/null +++ b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/enu/BattlePosition.kt @@ -0,0 +1,13 @@ +package tw.gaas.yugioh.domain.enu + +/** + * 戰鬥位置，為怪獸卡特有的屬性 + * - ATTACK: 攻擊表示 + * - DEFENSE: 防護表示 + * - NOT_PLACED：尚未放置於決鬥場 + */ +enum class BattlePosition(private val value: String) { + ATTACK("ATTACK"), + DEFENSE("DEFENSE"), + NOT_PLACED("NOT_PLACED"); +} diff --git a/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/enu/CardPosition.kt b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/enu/CardPosition.kt new file mode 100644 index 0000000..c2da000 --- /dev/null +++ b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/enu/CardPosition.kt @@ -0,0 +1,13 @@ +package tw.gaas.yugioh.domain.enu + +/** + * 卡片位置 + * - FACE_UP: 表側表示 + * - FACE_DOWN：裡側表示 + * - NOT_PLACED：尚未放置於決鬥場 + */ +enum class CardPosition(private val value: String) { + FACE_UP("FACE_UP"), + FACE_DOWN("FACE_DOWN"), + NOT_PLACED("NOT_PLACED"); +} diff --git a/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/enu/CardType.kt b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/enu/CardType.kt new file mode 100644 index 0000000..29a2d62 --- /dev/null +++ b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/enu/CardType.kt @@ -0,0 +1,13 @@ +package tw.gaas.yugioh.domain.enu + +/** + * 卡片類別 + * - MONSTER: 怪獸卡 + * - SPELL: 魔法卡 + * - TRAP: 陷阱卡 + */ +enum class CardType(private val value: String) { + MONSTER("MONSTER"), + SPELL("SPELL"), + TRAP("TRAP"); +} diff --git a/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/enu/DuelFieldZone.kt b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/enu/DuelFieldZone.kt new file mode 100644 index 0000000..5aa9ad9 --- /dev/null +++ b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/enu/DuelFieldZone.kt @@ -0,0 +1,23 @@ +package tw.gaas.yugioh.domain.enu + +/** + * 決鬥場區域 + * - HAND: 手牌 + * - MAIN_MONSTER_ZONE: 主要怪獸區 + * - SPELL_TRAP_ZONE: 魔法和陷阱區 + * - FIELD_ZONE: 場地區 + * - GRAVEYARD: 墓地 + * - EXTRA_DECK_ZONE: 額外牌組區 + * - DECK_ZONE: 牌組區 + * - EXTRA_MONSTER_ZONE: 額外怪獸區 + */ +enum class DuelFieldZone(private val value: String) { + HAND("HAND"), + MAIN_MONSTER_ZONE("MAIN_MONSTER_ZONE"), + SPELL_TRAP_ZONE("SPELL_TRAP_ZONE"), + FIELD_ZONE("FIELD_ZONE"), + GRAVEYARD("GRAVEYARD"), + EXTRA_DECK_ZONE("EXTRA_DECK_ZONE"), + DECK_ZONE("DECK_ZONE"), + EXTRA_MONSTER_ZONE("EXTRA_MONSTER_ZONE"); +} diff --git a/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/enu/Icon.kt b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/enu/Icon.kt new file mode 100644 index 0000000..e07e65a --- /dev/null +++ b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/enu/Icon.kt @@ -0,0 +1,21 @@ +package tw.gaas.yugioh.domain.enu + +/** + * 魔法卡/陷阱卡類型 + * - Normal: 通常 + * - Continuous: 永續 + * - Equip: 裝備 + * - Quick-Play: 速攻 + * - Field: 場地 + * - Ritual: 儀式 + * - Counter: 反制 + */ +enum class Icon(private val value: String) { + NORMAL("NORMAL"), + CONTINUOUS("CONTINUOUS"), + EQUIP("EQUIP"), + QUICK_PLAY("QUICK_PLAY"), + FIELD("FIELD"), + RITUAL("RITUAL"), + COUNTER("COUNTER"); +} diff --git a/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/enu/MonsterType.kt b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/enu/MonsterType.kt new file mode 100644 index 0000000..8c62445 --- /dev/null +++ b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/enu/MonsterType.kt @@ -0,0 +1,57 @@ +package tw.gaas.yugioh.domain.enu + +/** + * 怪獸種族 + * - Aqua + * - Beast + * - Beast-Warrior + * - Creator God + * - Cyberse + * - Dinosaur + * - Divine-Beast + * - Dragon + * - Fairy + * - Fiend + * - Fish + * - Insect + * - Machine + * - Plant + * - Psychic + * - Pyro + * - Reptile + * - Rock + * - Sea Serpent + * - Spellcaster + * - Thunder + * - Warrior + * - Winged Beast + * - Wyrm + * - Zombie + */ +enum class MonsterType(private val value: String) { + AQUA("AQUA"), + BEAST("BEAST"), + BEAST_WARRIOR("BEAST_WARRIOR"), + CREATOR_GOD("CREATOR_GOD"), + CYBERSE("CYBERSE"), + DINOSAUR("DINOSAUR"), + DIVINE_BEAST("DIVINE_BEAST"), + DRAGON("DRAGON"), + FAIRY("FAIRY"), + FIEND("FIEND"), + FISH("FISH"), + INSECT("INSECT"), + MACHINE("MACHINE"), + PLANT("PLANT"), + PSYCHIC("PSYCHIC"), + PYRO("PYRO"), + REPTILE("REPTILE"), + ROCK("ROCK"), + SEA_SERPENT("SEA_SERPENT"), + SPELLCASTER("SPELLCASTER"), + THUNDER("THUNDER"), + WARRIOR("WARRIOR"), + WINGED_BEAST("WINGED_BEAST"), + WYRM("WYRM"), + ZOMBIE("ZOMBIE"); +} diff --git a/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/enu/Phase.kt b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/enu/Phase.kt new file mode 100644 index 0000000..62ef542 --- /dev/null +++ b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/enu/Phase.kt @@ -0,0 +1,21 @@ +package tw.gaas.yugioh.domain.enu + +/** + * 階段 + * - WAITING: 對局等待 (需要其他玩家加入) + * - READY: 對局已準備 + * - DRAW_PHASE: 抽牌階段 + * - MAIN_PHASE_1: 主要階段 1 + * - BATTLE_PHASE: 戰鬥階段 + * - END_PHASE: 結束階段 + * - FINISHED: 對局結束 + */ +enum class Phase(private val value: String) { + WAITING("WAITING"), + READY("READY"), + DRAW_PHASE("DRAW_PHASE"), + MAIN_PHASE_1("MAIN_PHASE_1"), + BATTLE_PHASE("BATTLE_PHASE"), + END_PHASE("END_PHASE"), + FINISHED("FINISHED"); +} diff --git a/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/error/DemoException.kt b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/error/DemoException.kt new file mode 100644 index 0000000..7d884eb --- /dev/null +++ b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/error/DemoException.kt @@ -0,0 +1,7 @@ +package tw.gaas.yugioh.domain.error + +@Deprecated(message = "僅用於測試使用", level = DeprecationLevel.WARNING) +class DemoException( + override val message: String? = null, + override val cause: Throwable? = null +) : Exception(message, cause) diff --git a/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/event/DomainEvent.kt b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/event/DomainEvent.kt new file mode 100644 index 0000000..70342b9 --- /dev/null +++ b/yugioh-kehao/domain/src/main/kotlin/tw/gaas/yugioh/domain/event/DomainEvent.kt @@ -0,0 +1,4 @@ +package tw.gaas.yugioh.domain.event + +class DomainEvent { +} diff --git a/yugioh-kehao/examples.http b/yugioh-kehao/examples.http new file mode 100644 index 0000000..acd74a4 --- /dev/null +++ b/yugioh-kehao/examples.http @@ -0,0 +1,9 @@ +GET http://localhost:8080/api/ping +Accept: text/plain + +### +GET http://localhost:8080/api/games/{{gameId}} +Accept: application/json + +### + diff --git a/yugioh-kehao/framework/src/main/resources/application.properties b/yugioh-kehao/framework/src/main/resources/application.properties deleted file mode 100644 index 8b13789..0000000 --- a/yugioh-kehao/framework/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ - diff --git a/yugioh-kehao/framework/src/test/kotlin/tw/gaas/yugioh/YugiohApplicationTests.kt b/yugioh-kehao/framework/src/test/kotlin/tw/gaas/yugioh/YugiohApplicationTests.kt deleted file mode 100644 index 82d0c33..0000000 --- a/yugioh-kehao/framework/src/test/kotlin/tw/gaas/yugioh/YugiohApplicationTests.kt +++ /dev/null @@ -1,13 +0,0 @@ -package tw.gaas.yugioh - -import org.junit.jupiter.api.Test -import org.springframework.boot.test.context.SpringBootTest - -@SpringBootTest -class YugiohApplicationTests { - - @Test - fun contextLoads() { - } - -} diff --git a/yugioh-kehao/http-client.env.json b/yugioh-kehao/http-client.env.json new file mode 100644 index 0000000..b382643 --- /dev/null +++ b/yugioh-kehao/http-client.env.json @@ -0,0 +1,5 @@ +{ + "dev": { + "gameId": "gameId" + } +} diff --git a/yugioh-kehao/framework/build.gradle b/yugioh-kehao/interface_adapter/build.gradle similarity index 74% rename from yugioh-kehao/framework/build.gradle rename to yugioh-kehao/interface_adapter/build.gradle index fabb24b..df2a989 100644 --- a/yugioh-kehao/framework/build.gradle +++ b/yugioh-kehao/interface_adapter/build.gradle @@ -1,11 +1,13 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id 'org.springframework.boot' version '3.0.1-SNAPSHOT' + id 'org.springframework.boot' version '3.0.2' id 'io.spring.dependency-management' version '1.1.0' - id 'org.jetbrains.kotlin.jvm' version '1.7.21' - id 'org.jetbrains.kotlin.plugin.spring' version '1.7.21' - id 'org.jetbrains.kotlin.plugin.jpa' version '1.7.21' + id 'org.jetbrains.kotlin.jvm' version '1.8.10' + id 'org.jetbrains.kotlin.plugin.lombok' version '1.8.10' + id 'org.jetbrains.kotlin.plugin.spring' version '1.8.10' + id 'org.jetbrains.kotlin.plugin.jpa' version '1.8.10' + id 'io.freefair.lombok' version '5.3.0' id 'com.google.cloud.tools.jib' version '3.3.1' } @@ -13,13 +15,8 @@ group = 'tw.gaas' version = '0.0.1-SNAPSHOT' sourceCompatibility = '17' -def getGitHash = { -> - def stdout = new ByteArrayOutputStream() - exec { - commandLine 'git', 'rev-parse', '--short', 'HEAD' - standardOutput = stdout - } - return stdout.toString().trim() +repositories { + mavenCentral() } configurations { @@ -28,12 +25,6 @@ configurations { } } -repositories { - mavenCentral() - maven { url 'https://repo.spring.io/milestone' } - maven { url 'https://repo.spring.io/snapshot' } -} - dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-security' @@ -45,15 +36,19 @@ dependencies { implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.0' implementation 'javax.validation:validation-api:2.0.1.Final' implementation 'javax.annotation:javax.annotation-api:1.3.2' - compileOnly 'org.projectlombok:lombok' + implementation 'io.cucumber:cucumber-jvm:7.11.1' + implementation 'io.cucumber:cucumber-spring:7.11.1' developmentOnly 'org.springframework.boot:spring-boot-devtools' runtimeOnly 'com.h2database:h2' runtimeOnly 'org.postgresql:postgresql' annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor' - annotationProcessor 'org.projectlombok:lombok' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.security:spring-security-test' - testImplementation 'org.springdoc:springdoc-openapi-starter-webmvc-api:2.0.0' + testImplementation 'io.cucumber:cucumber-spring:7.11.1' + testImplementation 'io.cucumber:cucumber-java:7.11.1' + testImplementation 'io.cucumber:cucumber-junit-platform-engine:7.11.1' + testImplementation 'org.junit.platform:junit-platform-suite' + testImplementation 'org.springdoc:springdoc-openapi-starter-webmvc-api:2.0.2' } tasks.withType(KotlinCompile).configureEach { @@ -63,8 +58,18 @@ tasks.withType(KotlinCompile).configureEach { } } -tasks.named('test') { +tasks.test { useJUnitPlatform() + systemProperty('cucumber.junit-platform.naming-strategy', 'long') +} + +def getGitHash = { -> + def stdout = new ByteArrayOutputStream() + exec { + commandLine 'git', 'rev-parse', '--short', 'HEAD' + standardOutput = stdout + } + return stdout.toString().trim() } jib { diff --git a/yugioh-kehao/interface_adapter/lombok.config b/yugioh-kehao/interface_adapter/lombok.config new file mode 100644 index 0000000..6aa51d7 --- /dev/null +++ b/yugioh-kehao/interface_adapter/lombok.config @@ -0,0 +1,2 @@ +# This file is generated by the 'io.freefair.lombok' Gradle plugin +config.stopBubbling = true diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/YugiohApplication.kt b/yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/YugiohApplication.kt similarity index 76% rename from yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/YugiohApplication.kt rename to yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/YugiohApplication.kt index 7251460..4d2e8ac 100644 --- a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/YugiohApplication.kt +++ b/yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/YugiohApplication.kt @@ -2,8 +2,10 @@ package tw.gaas.yugioh import org.springframework.boot.autoconfigure.SpringBootApplication import org.springframework.boot.runApplication +import org.springframework.web.servlet.config.annotation.EnableWebMvc @SpringBootApplication +@EnableWebMvc class YugiohApplication fun main(args: Array) { diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/api/GamesApi.kt b/yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/api/GamesApi.kt similarity index 94% rename from yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/api/GamesApi.kt rename to yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/api/GamesApi.kt index 845c852..4f99271 100644 --- a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/api/GamesApi.kt +++ b/yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/api/GamesApi.kt @@ -37,7 +37,7 @@ interface GamesApi { )] ) @RequestMapping( - value = ["/games/find"], + value = ["/api/games/find"], produces = ["application/json"], consumes = ["application/json"], method = [RequestMethod.POST] @@ -66,7 +66,7 @@ interface GamesApi { ) )] ) - @RequestMapping(value = ["/games/{gameId}"], produces = ["application/json"], method = [RequestMethod.GET]) + @RequestMapping(value = ["/api/games/{gameId}"], produces = ["application/json"], method = [RequestMethod.GET]) fun getGameGameId( @Parameter( `in` = ParameterIn.PATH, diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/api/GamesApiController.kt b/yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/api/GamesApiController.kt similarity index 100% rename from yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/api/GamesApiController.kt rename to yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/api/GamesApiController.kt diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/api/PingController.kt b/yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/api/PingController.kt similarity index 69% rename from yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/api/PingController.kt rename to yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/api/PingController.kt index 2f12dc2..b730070 100644 --- a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/api/PingController.kt +++ b/yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/api/PingController.kt @@ -1,14 +1,13 @@ package tw.gaas.yugioh.api import org.springframework.http.ResponseEntity -import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RequestMethod import org.springframework.web.bind.annotation.RestController @RestController -@RequestMapping("ping") class PingController { - @GetMapping("/") + @RequestMapping(value = ["/api/ping"], produces = ["text/plain"], method = [RequestMethod.GET]) fun pong(): ResponseEntity { return ResponseEntity .ok() diff --git a/yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/config/SecurityConfig.kt b/yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/config/SecurityConfig.kt new file mode 100644 index 0000000..85e7da7 --- /dev/null +++ b/yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/config/SecurityConfig.kt @@ -0,0 +1,52 @@ +package tw.gaas.yugioh.config + +import org.springframework.context.annotation.Bean +import org.springframework.context.annotation.Configuration +import org.springframework.security.config.annotation.web.builders.HttpSecurity +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity +import org.springframework.security.core.userdetails.User +import org.springframework.security.core.userdetails.User.UserBuilder +import org.springframework.security.core.userdetails.UserDetails +import org.springframework.security.core.userdetails.UserDetailsService +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder +import org.springframework.security.crypto.password.PasswordEncoder +import org.springframework.security.provisioning.InMemoryUserDetailsManager +import org.springframework.security.web.SecurityFilterChain + + +@Configuration +@EnableWebSecurity +class SecurityConfig { + + @Bean + fun filterChain(http: HttpSecurity): SecurityFilterChain { + http.authorizeHttpRequests() + .requestMatchers("/api/ping").permitAll() + .requestMatchers("/api/**").hasAuthority("USER") + .and() + .formLogin() + .loginPage("/login").permitAll() + return http.build() + } + + @Bean + fun userDetailsService(): UserDetailsService { + val users: UserBuilder = User.builder() + val yuki: UserDetails = users + .username("yugi") + .password(passwordEncoder().encode("password")) + .roles("USER") + .build() + val kaiba: UserDetails = users + .username("kaiba") + .password(passwordEncoder().encode("password")) + .roles("USER", "ADMIN") + .build() + return InMemoryUserDetailsManager(yuki, kaiba) + } + + @Bean + fun passwordEncoder(): PasswordEncoder { + return BCryptPasswordEncoder() + } +} diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/config/SwaggerDocumentationConfig.kt b/yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/config/SwaggerDocumentationConfig.kt similarity index 100% rename from yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/config/SwaggerDocumentationConfig.kt rename to yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/config/SwaggerDocumentationConfig.kt diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/Card.kt b/yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/dto/Card.kt similarity index 100% rename from yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/Card.kt rename to yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/dto/Card.kt diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/CardInfo.kt b/yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/dto/CardInfo.kt similarity index 100% rename from yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/CardInfo.kt rename to yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/dto/CardInfo.kt diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/Cards.kt b/yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/dto/Cards.kt similarity index 100% rename from yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/Cards.kt rename to yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/dto/Cards.kt diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/DeckZone.kt b/yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/dto/DeckZone.kt similarity index 100% rename from yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/DeckZone.kt rename to yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/dto/DeckZone.kt diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/DuelField.kt b/yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/dto/DuelField.kt similarity index 100% rename from yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/DuelField.kt rename to yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/dto/DuelField.kt diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/Duellist.kt b/yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/dto/Duellist.kt similarity index 100% rename from yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/Duellist.kt rename to yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/dto/Duellist.kt diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/Game.kt b/yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/dto/Game.kt similarity index 100% rename from yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/Game.kt rename to yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/dto/Game.kt diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/Graveyard.kt b/yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/dto/Graveyard.kt similarity index 100% rename from yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/Graveyard.kt rename to yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/dto/Graveyard.kt diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/Hand.kt b/yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/dto/Hand.kt similarity index 100% rename from yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/Hand.kt rename to yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/dto/Hand.kt diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/Location.kt b/yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/dto/Location.kt similarity index 100% rename from yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/Location.kt rename to yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/dto/Location.kt diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/MainMonsterZone.kt b/yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/dto/MainMonsterZone.kt similarity index 100% rename from yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/MainMonsterZone.kt rename to yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/dto/MainMonsterZone.kt diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/SpellTrapZone.kt b/yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/dto/SpellTrapZone.kt similarity index 100% rename from yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/SpellTrapZone.kt rename to yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/dto/SpellTrapZone.kt diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/User.kt b/yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/dto/User.kt similarity index 100% rename from yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/dto/User.kt rename to yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/dto/User.kt diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/Attribute.kt b/yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/enu/Attribute.kt similarity index 100% rename from yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/Attribute.kt rename to yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/enu/Attribute.kt diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/BattlePosition.kt b/yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/enu/BattlePosition.kt similarity index 100% rename from yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/BattlePosition.kt rename to yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/enu/BattlePosition.kt diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/CardPosition.kt b/yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/enu/CardPosition.kt similarity index 100% rename from yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/CardPosition.kt rename to yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/enu/CardPosition.kt diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/CardType.kt b/yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/enu/CardType.kt similarity index 100% rename from yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/CardType.kt rename to yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/enu/CardType.kt diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/DuelFieldZone.kt b/yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/enu/DuelFieldZone.kt similarity index 100% rename from yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/DuelFieldZone.kt rename to yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/enu/DuelFieldZone.kt diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/Icon.kt b/yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/enu/Icon.kt similarity index 100% rename from yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/Icon.kt rename to yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/enu/Icon.kt diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/MonsterType.kt b/yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/enu/MonsterType.kt similarity index 100% rename from yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/MonsterType.kt rename to yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/enu/MonsterType.kt diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/Phase.kt b/yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/enu/Phase.kt similarity index 100% rename from yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/enu/Phase.kt rename to yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/enu/Phase.kt diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/resp/FindAvailableGameResp.kt b/yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/resp/FindAvailableGameResp.kt similarity index 100% rename from yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/resp/FindAvailableGameResp.kt rename to yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/resp/FindAvailableGameResp.kt diff --git a/yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/resp/GetSpecifiedGameResp.kt b/yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/resp/GetSpecifiedGameResp.kt similarity index 100% rename from yugioh-kehao/framework/src/main/kotlin/tw/gaas/yugioh/model/resp/GetSpecifiedGameResp.kt rename to yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/model/resp/GetSpecifiedGameResp.kt diff --git a/yugioh-kehao/interface_adapter/src/main/resources/application.yaml b/yugioh-kehao/interface_adapter/src/main/resources/application.yaml new file mode 100644 index 0000000..fc476c7 --- /dev/null +++ b/yugioh-kehao/interface_adapter/src/main/resources/application.yaml @@ -0,0 +1,8 @@ +spring: + datasource: + url: jdbc:h2:mem:mydb + username: sa + password: password + driverClassName: org.h2.Driver + jpa: + database-platform: org.hibernate.dialect.H2Dialect diff --git a/yugioh-kehao/interface_adapter/src/test/kotlin/tw/gaas/yugioh/CucumberTestContextConfiguration.kt b/yugioh-kehao/interface_adapter/src/test/kotlin/tw/gaas/yugioh/CucumberTestContextConfiguration.kt new file mode 100644 index 0000000..ea44ac0 --- /dev/null +++ b/yugioh-kehao/interface_adapter/src/test/kotlin/tw/gaas/yugioh/CucumberTestContextConfiguration.kt @@ -0,0 +1,10 @@ +package tw.gaas.yugioh + +import io.cucumber.spring.CucumberContextConfiguration; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.boot.test.context.SpringBootTest; + +@CucumberContextConfiguration +@SpringBootTest +@AutoConfigureMockMvc +class CucumberTestContextConfiguration diff --git a/yugioh-kehao/interface_adapter/src/test/kotlin/tw/gaas/yugioh/JoinGameStepDefinitions.kt b/yugioh-kehao/interface_adapter/src/test/kotlin/tw/gaas/yugioh/JoinGameStepDefinitions.kt new file mode 100644 index 0000000..3dda157 --- /dev/null +++ b/yugioh-kehao/interface_adapter/src/test/kotlin/tw/gaas/yugioh/JoinGameStepDefinitions.kt @@ -0,0 +1,35 @@ +package tw.gaas.yugioh + +import io.cucumber.java.en.Then +import io.cucumber.java.en.When +import org.hamcrest.CoreMatchers +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.test.web.servlet.MockMvc +import org.springframework.test.web.servlet.ResultActions +import org.springframework.test.web.servlet.request.MockMvcRequestBuilders +import org.springframework.test.web.servlet.result.MockMvcResultMatchers + + +class JoinGameStepDefinitions: CucumberTestContextConfiguration() { + @Autowired + lateinit var mockMvc: MockMvc + + var playerStepDefinitions: PlayerStepDefinitions = PlayerStepDefinitions() + private var resultActions: ResultActions? = null + + @When("a player looking for a new game to join") + @Throws(Exception::class) + fun a_player_looking_for_a_new_game_to_join() { + val player: String? = playerStepDefinitions.getCurrentPlayer() + resultActions = mockMvc + .perform(MockMvcRequestBuilders.get("/player/$player")) + .andExpect(MockMvcResultMatchers.status().isOk) + } + + @Then("a player has joined a game") + @Throws(Exception::class) + fun a_player_has_joined_a_game() { + resultActions!! + .andExpect(MockMvcResultMatchers.content().string(CoreMatchers.containsString("game"))) + } +} diff --git a/yugioh-kehao/interface_adapter/src/test/kotlin/tw/gaas/yugioh/PingStepDefinitions.kt b/yugioh-kehao/interface_adapter/src/test/kotlin/tw/gaas/yugioh/PingStepDefinitions.kt new file mode 100644 index 0000000..f4d360d --- /dev/null +++ b/yugioh-kehao/interface_adapter/src/test/kotlin/tw/gaas/yugioh/PingStepDefinitions.kt @@ -0,0 +1,41 @@ +package tw.gaas.yugioh + +import io.cucumber.java.en.Given +import io.cucumber.java.en.Then +import io.cucumber.java.en.When +import org.hamcrest.CoreMatchers +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.test.web.servlet.MockMvc +import org.springframework.test.web.servlet.ResultActions +import org.springframework.test.web.servlet.request.MockMvcRequestBuilders +import org.springframework.test.web.servlet.result.MockMvcResultMatchers + +class PingStepDefinitions: CucumberTestContextConfiguration() { + + @Autowired + lateinit var mockMvc: MockMvc + private var resultActions: ResultActions? = null + + @Given("there is a ping API") + fun i_have_a_ping_api() { + resultActions = mockMvc + .perform(MockMvcRequestBuilders.get("/api/ping")) + .andExpect(MockMvcResultMatchers.status().isOk) + } + + @When("I ping the ping API") + fun i_ping_the_api() { + resultActions = mockMvc + .perform(MockMvcRequestBuilders.get("/api/ping")) + .andExpect(MockMvcResultMatchers.status().isOk) + } + + @Then("I receive a pong response") + fun i_receive_a_pong_response() { + resultActions!! + .andExpect(MockMvcResultMatchers.status().isOk) + .andExpect(MockMvcResultMatchers.content().string(CoreMatchers.containsString("pong"))) + } + + +} diff --git a/yugioh-kehao/interface_adapter/src/test/kotlin/tw/gaas/yugioh/PlayerStepDefinitions.kt b/yugioh-kehao/interface_adapter/src/test/kotlin/tw/gaas/yugioh/PlayerStepDefinitions.kt new file mode 100644 index 0000000..e4a9ce4 --- /dev/null +++ b/yugioh-kehao/interface_adapter/src/test/kotlin/tw/gaas/yugioh/PlayerStepDefinitions.kt @@ -0,0 +1,16 @@ +package tw.gaas.yugioh + +import io.cucumber.java.en.Given + +class PlayerStepDefinitions { + + private var currentPlayer: String? = null + @Given("there is a player") + fun there_is_a_player() { + currentPlayer = "player" + } + + fun getCurrentPlayer(): String? { + return currentPlayer + } +} diff --git a/yugioh-kehao/interface_adapter/src/test/kotlin/tw/gaas/yugioh/RunCucumberTest.kt b/yugioh-kehao/interface_adapter/src/test/kotlin/tw/gaas/yugioh/RunCucumberTest.kt new file mode 100644 index 0000000..d820581 --- /dev/null +++ b/yugioh-kehao/interface_adapter/src/test/kotlin/tw/gaas/yugioh/RunCucumberTest.kt @@ -0,0 +1,13 @@ +package tw.gaas.yugioh + +import io.cucumber.junit.platform.engine.Constants +import org.junit.platform.suite.api.ConfigurationParameter +import org.junit.platform.suite.api.IncludeEngines +import org.junit.platform.suite.api.SelectClasspathResource +import org.junit.platform.suite.api.Suite + +@Suite +@IncludeEngines("cucumber") +@SelectClasspathResource("tw/gaas/yugioh") +@ConfigurationParameter(key = Constants.GLUE_PROPERTY_NAME, value = "tw.gaas.yugioh") +class RunCucumberTest diff --git a/yugioh-kehao/interface_adapter/src/test/resources/tw/gaas/yugioh/join-game.feature b/yugioh-kehao/interface_adapter/src/test/resources/tw/gaas/yugioh/join-game.feature new file mode 100644 index 0000000..6fd4892 --- /dev/null +++ b/yugioh-kehao/interface_adapter/src/test/resources/tw/gaas/yugioh/join-game.feature @@ -0,0 +1,6 @@ +Feature: Join Game + + Scenario: A player joins a new game + Given there is a player + When a player looking for a new game to join + Then a player has joined a game diff --git a/yugioh-kehao/interface_adapter/src/test/resources/tw/gaas/yugioh/ping-pong.feature b/yugioh-kehao/interface_adapter/src/test/resources/tw/gaas/yugioh/ping-pong.feature new file mode 100644 index 0000000..3d3a693 --- /dev/null +++ b/yugioh-kehao/interface_adapter/src/test/resources/tw/gaas/yugioh/ping-pong.feature @@ -0,0 +1,6 @@ +Feature: Ping Pong API + + Scenario: Ping the API + Given there is a ping API + When I ping the ping API + Then I receive a pong response diff --git a/yugioh-kehao/settings.gradle b/yugioh-kehao/settings.gradle index 14a715c..d1a0380 100644 --- a/yugioh-kehao/settings.gradle +++ b/yugioh-kehao/settings.gradle @@ -6,7 +6,7 @@ pluginManagement { } } rootProject.name = 'yugioh' -include 'framework' +include 'interface_adapter' include 'application' include 'domain' diff --git a/yugioh-kehao/skaffold.yaml b/yugioh-kehao/skaffold.yaml index 60c6933..96f6784 100644 --- a/yugioh-kehao/skaffold.yaml +++ b/yugioh-kehao/skaffold.yaml @@ -1,14 +1,16 @@ -apiVersion: skaffold/v2beta5 +apiVersion: skaffold/v4beta2 kind: Config metadata: name: yugioh build: artifacts: - - image: docker.io/hhnj/yugioh - jib: - project: framework - type: gradle + - image: docker.io/hhnj/yugioh + context: . + jib: + project: interface_adapter + type: gradle +manifests: + rawYaml: + - k8s/*.yaml deploy: - kubectl: - manifests: - - "k8s/*.yaml" + kubectl: {} diff --git a/yugioh-kehao/yugioh.asta b/yugioh-kehao/yugioh.asta new file mode 100644 index 0000000..8e55fc8 --- /dev/null +++ b/yugioh-kehao/yugioh.asta @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b894874671a2d4716e4c76e1df223c4a4a95077e5f669d8545f76f7a53ae7883 +size 44945 From 475d63f6db29f75ca45ec0118cada65d2900936e Mon Sep 17 00:00:00 2001 From: Kehao Chen Date: Tue, 21 Mar 2023 21:42:08 +0800 Subject: [PATCH 12/12] fix: adjust security settings to facilitate development --- yugioh-kehao/examples.http | 42 ++++++++++++++- yugioh-kehao/http-client.env.json | 6 ++- .../kotlin/tw/gaas/yugioh/api/GamesApi.kt | 53 +++++++++++-------- .../tw/gaas/yugioh/config/SecurityConfig.kt | 13 +++-- yugioh-kehao/skaffold.yaml | 6 +++ 5 files changed, 92 insertions(+), 28 deletions(-) diff --git a/yugioh-kehao/examples.http b/yugioh-kehao/examples.http index acd74a4..7df1644 100644 --- a/yugioh-kehao/examples.http +++ b/yugioh-kehao/examples.http @@ -1,9 +1,47 @@ +### 測試應用是否運作正常 GET http://localhost:8080/api/ping Accept: text/plain -### +### User A 要求可用對局 +POST http://localhost:8080/api/games:find +Content-Type: application/json +Accept: application/json +Authorization: Basic {{userAName}} {{userAPassword}} + +{} + +> {% + client.global.set("gameId", response.body.json.game.id); +%} + +### 取得 User A 的對局資訊 GET http://localhost:8080/api/games/{{gameId}} Accept: application/json +Authorization: Basic {{userAName}} {{userAPassword}} + +> {% + client.test("The request executed successfully.", () => { + client.assert(response.status === 200, "The response status is not 200."); + }); + + client.test("The response content-type is JSON.", () => { + const type = response.contentType.mimeType; + client.assert(type === "application/json", `Expected 'application/json' but received ${type}.`); + }); +%} + +### User B 要求可用對局 +POST http://localhost:8080/api/games:find +Content-Type: application/json +Accept: application/json +Authorization: Basic {{userBName}} {{userBPassword}} -### +{} +> {% + client.test("The obtained game ID is the same.", () => { + client.assert( + client.global.get("gameId") === response.body.json.game.id, + "The obtained game ID is not the same as player A's."); + }); +%} diff --git a/yugioh-kehao/http-client.env.json b/yugioh-kehao/http-client.env.json index b382643..cd36011 100644 --- a/yugioh-kehao/http-client.env.json +++ b/yugioh-kehao/http-client.env.json @@ -1,5 +1,9 @@ { "dev": { - "gameId": "gameId" + "gameId": "gameId", + "userAName": "yugi", + "userAPassword": "password", + "userBName": "kaiba", + "userBPassword": "password" } } diff --git a/yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/api/GamesApi.kt b/yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/api/GamesApi.kt index 4f99271..7e751d3 100644 --- a/yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/api/GamesApi.kt +++ b/yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/api/GamesApi.kt @@ -9,6 +9,7 @@ import io.swagger.v3.oas.annotations.media.Content import io.swagger.v3.oas.annotations.media.Schema import io.swagger.v3.oas.annotations.responses.ApiResponse import io.swagger.v3.oas.annotations.responses.ApiResponses +import org.springframework.http.MediaType import org.springframework.http.ResponseEntity import org.springframework.validation.annotation.Validated import org.springframework.web.bind.annotation.PathVariable @@ -21,25 +22,29 @@ import javax.validation.Valid interface GamesApi { @Operation( summary = "尋找可用的對局", - description = "尋找可用的對局 - 若有等待成立的對局，則加入既有等待玩家加入的對局 - 若無等待成立的對局，則創立新對局等待其他玩家加入", + description = "尋找可用的對局 " + + "- 若有等待成立的對局，則加入既有等待玩家加入的對局 " + + "- 若無等待成立的對局，則創立新對局等待其他玩家加入", tags = ["game"] ) @ApiResponses( - value = [ApiResponse( - responseCode = "200", - description = "回應可用的對局", - content = arrayOf( - Content( - mediaType = "application/json", - schema = Schema(implementation = FindAvailableGameResp::class) + value = [ + ApiResponse( + responseCode = "200", + description = "回應可用的對局", + content = arrayOf( + Content( + mediaType = MediaType.APPLICATION_JSON_VALUE, + schema = Schema(implementation = FindAvailableGameResp::class) + ) ) ) - )] + ] ) @RequestMapping( - value = ["/api/games/find"], - produces = ["application/json"], - consumes = ["application/json"], + value = ["/api/games:find"], + produces = [MediaType.APPLICATION_JSON_VALUE], + consumes = [MediaType.APPLICATION_JSON_VALUE], method = [RequestMethod.POST] ) fun findAvailableGame( @@ -55,18 +60,24 @@ interface GamesApi { tags = ["game"] ) @ApiResponses( - value = [ApiResponse( - responseCode = "200", - description = "回應指定的對局", - content = arrayOf( - Content( - mediaType = "application/json", - schema = Schema(implementation = GetSpecifiedGameResp::class) + value = [ + ApiResponse( + responseCode = "200", + description = "回應指定的對局", + content = arrayOf( + Content( + mediaType = "application/json", + schema = Schema(implementation = GetSpecifiedGameResp::class) + ) ) ) - )] + ] + ) + @RequestMapping( + value = ["/api/games/{gameId}"], + produces = ["application/json"], + method = [RequestMethod.GET] ) - @RequestMapping(value = ["/api/games/{gameId}"], produces = ["application/json"], method = [RequestMethod.GET]) fun getGameGameId( @Parameter( `in` = ParameterIn.PATH, diff --git a/yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/config/SecurityConfig.kt b/yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/config/SecurityConfig.kt index 85e7da7..276a1c5 100644 --- a/yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/config/SecurityConfig.kt +++ b/yugioh-kehao/interface_adapter/src/main/kotlin/tw/gaas/yugioh/config/SecurityConfig.kt @@ -12,20 +12,25 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder import org.springframework.security.crypto.password.PasswordEncoder import org.springframework.security.provisioning.InMemoryUserDetailsManager import org.springframework.security.web.SecurityFilterChain +import org.springframework.security.web.servlet.util.matcher.MvcRequestMatcher +import org.springframework.security.web.util.matcher.AntPathRequestMatcher.antMatcher +import org.springframework.security.web.util.matcher.RegexRequestMatcher.regexMatcher +import org.springframework.web.servlet.config.annotation.EnableWebMvc +import org.springframework.web.servlet.handler.HandlerMappingIntrospector @Configuration @EnableWebSecurity +@EnableWebMvc class SecurityConfig { @Bean fun filterChain(http: HttpSecurity): SecurityFilterChain { http.authorizeHttpRequests() .requestMatchers("/api/ping").permitAll() - .requestMatchers("/api/**").hasAuthority("USER") - .and() - .formLogin() - .loginPage("/login").permitAll() + .requestMatchers("/api/**").hasAuthority("ROLE_USER") + .and().httpBasic() + .and().csrf().disable() return http.build() } diff --git a/yugioh-kehao/skaffold.yaml b/yugioh-kehao/skaffold.yaml index 96f6784..96f161b 100644 --- a/yugioh-kehao/skaffold.yaml +++ b/yugioh-kehao/skaffold.yaml @@ -14,3 +14,9 @@ manifests: - k8s/*.yaml deploy: kubectl: {} +portForward: + - resourceType: deployment + resourceName: yugioh + namespace: default + port: 8080 + localPort: 8080