diff --git a/backend/src/main/java/wooteco/prolog/roadmap/domain/Keyword.java b/backend/src/main/java/wooteco/prolog/roadmap/domain/Keyword.java index e84280fa8..8518c806c 100644 --- a/backend/src/main/java/wooteco/prolog/roadmap/domain/Keyword.java +++ b/backend/src/main/java/wooteco/prolog/roadmap/domain/Keyword.java @@ -1,5 +1,6 @@ package wooteco.prolog.roadmap.domain; + import static wooteco.prolog.common.exception.BadRequestCode.ROADMAP_KEYWORD_AND_KEYWORD_PARENT_SAME_EXCEPTION; import static wooteco.prolog.common.exception.BadRequestCode.ROADMAP_KEYWORD_SEQUENCE_EXCEPTION; @@ -35,6 +36,12 @@ import java.util.Objects; import java.util.Set; +import javax.persistence.*; +import java.util.HashSet; +import java.util.List; +import java.util.Objects; +import java.util.Set; + @Getter @NoArgsConstructor(access = AccessLevel.PROTECTED) @Entity diff --git a/backend/src/main/java/wooteco/prolog/studylog/application/PopularStudylogService.java b/backend/src/main/java/wooteco/prolog/studylog/application/PopularStudylogService.java index 67b1bbb5b..6ba9680a5 100644 --- a/backend/src/main/java/wooteco/prolog/studylog/application/PopularStudylogService.java +++ b/backend/src/main/java/wooteco/prolog/studylog/application/PopularStudylogService.java @@ -92,6 +92,7 @@ private List findRecentStudylogs(final LocalDateTime dateTime, private List filterStudylogsByMemberGroups(final List studylogs, final MemberGroups memberGroups, final List groupMembers) { + return studylogs.stream() .filter( studylog -> checkMemberAssignedInMemberGroups(memberGroups, studylog.getMember(), diff --git a/frontend/src/models/Article.ts b/frontend/src/models/Article.ts index dea7df2c6..20be3771f 100644 --- a/frontend/src/models/Article.ts +++ b/frontend/src/models/Article.ts @@ -1,7 +1,7 @@ export interface ArticleRequest { title: string; - link: string; + url: string; } export interface ArticleType { diff --git a/frontend/src/pages/NewArticlePage/index.tsx b/frontend/src/pages/NewArticlePage/index.tsx index 3f81a1a7a..c1765eb52 100644 --- a/frontend/src/pages/NewArticlePage/index.tsx +++ b/frontend/src/pages/NewArticlePage/index.tsx @@ -17,7 +17,7 @@ import { PATH } from '../../constants'; const NewArticlePage = () => { const [articleContent, setArticleContent] = useState({ title: '', - link: '', + url: '', }); const history = useHistory(); @@ -28,8 +28,8 @@ const NewArticlePage = () => { setArticleContent({ ...articleContent, title: e.target.value }); }; - const onArticleLinkChanged = (e: React.ChangeEvent) => { - setArticleContent({ ...articleContent, link: e.target.value }); + const onArticleUrlChanged = (e: React.ChangeEvent) => { + setArticleContent({ ...articleContent, url: e.target.value }); }; const createArticle = () => { @@ -51,9 +51,9 @@ const NewArticlePage = () => {