From 71fc525d2a91d2083bdf09c9df491edaf1956518 Mon Sep 17 00:00:00 2001 From: okod Date: Tue, 19 Nov 2024 15:23:14 +0900 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=EB=8B=B9=EC=9D=BC=20=EC=9D=B4?= =?UTF-8?q?=EC=A0=84=20touchpoint=EB=A7=8C=20=EB=B0=98=ED=99=98=EB=90=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../spring/domain/touchpoint/TouchpointRepository.java | 8 ++++++-- .../vom/spring/domain/touchpoint/TouchpointService.java | 5 +++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/vom/spring/domain/touchpoint/TouchpointRepository.java b/src/main/java/vom/spring/domain/touchpoint/TouchpointRepository.java index 6faca30..8229952 100644 --- a/src/main/java/vom/spring/domain/touchpoint/TouchpointRepository.java +++ b/src/main/java/vom/spring/domain/touchpoint/TouchpointRepository.java @@ -3,6 +3,7 @@ import jakarta.persistence.EntityManager; import jakarta.persistence.PersistenceContext; import jakarta.persistence.TypedQuery; +import java.time.LocalDate; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; @@ -22,12 +23,15 @@ public void save(Touchpoint touchpoint) { em.persist(touchpoint); } - public List findFromMemberIdsByToMemberId(Long toMemberId) { + public List findFromMemberIdsByToMemberId(Long toMemberId, LocalDate today) { return em.createQuery( "select new TouchpointDto(t.fromMember.id, t.createdAt, t.fromMember.profileImgUrl) " + - "from Touchpoint t where t.toMember.id = :toMemberId", + "from Touchpoint t " + + "where t.toMember.id = :toMemberId " + + "and t.createdAt < :today", TouchpointDto.class) .setParameter("toMemberId", toMemberId) + .setParameter("today", today.atStartOfDay()) .getResultList(); } diff --git a/src/main/java/vom/spring/domain/touchpoint/TouchpointService.java b/src/main/java/vom/spring/domain/touchpoint/TouchpointService.java index dd84e85..b792f00 100644 --- a/src/main/java/vom/spring/domain/touchpoint/TouchpointService.java +++ b/src/main/java/vom/spring/domain/touchpoint/TouchpointService.java @@ -1,5 +1,6 @@ package vom.spring.domain.touchpoint; +import java.time.LocalDate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -26,8 +27,8 @@ public TouchpointService(TouchpointRepository touchpointRepository, MemberReposi */ @Transactional public List getTouchpoints(Long member_id) { -// Member member = memberRepository.findById(member_id).get(); - return touchpointRepository.findFromMemberIdsByToMemberId(member_id); + LocalDate today = LocalDate.now(); + return touchpointRepository.findFromMemberIdsByToMemberId(member_id, today); } /** From 24549990ddc24321243fe4ce0bdd78769c9c2815 Mon Sep 17 00:00:00 2001 From: okod Date: Wed, 20 Nov 2024 18:16:03 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20TouchpointDto=20fromMemberId=20->=20?= =?UTF-8?q?fromMemberNickname=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/touchpoint/TouchpointDto.java | 37 +++--------------- .../touchpoint/TouchpointRepository.java | 4 +- .../domain/touchpoint/TouchpointService.java | 2 +- .../vom/spring/global/config/S3Config.java | 38 +++++++++---------- 4 files changed, 27 insertions(+), 54 deletions(-) diff --git a/src/main/java/vom/spring/domain/touchpoint/TouchpointDto.java b/src/main/java/vom/spring/domain/touchpoint/TouchpointDto.java index 46dfe7e..1701da7 100644 --- a/src/main/java/vom/spring/domain/touchpoint/TouchpointDto.java +++ b/src/main/java/vom/spring/domain/touchpoint/TouchpointDto.java @@ -1,46 +1,19 @@ package vom.spring.domain.touchpoint; -import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Getter; -import vom.spring.domain.album.Album; -import vom.spring.domain.album.AlbumDto; -import vom.spring.domain.member.domain.Member; +import lombok.Setter; import java.time.LocalDateTime; +@Getter @Setter public class TouchpointDto { - private Long fromMemberId; + private String fromMemberNickname; private LocalDateTime createdAt; private String fromMemberProfileImgUrl; - public TouchpointDto(Long fromMemberId, LocalDateTime createdAt, String fromMemberProfileImgUrl) { - this.fromMemberId = fromMemberId; + public TouchpointDto(String fromMemberNickname, LocalDateTime createdAt, String fromMemberProfileImgUrl) { + this.fromMemberNickname = fromMemberNickname; this.createdAt = createdAt; this.fromMemberProfileImgUrl = fromMemberProfileImgUrl; } - - public Long getFromMemberId() { - return fromMemberId; - } - - public void setFromMemberId(Long fromMemberId) { - this.fromMemberId = fromMemberId; - } - - public LocalDateTime getCreatedAt() { - return createdAt; - } - - public void setCreatedAt(LocalDateTime createdAt) { - this.createdAt = createdAt; - } - - public String getFromMemberProfileImgUrl() { - return fromMemberProfileImgUrl; - } - - public void setFromMemberProfileImgUrl(String fromMemberProfileUrl) { - this.fromMemberProfileImgUrl = fromMemberProfileUrl; - } } diff --git a/src/main/java/vom/spring/domain/touchpoint/TouchpointRepository.java b/src/main/java/vom/spring/domain/touchpoint/TouchpointRepository.java index 8229952..6bd0a1f 100644 --- a/src/main/java/vom/spring/domain/touchpoint/TouchpointRepository.java +++ b/src/main/java/vom/spring/domain/touchpoint/TouchpointRepository.java @@ -23,9 +23,9 @@ public void save(Touchpoint touchpoint) { em.persist(touchpoint); } - public List findFromMemberIdsByToMemberId(Long toMemberId, LocalDate today) { + public List findByToMemberId(Long toMemberId, LocalDate today) { return em.createQuery( - "select new TouchpointDto(t.fromMember.id, t.createdAt, t.fromMember.profileImgUrl) " + + "select new TouchpointDto(t.fromMember.nickname, t.createdAt, t.fromMember.profileImgUrl) " + "from Touchpoint t " + "where t.toMember.id = :toMemberId " + "and t.createdAt < :today", diff --git a/src/main/java/vom/spring/domain/touchpoint/TouchpointService.java b/src/main/java/vom/spring/domain/touchpoint/TouchpointService.java index b792f00..15e8ac0 100644 --- a/src/main/java/vom/spring/domain/touchpoint/TouchpointService.java +++ b/src/main/java/vom/spring/domain/touchpoint/TouchpointService.java @@ -28,7 +28,7 @@ public TouchpointService(TouchpointRepository touchpointRepository, MemberReposi @Transactional public List getTouchpoints(Long member_id) { LocalDate today = LocalDate.now(); - return touchpointRepository.findFromMemberIdsByToMemberId(member_id, today); + return touchpointRepository.findByToMemberId(member_id, today); } /** diff --git a/src/main/java/vom/spring/global/config/S3Config.java b/src/main/java/vom/spring/global/config/S3Config.java index 6457e1b..74d2507 100644 --- a/src/main/java/vom/spring/global/config/S3Config.java +++ b/src/main/java/vom/spring/global/config/S3Config.java @@ -11,34 +11,34 @@ @Configuration public class S3Config { -// @Value("${cloud.aws.credentials.access-key}") -// private String accessKey; -// -// @Value("${cloud.aws.credentials.secret-key}") -// private String secretKey; -// -// @Value("${cloud.aws.region.static}") -// private String region; -// -// @Bean -// public AmazonS3Client amazonS3Client() { -// BasicAWSCredentials credentials = new BasicAWSCredentials(accessKey, secretKey); -// -// return (AmazonS3Client) AmazonS3ClientBuilder -// .standard() -// .withRegion(region) -// .withCredentials(new AWSStaticCredentialsProvider(credentials)) -// .build(); -// } + @Value("${cloud.aws.credentials.access-key}") + private String accessKey; + + @Value("${cloud.aws.credentials.secret-key}") + private String secretKey; + @Value("${cloud.aws.region.static}") private String region; @Bean public AmazonS3Client amazonS3Client() { + BasicAWSCredentials credentials = new BasicAWSCredentials(accessKey, secretKey); return (AmazonS3Client) AmazonS3ClientBuilder .standard() .withRegion(region) + .withCredentials(new AWSStaticCredentialsProvider(credentials)) .build(); } +// @Value("${cloud.aws.region.static}") +// private String region; +// +// @Bean +// public AmazonS3Client amazonS3Client() { +// +// return (AmazonS3Client) AmazonS3ClientBuilder +// .standard() +// .withRegion(region) +// .build(); +// } }