Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions src/main/kotlin/org/gitanimals/core/Svgs.kt
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,21 @@ val largeTextSvgs = lazy {
map
}.value

val largetTextAcceptableChars = lazy {
val acceptableTitles = mutableListOf<Char>()
for (i in 'A'..'Z') {
acceptableTitles.add(i)
}
for (i in 'a'..'z') {
acceptableTitles.add(i)
}
for (i in 0..9) {
acceptableTitles.add(i.toChar())
}
acceptableTitles.add('-')
acceptableTitles.toList()
}.value

val mediumNumberSvgs = lazy {
val list = mutableListOf<String>()
for (i in 0..9) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ class ChangeGuildFacade(
) {

fun changeGuild(token: String, guildId: Long, changeGuildRequest: ChangeGuildRequest) {
changeGuildRequest.requireValidTitle()

val user = identityApi.getUserByToken(token)

guildService.changeGuild(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package org.gitanimals.guild.app

import org.gitanimals.guild.app.request.CreateGuildRequest
import org.gitanimals.guild.app.response.GuildResponse
import org.gitanimals.guild.domain.Guild
import org.gitanimals.guild.domain.GuildService
import org.gitanimals.guild.domain.request.CreateLeaderRequest
import org.rooftop.netx.api.Orchestrator
Expand All @@ -27,6 +26,8 @@ class CreateGuildFacade(
token: String,
createGuildRequest: CreateGuildRequest,
): GuildResponse {
createGuildRequest.requireValidTitle()

return createGuildOrchestrator.sagaSync(
request = createGuildRequest,
context = mapOf("token" to token, IDEMPOTENCY_KEY to UUID.randomUUID().toString()),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.gitanimals.guild.app.request

import org.gitanimals.core.FieldType
import org.gitanimals.core.largetTextAcceptableChars

data class CreateGuildRequest(
val title: String,
Expand All @@ -9,4 +10,11 @@ data class CreateGuildRequest(
val autoJoin: Boolean,
val farmType: FieldType,
val personaId: String,
)
) {

fun requireValidTitle() {
title.forEach {
require(it in largetTextAcceptableChars) { "Cannot accept title \"$it\"" }
}
}
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
package org.gitanimals.guild.domain.request

import org.gitanimals.core.FieldType
import org.gitanimals.core.largetTextAcceptableChars

data class ChangeGuildRequest(
val title: String,
val body: String,
val farmType: FieldType,
val guildIcon: String,
val autoJoin: Boolean,
)
) {

fun requireValidTitle() {
title.forEach {
require(it in largetTextAcceptableChars) { "Cannot accept title \"$it\"" }
}
}
}