-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* chore : querydsl 설정 추가 * fix : member id명 수정 * feat : 디스코드 알람 파일 조회 로직 구현 * fix : 트랜잭션 적용 변경
- Loading branch information
Showing
13 changed files
with
164 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -36,3 +36,6 @@ out/ | |
|
||
### VS Code ### | ||
.vscode/ | ||
|
||
### Querydsl ### | ||
/src/main/generated/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 25 additions & 0 deletions
25
src/main/java/gigedi/dev/domain/discord/api/AlarmController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
package gigedi.dev.domain.discord.api; | ||
|
||
import org.springframework.web.bind.annotation.GetMapping; | ||
import org.springframework.web.bind.annotation.RequestMapping; | ||
import org.springframework.web.bind.annotation.RestController; | ||
|
||
import gigedi.dev.domain.discord.application.AlarmService; | ||
import gigedi.dev.domain.discord.dto.response.GetAlarmFileListResponse; | ||
import io.swagger.v3.oas.annotations.Operation; | ||
import io.swagger.v3.oas.annotations.tags.Tag; | ||
import lombok.RequiredArgsConstructor; | ||
|
||
@Tag(name = "Alarm", description = "Alarm 관련 API") | ||
@RestController | ||
@RequestMapping("/api/v1/alarm") | ||
@RequiredArgsConstructor | ||
public class AlarmController { | ||
private final AlarmService alarmService; | ||
|
||
@Operation(summary = "알람 정보 파일 조회", description = "알람이 설정되어있는 파일 리스틀를 조회하는 API") | ||
@GetMapping("/discord") | ||
public GetAlarmFileListResponse discordSocialLogin() { | ||
return alarmService.getAlarmFileList(); | ||
} | ||
} |
32 changes: 32 additions & 0 deletions
32
src/main/java/gigedi/dev/domain/discord/application/AlarmService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
package gigedi.dev.domain.discord.application; | ||
|
||
import java.util.List; | ||
import java.util.stream.Collectors; | ||
|
||
import org.springframework.stereotype.Service; | ||
|
||
import gigedi.dev.domain.discord.domain.Discord; | ||
import gigedi.dev.domain.discord.dto.response.AlarmFileResponse; | ||
import gigedi.dev.domain.discord.dto.response.GetAlarmFileListResponse; | ||
import gigedi.dev.domain.file.application.AuthorityService; | ||
import gigedi.dev.domain.member.domain.Member; | ||
import gigedi.dev.global.util.MemberUtil; | ||
import lombok.RequiredArgsConstructor; | ||
|
||
@Service | ||
@RequiredArgsConstructor | ||
public class AlarmService { | ||
private final DiscordService discordService; | ||
private final AuthorityService authorityService; | ||
private final MemberUtil memberUtil; | ||
|
||
public GetAlarmFileListResponse getAlarmFileList() { | ||
Member currentMember = memberUtil.getCurrentMember(); | ||
Discord connectedDiscord = discordService.findConnectedDiscord(); | ||
List<AlarmFileResponse> alarmList = | ||
authorityService.getRelatedAuthorityList(currentMember.getId()).stream() | ||
.map(AlarmFileResponse::from) | ||
.collect(Collectors.toList()); | ||
return new GetAlarmFileListResponse(connectedDiscord.getEmail(), alarmList); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
src/main/java/gigedi/dev/domain/discord/dto/response/AlarmFileResponse.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
package gigedi.dev.domain.discord.dto.response; | ||
|
||
import gigedi.dev.domain.file.domain.Authority; | ||
|
||
public record AlarmFileResponse(Long authorityId, String fileName, boolean isAlarmActive) { | ||
public static AlarmFileResponse from(Authority authority) { | ||
return new AlarmFileResponse( | ||
authority.getAuthorityId(), authority.getFile().getFileName(), authority.isAlarm()); | ||
} | ||
} |
5 changes: 5 additions & 0 deletions
5
src/main/java/gigedi/dev/domain/discord/dto/response/GetAlarmFileListResponse.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
package gigedi.dev.domain.discord.dto.response; | ||
|
||
import java.util.List; | ||
|
||
public record GetAlarmFileListResponse(String discordEmail, List<AlarmFileResponse> alarmList) {} |
21 changes: 21 additions & 0 deletions
21
src/main/java/gigedi/dev/domain/file/application/AuthorityService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
package gigedi.dev.domain.file.application; | ||
|
||
import java.util.List; | ||
|
||
import org.springframework.stereotype.Service; | ||
import org.springframework.transaction.annotation.Transactional; | ||
|
||
import gigedi.dev.domain.file.dao.AuthorityRepository; | ||
import gigedi.dev.domain.file.domain.Authority; | ||
import lombok.RequiredArgsConstructor; | ||
|
||
@Service | ||
@RequiredArgsConstructor | ||
public class AuthorityService { | ||
private final AuthorityRepository authorityRepository; | ||
|
||
@Transactional(readOnly = true) | ||
public List<Authority> getRelatedAuthorityList(Long memberId) { | ||
return authorityRepository.findRelatedAuthorities(memberId); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 9 additions & 0 deletions
9
src/main/java/gigedi/dev/domain/file/dao/AuthorityRepositoryCustom.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
package gigedi.dev.domain.file.dao; | ||
|
||
import java.util.List; | ||
|
||
import gigedi.dev.domain.file.domain.Authority; | ||
|
||
public interface AuthorityRepositoryCustom { | ||
List<Authority> findRelatedAuthorities(Long memberId); | ||
} |
31 changes: 31 additions & 0 deletions
31
src/main/java/gigedi/dev/domain/file/dao/AuthorityRepositoryImpl.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
package gigedi.dev.domain.file.dao; | ||
|
||
import java.util.List; | ||
|
||
import com.querydsl.jpa.impl.JPAQueryFactory; | ||
|
||
import gigedi.dev.domain.auth.domain.QFigma; | ||
import gigedi.dev.domain.file.domain.Authority; | ||
import gigedi.dev.domain.file.domain.QAuthority; | ||
import gigedi.dev.domain.member.domain.QMember; | ||
import lombok.RequiredArgsConstructor; | ||
|
||
@RequiredArgsConstructor | ||
public class AuthorityRepositoryImpl implements AuthorityRepositoryCustom { | ||
private final JPAQueryFactory queryFactory; | ||
|
||
@Override | ||
public List<Authority> findRelatedAuthorities(Long memberId) { | ||
return queryFactory | ||
.selectFrom(QAuthority.authority) | ||
.join(QAuthority.authority.figma, QFigma.figma) | ||
.join(QFigma.figma.member, QMember.member) | ||
.where( | ||
QMember.member | ||
.id | ||
.eq(memberId) | ||
.and(QMember.member.deletedAt.isNull()) | ||
.and(QFigma.figma.deletedAt.isNull())) | ||
.fetch(); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters