Skip to content

Commit

Permalink
Feat : 일기 작성 기능을 구현합니다. (#49)
Browse files Browse the repository at this point in the history
* Feat : Diary관련 ErrorType 추가

* Feat : RedisConfig 추가

비동기 설정과 String 으로 직렬화,역직렬화 하도록 수정

* Feat : 메세지 및 DTO 추가

* Feat : 문법 및 불필요 파일 제거

* Feat : Diary Entity 수정

* Feat : Diary Publisher 구현

* Feat : Diary Listener 구현

* Chore : 경로 이동

* Feat : Diary Creation Service 구현

* Feat : createdAt Instant -> LocalDateTime

* Feat : Diary Controller 구현

* Feat : Diary Publisher 구현

* Faet : Diary Implementation 계층 구현

* Feat : Diary Policy 및 필터 구현

* Feat : Diary 서비스 계층 구현

* Feat : Jpa Repository 구현

* Feat : 욕설 필터링 종속성 추가

* Fix : Conflict 해결

* Feat : Entity Column 이름 수정

* Feat : Conflict 반영
  • Loading branch information
hyunw9 authored Jul 15, 2024
1 parent 544e095 commit 044b0de
Show file tree
Hide file tree
Showing 10 changed files with 30 additions and 39 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
import com.donkeys_today.server.application.user.UserService;
import com.donkeys_today.server.domain.alarm.Alarm;
import com.donkeys_today.server.domain.user.User;
import com.donkeys_today.server.infrastructure.alarm.AlarmJpaRepository;
import com.donkeys_today.server.infrastructure.alarm.AlarmRepository;

import com.donkeys_today.server.infrastructure.refreshToken.RedisConstants;
import com.donkeys_today.server.presentation.alarm.dto.request.AlarmRequest;
import com.donkeys_today.server.presentation.alarm.dto.response.AlarmResponse;
Expand Down Expand Up @@ -72,7 +73,7 @@ public class AlarmService {
private final LocalTime DEFAULT_ALARM_TIME = LocalTime.of(21, 0);

private final RedisTemplate<String, String> redisTemplate;
private final AlarmJpaRepository alarmJpaRepository;
private final AlarmRepository alarmRepository;
private final UserService userService;

private static String extractFcmToken(String key) {
Expand Down Expand Up @@ -145,13 +146,13 @@ public Alarm updateDiaryAlarmWithTime(Alarm alarm, boolean isDiaryAlarm) {
}

public Alarm findAlarmByUser(User user) {
return alarmJpaRepository.findByUser(user).orElseThrow(
return alarmRepository.findByUser(user).orElseThrow(
() -> new NotFoundException(ErrorType.USER_NOT_FOUND)
);
}

public List<Alarm> findAlarmsByCurrentTime(LocalTime currentTime) {
return alarmJpaRepository.findAllByTime(currentTime);
return alarmRepository.findAllByTime(currentTime);
}

public AlarmResponse getUserAlarm() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.donkeys_today.server.application.user.event.UserSignUpEvent;
import com.donkeys_today.server.domain.alarm.Alarm;
import com.donkeys_today.server.domain.alarm.AlarmRepository;
import com.donkeys_today.server.infrastructure.alarm.AlarmRepository;
import lombok.RequiredArgsConstructor;
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Component;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,4 @@ private void storeRefreshToken(Long id, String refreshToken) {
private Platform getPlatformFromRequestString(String platform) {
return Platform.fromString(platform);
}

}

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package com.donkeys_today.server.infrastructure.alarm;

import com.donkeys_today.server.domain.alarm.Alarm;
import com.donkeys_today.server.domain.user.User;
import java.time.LocalTime;
import java.util.List;
import java.util.Optional;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;

@Repository
public interface AlarmRepository extends JpaRepository<Alarm, Long> {

Optional<Alarm> findByUser(User user);

List<Alarm> findAllByTime(LocalTime time);
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@
@Repository
public interface ReplyRepository extends JpaRepository<Reply, Long> {

List<Reply> findByUserIdAndCreatedAtBetween(Long userId, LocalDate start, LocalDate end);
List<Reply> findByUserIdAndDiaryCreatedDateBetween(Long userId, LocalDate start, LocalDate end);

}
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
package com.donkeys_today.server.presentation.diary;

import com.donkeys_today.server.application.diary.DiaryService;

import com.donkeys_today.server.presentation.diary.dto.response.DiaryCalenderResponse;
import com.donkeys_today.server.presentation.diary.dto.response.DiaryListResponse;
import com.donkeys_today.server.presentation.diary.dto.response.DiaryResponse;

import com.donkeys_today.server.presentation.api.DiaryController;
import com.donkeys_today.server.presentation.diary.dto.response.DiaryCalenderResponse;
import com.donkeys_today.server.presentation.diary.dto.response.DiaryListResponse;
import com.donkeys_today.server.presentation.diary.dto.response.DiaryResponse;
import com.donkeys_today.server.support.dto.ApiResponse;
import com.donkeys_today.server.support.dto.type.SuccessType;
import lombok.RequiredArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,8 @@

public record DiaryFullInfo(
int diaryCount,

ReplyStatus replyStatus,

LocalDate date,

List<DiaryContent> diary
) {
public static DiaryFullInfo of(int diaryCount, ReplyStatus replyStatus, LocalDate date, List<DiaryContent> diary) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,5 @@ public ResponseEntity<ApiResponse<TokenReissueResponse>> reissue(String refreshT
TokenReissueResponse response = userService.reissueAccessToken(refreshTokenWithBearer);
return ResponseEntity.status(HttpStatus.OK)
.body(ApiResponse.success(SuccessType.OK_SUCCESS, response));

}
}

0 comments on commit 044b0de

Please sign in to comment.