diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index 648dd9520..1968888a1 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -1,8 +1,8 @@
name: backend test
on:
- push:
- pull_request: [develop, main]
+ pull_request:
+ branches: [develop, main]
paths:
- apps/backend/**
diff --git a/README.md b/README.md
index 167863de2..389f6a542 100644
--- a/README.md
+++ b/README.md
@@ -43,13 +43,13 @@
## π κΈ°μ μ€ν
-| μμ | κΈ°μ μ€ν |
-| ------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| **곡ν΅** |    |
-| **Frontend** |        |
-| **Backend** |         |
-| **μΈνλΌ** |      |
-| **νμ
λꡬ** |        |
+| μμ | κΈ°μ μ€ν |
+| ------------- |-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **곡ν΅** |    |
+| **Frontend** |        |
+| **Backend** |        |
+| **μΈνλΌ** |        |
+| **νμ
λꡬ** |        |
## π μμ€ν
μν€ν
μ²
@@ -456,7 +456,7 @@ pnpm run start
βββ ...
```
-## ν μκ°(νμΈλ° μλ μμ νμ§ λ§μμ£ΌμΈμ)
+## ν μκ°
| [J004 κ°μ€ν](https://github.com/JunhyunKang) | [J074 κΉνμ°](https://github.com/krokerdile) | [J086 λμ λΉ](https://github.com/typingmistake) | [J175 μ΄λν](https://github.com/codemario318) | [J217 μ νλ―Ό](https://github.com/joyjhm) |
| --------------------------------------------------------- | --------------------------------------------------------- | ---------------------------------------------------------- | ---------------------------------------------------------- | --------------------------------------------------------- |
diff --git a/apps/backend/src/quiz-zone/dto/create-quiz-zone.dto.ts b/apps/backend/src/quiz-zone/dto/create-quiz-zone.dto.ts
index 008433d71..bb257971a 100644
--- a/apps/backend/src/quiz-zone/dto/create-quiz-zone.dto.ts
+++ b/apps/backend/src/quiz-zone/dto/create-quiz-zone.dto.ts
@@ -24,7 +24,7 @@ export class CreateQuizZoneDto {
@IsInt({ message: 'μ΅λ νλ μ΄μ΄ μκ° μμ΅λλ€.' })
@Min(1, { message: 'μ΅μ 1λͺ
μ΄μμ΄μ΄μΌ ν©λλ€.' })
- // @Max(300, { message: 'μ΅λ 300λͺ
κΉμ§ κ°λ₯ν©λλ€.' })
+ @Max(300, { message: 'μ΅λ 300λͺ
κΉμ§ κ°λ₯ν©λλ€.' })
readonly limitPlayerCount: number;
@IsNotEmpty({ message: 'ν΄μ¦μ‘΄μ μ νν΄μ£ΌμΈμ.' })
diff --git a/apps/backend/src/quiz-zone/quiz-zone.service.spec.ts b/apps/backend/src/quiz-zone/quiz-zone.service.spec.ts
index 847367989..b6a8e13de 100644
--- a/apps/backend/src/quiz-zone/quiz-zone.service.spec.ts
+++ b/apps/backend/src/quiz-zone/quiz-zone.service.spec.ts
@@ -602,7 +602,7 @@ describe('QuizZoneService', () => {
{id: "player1", nickname: "λ―ΈμΉν¬μ¬", score: 0, ranking: 1},
{id: "player2", nickname: "λ―ΈμΉν¬μ¬", score: 0, ranking: 1}
],
- endSocketTime: Date.now(),
+ endSocketTime: expect.any(Number),
});
});
diff --git a/apps/frontend/src/blocks/CreateQuizZone/CreateQuizZoneBasic.tsx b/apps/frontend/src/blocks/CreateQuizZone/CreateQuizZoneBasic.tsx
index 8df873058..ed11e7c6b 100644
--- a/apps/frontend/src/blocks/CreateQuizZone/CreateQuizZoneBasic.tsx
+++ b/apps/frontend/src/blocks/CreateQuizZone/CreateQuizZoneBasic.tsx
@@ -80,10 +80,11 @@ const CreateQuizZoneBasic = ({
onChange={(e) => handleChangeQuizZoneBasic(e, 'QUIZ_ZONE_ID')}
isBorder={true}
className="rounded-md w-full"
- placeholder="ν΄μ¦μ‘΄ μ½λλ₯Ό μ
λ ₯νμΈμ"
+ placeholder="μ«μμ μλ¬Έμ 5μ μ΄μ 10μ μ΄ν"
error={
validationError == '5μ μ΄μ μ
λ ₯ν΄μ£ΌμΈμ.' ||
- validationError == '10μ μ΄νλ‘ μ
λ ₯ν΄μ£ΌμΈμ.'
+ validationError == '10μ μ΄νλ‘ μ
λ ₯ν΄μ£ΌμΈμ.' ||
+ validationError == 'μ«μμ μνλ²³ μ‘°ν©λ§ κ°λ₯ν©λλ€.'
? validationError
: ''
}
@@ -95,12 +96,13 @@ const CreateQuizZoneBasic = ({
label="μ΅λ μΈμ"
name="quiz-zone-limit-player-count"
step={10}
- min={1}
- max={300}
value={limitPlayerCount}
onChange={(e) => handleChangeQuizZoneBasic(e, 'LIMIT')}
isBorder={true}
className="w-20"
+ isShowCount={true}
+ min={1}
+ max={300}
/>
(
/>
)}
+ {typeof value === 'number' && isShowCount && (
+
+
+
+ )}
);
diff --git a/apps/frontend/src/utils/validators.ts b/apps/frontend/src/utils/validators.ts
index 4ab4fbe18..a4fa943fa 100644
--- a/apps/frontend/src/utils/validators.ts
+++ b/apps/frontend/src/utils/validators.ts
@@ -39,10 +39,11 @@ export const validateQuizZoneSetDescription = (description: string) => {
export const validateQuizZoneSetCode = (code: string) => {
if (code.length < 5) return '5μ μ΄μ μ
λ ₯ν΄μ£ΌμΈμ.';
if (code.length > 10) return '10μ μ΄νλ‘ μ
λ ₯ν΄μ£ΌμΈμ.';
+ if (!/^[a-zA-Z0-9]*$/g.test(code)) return 'μ«μμ μνλ²³ μ‘°ν©λ§ κ°λ₯ν©λλ€.';
};
//μ
μ₯ μΈμ μ ν μ ν¨μ± κ²μ¬
export const validateQuizZoneSetLimit = (limit: number) => {
if (limit < 1) return 'μ΅μ 1λͺ
μ΄μ μ§μ ν΄μ£ΌμΈμ.';
- // if (limit > 300) return 'μ΅λ μΈμμ 300λͺ
μ
λλ€.';
+ if (limit > 300) return 'μ΅λ μΈμμ 300λͺ
μ
λλ€.';
};