Skip to content
Open
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
8 changes: 5 additions & 3 deletions apps/web/src/app/university/application/ScoreSheet.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useState } from "react";
import { IconExpandMoreFilled } from "@/public/svgs/community";
import type { ScoreSheet as ScoreSheetType } from "@/types/application";
import { languageTestMapping } from "@/types/score";
import { formatLanguageTestScore, isLanguageTestEnum, languageTestMapping } from "@/types/score";

const ScoreSheet = ({ scoreSheet }: { scoreSheet: ScoreSheetType }) => {
const [tableOpened, setTableOpened] = useState(false);
Expand Down Expand Up @@ -32,10 +32,12 @@ const ScoreSheet = ({ scoreSheet }: { scoreSheet: ScoreSheetType }) => {
{applicant.gpa.toFixed(2)}
</span>
<span className="min-w-[30px] flex-1 overflow-hidden whitespace-nowrap text-center typo-medium-2">
{languageTestMapping[applicant.testType]}
{isLanguageTestEnum(applicant.testType) ? languageTestMapping[applicant.testType] : applicant.testType}
</span>
<span className="min-w-[30px] flex-1 overflow-hidden whitespace-nowrap text-center typo-medium-2">
{applicant.testScore}
{isLanguageTestEnum(applicant.testType)
? formatLanguageTestScore(applicant.testType, applicant.testScore)
: applicant.testScore}
</span>
</div>
))}
Expand Down
7 changes: 5 additions & 2 deletions apps/web/src/app/university/score/ScoreScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { useGetMyGpaScore, useGetMyLanguageTestScore } from "@/apis/Scores";
import BlockBtn from "@/components/button/BlockBtn";
import Tab from "@/components/ui/Tab";
import { IconSolidConnectionSmallLogo } from "@/public/svgs/my";
import { languageTestMapping } from "@/types/score";
import { formatLanguageTestScore, languageTestMapping } from "@/types/score";
import ScoreCard from "./ScoreCard";

const ScoreScreen = () => {
Expand Down Expand Up @@ -36,7 +36,10 @@ const ScoreScreen = () => {
<ScoreCard
key={score.id}
name={languageTestMapping[score.languageTestResponse.languageTestType]}
score={score.languageTestResponse.languageTestScore}
score={formatLanguageTestScore(
score.languageTestResponse.languageTestType,
score.languageTestResponse.languageTestScore,
)}
status={score.verifyStatus}
// date={new Date(score.issueDate).toISOString()}
date="2026-01-01"
Expand Down
26 changes: 25 additions & 1 deletion apps/web/src/types/score.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,36 @@ const jlptLevelMapping: Record<string, string> = {
"5": "N5",
};

const integerScoreTestTypes = new Set<LanguageTestEnum>([
LanguageTestEnum.TOEIC,
LanguageTestEnum.TOEFL_IBT,
LanguageTestEnum.TOEFL_ITP,
LanguageTestEnum.DUOLINGO,
LanguageTestEnum.TCF,
LanguageTestEnum.TEF,
LanguageTestEnum.NEW_HSK,
]);

const trailingZeroPattern = /^-?\d+\.0+$/;

export const isLanguageTestEnum = (value: string): value is LanguageTestEnum => {
return value in languageTestScoreInfo;
};

export const formatLanguageTestScore = (testType: LanguageTestEnum, score: string) => {
if (testType === LanguageTestEnum.JLPT) {
return jlptLevelMapping[score] ?? score;
}

return score;
if (!integerScoreTestTypes.has(testType)) {
return score;
}

if (!trailingZeroPattern.test(score)) {
return score;
}

return score.replace(/\.0+$/, "");
};

export const formatLanguageTestScoreWithMax = (testType: LanguageTestEnum, score: string) => {
Expand Down