Merge pull request #1434 from woowacourse/refactor/#1429-article-fron…

…t-merge-feature-branch 명세와 맞지않는 type 긴급 변경
woowacourse · Jul 20, 2023 · eeeb299 · eeeb299
2 parents f3ea20a + 6545260
commit eeeb299
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git 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
@@ -92,6 +92,7 @@ private List<Studylog> findRecentStudylogs(final LocalDateTime dateTime,
     private List<Studylog> filterStudylogsByMemberGroups(final List<Studylog> studylogs,
                                                          final MemberGroups memberGroups,
                                                          final List<GroupMember> groupMembers) {
+
         return studylogs.stream()
             .filter(
                 studylog -> checkMemberAssignedInMemberGroups(memberGroups, studylog.getMember(),

diff --git 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
@@ -17,7 +17,7 @@ import { PATH } from '../../constants';
 const NewArticlePage = () => {
   const [articleContent, setArticleContent] = useState<ArticleRequest>({
     title: '',
-    link: '',
+    url: '',
   });
 
   const history = useHistory();
@@ -28,8 +28,8 @@ const NewArticlePage = () => {
     setArticleContent({ ...articleContent, title: e.target.value });
   };
 
-  const onArticleLinkChanged = (e: React.ChangeEvent<HTMLInputElement>) => {
-    setArticleContent({ ...articleContent, link: e.target.value });
+  const onArticleUrlChanged = (e: React.ChangeEvent<HTMLInputElement>) => {
+    setArticleContent({ ...articleContent, url: e.target.value });
   };
 
   const createArticle = () => {
@@ -51,9 +51,9 @@ const NewArticlePage = () => {
       <InputContainer>
         <Label>링크</Label>
         <Input
-          value={articleContent.link}
+          value={articleContent.url}
           placeholder="링크를 입력해주세요."
-          onChange={onArticleLinkChanged}
+          onChange={onArticleUrlChanged}
         />
       </InputContainer>
       <Button type="button" size="X_SMALL" css={[SubmitButtonStyle]} onClick={createArticle}>