Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pr Feat/11 mypage api #73

Merged
merged 8 commits into from
Feb 15, 2024
Merged

pr Feat/11 mypage api #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c7d9451
feat: 프로필 조회, 내가 작성한 꿀팁, 질문, 소통해요 페이징 처리 구현 완료했습니다 (#52)
psae0714 Feb 15, 2024
3bfd298
fix: 필요없는 코드 삭제 (#52)
psae0714 Feb 15, 2024
b4ecf5a
Merge branch 'develop' of https://github.com/ttoklip/BackEnd into Fea…
psae0714 Feb 15, 2024
6616695
feat: 스크랩한 글 목록 불러오기 기능 완성했습니다 (#52)
psae0714 Feb 15, 2024
416d6c8
fix: 스크랩 uri만 변경하였습니다 (#52)
psae0714 Feb 15, 2024
88018e5
Merge branch 'develop' of https://github.com/ttoklip/BackEnd into Fea…
psae0714 Feb 15, 2024
dd66729
fix: 한글 폴더이름을 영어로 변경하였습니다. static import를 해서 구현했습니다 (#52)
psae0714 Feb 15, 2024
17754a1
fix:yml변경(#52)
psae0714 Feb 15, 2024
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
3 changes: 1 addition & 2 deletions src/main/java/com/api/ttoklip/domain/member/domain/Member.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public class Member extends BaseEntity {
private String email;

// private Long kakaoId;

//private String street;//02.14 세준-주소
private String provider;

private String nickname;
Expand Down Expand Up @@ -112,7 +112,6 @@ public MemberEditorBuilder toEditor() {
return MemberEditor.builder()
.independentYear(independentYear)
.independentMonth(independentMonth)
// .street()
.nickname(nickname);
}

Expand Down
289 changes: 247 additions & 42 deletions src/main/java/com/api/ttoklip/domain/mypage/main/constant/MyPageConstant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,55 +69,127 @@ public class MyPageConstant {
}
""";

public static final String scrapedPostsResponse = """
public static final String scrapHoneyTipsResponse = """
{
"time": "2024-01-11T16:06:30.852Z",
"status": 200,
"code": "200",
"message": "요청에 성공하였습니다.",
"result": {
"scrapedPosts": [
{
"postId": 1,
"type": "honeytip",
"title": "스크랩한 허니팁 제목 예시 1",
"content": "스크랩한 허니팁 내용 예시 1",
"author": "글쓴이1",
"category": "카테고리1",
"scrapedTime": "2024-01-11T16:06:30.852Z",
"likes": 10,
"comments": 3,
"scrapCount": 20
},
{
"postId": 2,
"type": "newsletter",
"title": "스크랩한 뉴스레터 제목 예시 2",
"content": "스크랩한 뉴스레터 내용 예시 2",
"author": "글쓴이2",
"category": "카테고리2",
"scrapedTime": "2024-01-10T10:30:00.000Z",
"likes": 15,
"comments": 5,
"scrapCount": 30
},
{
"postId": 3,
"type": "cart",
"title": "스크랩한 카트 제목 예시 3",
"content": "스크랩한 카트 내용 예시 3",
"author": "글쓴이3",
"category": "카테고리3",
"scrapedTime": "2024-01-09T12:00:00.000Z",
"likes": 8,
"comments": 2,
"scrapCount": 25
}
]
"honeyTips": [
{
"honeyTipId": 5,
"title": "first",
"content": "first"
},
{
"honeyTipId": 4,
"title": "first",
"content": "fff"
},
{
"honeyTipId": 3,
"title": "first",
"content": "fff"
},
{
"honeyTipId": 2,
"title": "first",
"content": "fff"
},
{
"honeyTipId": 1,
"title": "first",
"content": "fff"
}
],
"totalPage": 1,
"totalElements": 5,
"isFirst": true,
"isLast": true
}
}
""";
public static final String scrapNewsLetterResponse = """
{
"time": "2024-01-11T16:06:30.852Z",
"status": 200,
"code": "200",
"message": "요청에 성공하였습니다.",
"result": {
"newsletters": [
{
"newsLetterId"first",
"content": "first"
},
{
"newsLetterId": 4,
"title": "first",
"content": "fff"
},
{
"newsLetterId": 3,
"title": "first",
"content": "fff"
},
{
"newsLetterId": 2,
"title": "first",
"content": "fff"
},
{
"newsLetterId": 1,
"title": "first",
"content": "fff"
}
],
"totalPage": 1,
"totalElements": 5,
"isFirst": true,
"isLast": true
}
}
""";
public static final String scrapCommunityResponse = """
{
"time": "2024-01-11T16:06:30.852Z",
"status": 200,
"code": "200",
"message": "요청에 성공하였습니다.",
"result": {
"communities": [
{
"communityId"first",
"content": "first"
},
{
"communityId": 4,
"title": "first",
"content": "fff"
},
{
"communityId": 3,
"title": "first",
"content": "fff"
},
{
"communityId": 2,
"title": "first",
"content": "fff"
},
{
"communityId": 1,
"title": "first",
"content": "fff"
}
],
"totalPage": 1,
"totalElements": 5,
"isFirst": true,
"isLast": true
}
}
""";

public static final String myPostsResponse = """
{
"time": "2024-01-11T16:06:30.852Z",
Expand Down Expand Up @@ -163,7 +235,129 @@ public class MyPageConstant {
}
}
""";

public static final String myHoneyTipsResponse = """
{
"time": "2024-01-11T16:06:30.852Z",
"status": 200,
"code": "200",
"message": "요청에 성공하였습니다.",
"result": {
"honeyTips": [
{
"honeyTipId": 5,
"title": "first",
"content": "first"
},
{
"honeyTipId": 4,
"title": "first",
"content": "fff"
},
{
"honeyTipId": 3,
"title": "first",
"content": "fff"
},
{
"honeyTipId": 2,
"title": "first",
"content": "fff"
},
{
"honeyTipId": 1,
"title": "first",
"content": "fff"
}
],
"totalPage": 1,
"totalElements": 5,
"isFirst": true,
"isLast": true
}
}
""";
public static final String myCommunityResponse = """
{
"time": "2024-01-11T16:06:30.852Z",
"status": 200,
"code": "200",
"message": "요청에 성공하였습니다.",
"result": {
"communities": [
{
"communityId":5,
"title": "first",
"content": "first"
},
{
"communityId": 4,
"title": "first",
"content": "fff"
},
{
"communityId": 3,
"title": "first",
"content": "fff"
},
{
"communityId": 2,
"title": "first",
"content": "fff"
},
{
"communityId": 1,
"title": "first",
"content": "fff"
}
],
"totalPage": 1,
"totalElements": 5,
"isFirst": true,
"isLast": true
}
}
""";
public static final String myQuestionResponse = """
{
"time": "2024-01-11T16:06:30.852Z",
"status": 200,
"code": "200",
"message": "요청에 성공하였습니다.",
"result": {
"communities": [
{
"questionId": 5,
"title": "first",
"content": "first"
},
{
"questionId": 4,
"title": "first",
"content": "fff"
},
{
"questionId": 3,
"title": "first",
"content": "fff"
},
{
"questionId": 2,
"title": "first",
"content": "fff"
},
{
"questionId": 1,
"title": "first",
"content": "fff"
}
],
"totalPage": 1,
"totalElements": 5,
"isFirst": true,
"isLast": true
}
}
""";
public static final String participatedDealsResponse = """
{
"time": "2024-01-11T16:06:30.852Z",
Expand Down Expand Up @@ -198,7 +392,18 @@ public class MyPageConstant {
}
}
""";

public static final String editMyProfile = """
{
"time": "2024-01-11T16:06:30.852Z",
"status": 200,
"code": "200",
"message": "요청에 성공하였습니다.",
"result": {
"message": "개인정보를 수정했습니다."
}
}
}
""";



Expand Down
Loading