Skip to content
Draft
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
1 change: 1 addition & 0 deletions apps/university-web/src/apis/universities/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ export interface RecommendedUniversitiesResponseRecommendedUniversitiesItem {
id: number;
term: string;
koreanName: string;
homeUniversityName?: HomeUniversityName;
region: string;
country: string;
logoImageUrl: string;
Expand Down
1 change: 1 addition & 0 deletions apps/web/src/apis/universities/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ export interface RecommendedUniversitiesResponseRecommendedUniversitiesItem {
id: number;
term: string;
koreanName: string;
homeUniversityName?: HomeUniversityName;
region: string;
country: string;
logoImageUrl: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,12 @@ const PopularUniversityCard = ({
quality = 60, // 기본값을 60으로 낮춤
}: PopularUniversityCardProps) => {
const homeUniversitySlug = getHomeUniversitySlugByName(university.homeUniversityName);
const universityDetailHref = homeUniversitySlug
? `/university/${homeUniversitySlug}/${university.id}`
: "/university";

if (!homeUniversitySlug) {
return null;
}

const universityDetailHref = `/university/${homeUniversitySlug}/${university.id}`;

return (
<UniversityZoneLink key={university.id} href={universityDetailHref}>
Expand Down
34 changes: 32 additions & 2 deletions apps/web/src/app/(home)/page.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import type { Metadata } from "next";
import { getHomeNewsList } from "@/apis/news/server/getNewsList";
import { getCategorizedUniversities, getRecommendedUniversity } from "@/apis/universities/server";
import { getHomeUniversitySlugByName } from "@/constants/university";
import { type ListUniversity, RegionEnumExtend } from "@/types/university";
import { createUrl } from "@/utils/seo";
import FindLastYearScoreBar from "./_ui/FindLastYearScoreBar";
Expand Down Expand Up @@ -61,13 +62,42 @@ const resolveRecommendedUniversitiesHomeUniversityName = (
const homeUniversityNameById = new Map(
allUniversities.map((university) => [university.id, university.homeUniversityName]),
);
const homeUniversityNamesByTermAndName = new Map<string, Set<ListUniversity["homeUniversityName"]>>();

allUniversities.forEach((university) => {
const key = `${university.term}:${university.koreanName}`;
const names = homeUniversityNamesByTermAndName.get(key) ?? new Set<ListUniversity["homeUniversityName"]>();

names.add(university.homeUniversityName);
homeUniversityNamesByTermAndName.set(key, names);
});

return recommendedUniversities.map((university) => ({
...university,
homeUniversityName: university.homeUniversityName ?? homeUniversityNameById.get(university.id),
homeUniversityName:
university.homeUniversityName ??
homeUniversityNameById.get(university.id) ??
getUniqueHomeUniversityName(homeUniversityNamesByTermAndName, university),
}));
};

const getUniqueHomeUniversityName = (
homeUniversityNamesByTermAndName: Map<string, Set<ListUniversity["homeUniversityName"]>>,
university: ListUniversity,
) => {
const names = homeUniversityNamesByTermAndName.get(`${university.term}:${university.koreanName}`);

if (!names || names.size !== 1) {
return undefined;
}

return names.values().next().value;
};

const hasUniversityDetailRoute = (university: ListUniversity) => {
return getHomeUniversitySlugByName(university.homeUniversityName) !== undefined;
};

const HomePage = async () => {
const newsList = await getHomeNewsList();
const { data } = await getRecommendedUniversity();
Expand All @@ -78,7 +108,7 @@ const HomePage = async () => {
const resolvedRecommendedUniversities = resolveRecommendedUniversitiesHomeUniversityName(
recommendedUniversities,
allUniversities,
);
).filter(hasUniversityDetailRoute);

return (
<>
Expand Down
Loading