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.

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

Feat: CHAT-156-BE-API-일기상세조회 #14

Merged
merged 6 commits into from
Jan 22, 2024
Merged
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
34 changes: 34 additions & 0 deletions src/main/java/com/kuit/chatdiary/controller/DiaryController.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package com.kuit.chatdiary.controller;

import com.kuit.chatdiary.dto.diary.DiaryShowDetailResponseDTO;
import com.kuit.chatdiary.service.DiaryService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import java.sql.Date;
import java.text.ParseException;
import java.util.List;

@Slf4j
@RestController
@RequiredArgsConstructor
@RequestMapping("/diary")
public class DiaryController {

private final DiaryService diaryService;

@GetMapping("/detail")
public ResponseEntity<DiaryShowDetailResponseDTO> showDiary(@RequestParam(name="user_id") Long userId, @RequestParam(name="diary_date") Date diaryDate) throws ParseException, ParseException {
log.info("[DiaryController.showDiary]");

return ResponseEntity.ok().body(diaryService.showDiary(userId,diaryDate));
}


}

1 change: 0 additions & 1 deletion src/main/java/com/kuit/chatdiary/domain/Chat.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.kuit.chatdiary.domain;

import jakarta.persistence.*;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.ColumnDefault;
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/com/kuit/chatdiary/domain/Diary.java
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
package com.kuit.chatdiary.domain;

import com.fasterxml.jackson.annotation.JsonIgnore;
import jakarta.persistence.*;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.ColumnDefault;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;

import java.sql.Date;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
Expand All @@ -29,7 +28,7 @@ public class Diary {
private Member member;

@Column(name = "diary_date")
private String diaryDate;
private Date diaryDate;

private String title;

Expand Down
2 changes: 0 additions & 2 deletions src/main/java/com/kuit/chatdiary/domain/Member.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package com.kuit.chatdiary.domain;

import jakarta.persistence.*;
import lombok.Builder;
import lombok.Cleanup;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.ColumnDefault;
Expand Down
1 change: 0 additions & 1 deletion src/main/java/com/kuit/chatdiary/domain/Photo.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import jakarta.persistence.*;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;

@Entity(name="photo")
@Getter
Expand Down
1 change: 0 additions & 1 deletion src/main/java/com/kuit/chatdiary/domain/Tag.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import jakarta.persistence.*;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;

import java.util.ArrayList;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package com.kuit.chatdiary.dto.diary;

import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;

import java.sql.Date;
import java.util.List;


@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
public class DiaryShowDetailResponseDTO {

private Date diaryDate ;

private String title;

//private String imgUrl;
private List<String> imgUrl;

private String content;

//private String tagName;
private List<String> tagName;

}
51 changes: 51 additions & 0 deletions src/main/java/com/kuit/chatdiary/repository/DiaryRepository.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
package com.kuit.chatdiary.repository;

import com.kuit.chatdiary.dto.diary.DiaryShowDetailResponseDTO;
import jakarta.persistence.EntityManager;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Repository;

import java.sql.Date;
import java.text.ParseException;
import java.util.List;

@RequiredArgsConstructor
@Slf4j
@Repository
public class DiaryRepository {

private final EntityManager em;

public DiaryShowDetailResponseDTO showDiaryDetail (Long userId, Date diaryDate) throws ParseException {

log.info("[DiaryRepository.showDiaryDetail]");

Long diaryId = 0L;
String title = "";
String content = "";

List<Object[]> resultList = em.createQuery("SELECT d.diaryId, d.title, d.content FROM diary d WHERE d.member.userId = :user_id AND d.diaryDate = :diary_date")
.setParameter("user_id", userId).setParameter("diary_date", diaryDate).getResultList();

for(Object[] result : resultList){
diaryId = (Long) result[0];
title = (String) result[1];
content = (String) result[2];
}


List<String> imageUrlList = em.createQuery("SELECT p.imageUrl FROM photo p WHERE p.diary.diaryId = :diary_id")
.setParameter("diary_id", diaryId).getResultList();

List<String> tagNameList = em.createQuery("SELECT t.tagName"+
" FROM diarytag dt LEFT OUTER JOIN dt.tag t"+
" WHERE dt.diary.id = :diary_id")
.setParameter("diary_id", diaryId).getResultList();


return new DiaryShowDetailResponseDTO(diaryDate, title, imageUrlList, content, tagNameList);

}

}
27 changes: 27 additions & 0 deletions src/main/java/com/kuit/chatdiary/service/DiaryService.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package com.kuit.chatdiary.service;

import com.kuit.chatdiary.dto.diary.DiaryShowDetailResponseDTO;
import com.kuit.chatdiary.repository.DiaryRepository;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.sql.Date;
import java.text.ParseException;
import java.util.List;

@Slf4j
@Service
@RequiredArgsConstructor
@Transactional(readOnly = true)
public class DiaryService {

private final DiaryRepository diaryRepository;

@Transactional
public DiaryShowDetailResponseDTO showDiary(Long userId, Date diaryDate) throws ParseException {
log.info("[DiaryService.showDiary]");
return diaryRepository.showDiaryDetail(userId, diaryDate);
}
}