From 75fdd59bd840ee5b53eb8543af3e6dbbdd898af1 Mon Sep 17 00:00:00 2001 From: sectionr0 Date: Sun, 30 Jul 2023 03:54:59 +0900 Subject: [PATCH] fix: issue bug --- .../kr/co/bookand/backend/issue/service/IssueService.kt | 4 ++-- .../kr/co/bookand/backend/util/s3/service/AwsS3Service.kt | 2 +- src/test/kotlin/kr/co/bookand/backend/IssueServiceTest.kt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/kr/co/bookand/backend/issue/service/IssueService.kt b/src/main/kotlin/kr/co/bookand/backend/issue/service/IssueService.kt index 145ed56..fcac3f1 100644 --- a/src/main/kotlin/kr/co/bookand/backend/issue/service/IssueService.kt +++ b/src/main/kotlin/kr/co/bookand/backend/issue/service/IssueService.kt @@ -53,12 +53,12 @@ class IssueService( var fileDto = FileDto("", "") if (createIssueRequest.logFile != null) { val multipartFile = createIssueRequest.logFile - fileDto = awsS3Service.uploadV2(multipartFile, "reportLog", "loginAccount") + fileDto = awsS3Service.uploadV2(multipartFile, "reportLog", owner = currentAccount.email) } val issue = Issue(createIssueRequest, 1L) if (createIssueRequest.sendLogs) { - issue.setLogFile(fileDto.url, fileDto.fileName) + issue.setLogFile(fileDto.fileUrl, fileDto.fileName) } val saveIssue: Issue = issueRepository.save(issue) diff --git a/src/main/kotlin/kr/co/bookand/backend/util/s3/service/AwsS3Service.kt b/src/main/kotlin/kr/co/bookand/backend/util/s3/service/AwsS3Service.kt index 45ccac0..fa95a96 100644 --- a/src/main/kotlin/kr/co/bookand/backend/util/s3/service/AwsS3Service.kt +++ b/src/main/kotlin/kr/co/bookand/backend/util/s3/service/AwsS3Service.kt @@ -39,7 +39,7 @@ class AwsS3Service( fun uploadFiles(uploadFileRequest: UploadFileRequest): FileListDto { - val currentAccountEmail = "SecurityUtil.getCurrentAccountEmail()" + val currentAccountEmail = getCurrentAccountEmail() val files = uploadFileRequest.files if (CollectionUtils.isEmpty(files)) { throw BookandException(ErrorCode.INPUT_VALID_ERROR) diff --git a/src/test/kotlin/kr/co/bookand/backend/IssueServiceTest.kt b/src/test/kotlin/kr/co/bookand/backend/IssueServiceTest.kt index 2702d8b..ca0206f 100644 --- a/src/test/kotlin/kr/co/bookand/backend/IssueServiceTest.kt +++ b/src/test/kotlin/kr/co/bookand/backend/IssueServiceTest.kt @@ -77,8 +77,8 @@ class IssueServiceTest : BehaviorSpec({ ) val fileDto = FileDto( - url = "url", - fileName = "fileName" + fileName = "fileName", + fileUrl = "url" )