Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
B
backend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
umc team 1
backend
Commits
5c1bb363
Commit
5c1bb363
authored
1 year ago
by
donghyun
Browse files
Options
Downloads
Patches
Plain Diff
feat(PostController): 파file is deleted with post deleting
parent
cf73aa05
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/umc/spring/file/controller/FileController.java
+4
-4
4 additions, 4 deletions
src/main/java/umc/spring/file/controller/FileController.java
src/main/java/umc/spring/post/service/PostServiceImpl.java
+10
-1
10 additions, 1 deletion
src/main/java/umc/spring/post/service/PostServiceImpl.java
with
14 additions
and
5 deletions
src/main/java/umc/spring/file/controller/FileController.java
+
4
−
4
View file @
5c1bb363
...
@@ -19,13 +19,13 @@ import java.util.List;
...
@@ -19,13 +19,13 @@ import java.util.List;
@RequestMapping
(
"/api/file"
)
@RequestMapping
(
"/api/file"
)
public
class
FileController
{
public
class
FileController
{
private
final
AmazonS3Service
amazon
3
SService
;
private
final
AmazonS3Service
amazonS
3
Service
;
@PostMapping
(
"/uploads"
)
@PostMapping
(
"/uploads"
)
public
List
<
S3FileDto
>
uploadFiles
(
public
List
<
S3FileDto
>
uploadFiles
(
@RequestParam
(
value
=
"uploadFilePath"
)
String
uploadFilePath
,
@RequestParam
(
value
=
"uploadFilePath"
)
String
uploadFilePath
,
@RequestPart
(
value
=
"files"
)
List
<
MultipartFile
>
multipartFiles
)
{
@RequestPart
(
value
=
"files"
)
List
<
MultipartFile
>
multipartFiles
)
{
return
amazon
3
SService
.
uploadFiles
(
uploadFilePath
,
multipartFiles
);
return
amazonS
3
Service
.
uploadFiles
(
uploadFilePath
,
multipartFiles
);
}
}
@DeleteMapping
(
"/delete"
)
@DeleteMapping
(
"/delete"
)
...
@@ -34,7 +34,7 @@ public class FileController {
...
@@ -34,7 +34,7 @@ public class FileController {
@RequestParam
(
value
=
"uuidFileName"
)
String
uuidFileName
)
{
@RequestParam
(
value
=
"uuidFileName"
)
String
uuidFileName
)
{
return
ResponseEntity
return
ResponseEntity
.
status
(
HttpStatus
.
OK
)
.
status
(
HttpStatus
.
OK
)
.
body
(
amazon
3
SService
.
deleteFile
(
uploadFilePath
,
uuidFileName
));
.
body
(
amazonS
3
Service
.
deleteFile
(
uploadFilePath
,
uuidFileName
));
}
}
@GetMapping
(
"/get"
)
@GetMapping
(
"/get"
)
...
@@ -42,7 +42,7 @@ public class FileController {
...
@@ -42,7 +42,7 @@ public class FileController {
@RequestParam
String
uploadFilePath
,
@RequestParam
String
uploadFilePath
,
@RequestParam
String
uuidFileName
)
{
@RequestParam
String
uuidFileName
)
{
try
{
try
{
InputStream
inputStream
=
amazon
3
SService
.
getFile
(
uploadFilePath
,
uuidFileName
);
InputStream
inputStream
=
amazonS
3
Service
.
getFile
(
uploadFilePath
,
uuidFileName
);
if
(
inputStream
!=
null
)
{
if
(
inputStream
!=
null
)
{
byte
[]
buffer
=
new
byte
[
4048
];
byte
[]
buffer
=
new
byte
[
4048
];
int
bytesRead
;
int
bytesRead
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/umc/spring/post/service/PostServiceImpl.java
+
10
−
1
View file @
5c1bb363
...
@@ -6,6 +6,9 @@ import org.springframework.beans.factory.annotation.Autowired;
...
@@ -6,6 +6,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.http.HttpStatus
;
import
org.springframework.http.HttpStatus
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.web.server.ResponseStatusException
;
import
org.springframework.web.server.ResponseStatusException
;
import
umc.spring.file.domain.S3File
;
import
umc.spring.file.domain.S3FileDto
;
import
umc.spring.file.service.AmazonS3Service
;
import
umc.spring.post.data.dto.CommentDto
;
import
umc.spring.post.data.dto.CommentDto
;
import
umc.spring.post.data.dto.PostDto
;
import
umc.spring.post.data.dto.PostDto
;
import
umc.spring.post.data.dto.PostResDto
;
import
umc.spring.post.data.dto.PostResDto
;
...
@@ -29,6 +32,9 @@ public class PostServiceImpl implements PostService{
...
@@ -29,6 +32,9 @@ public class PostServiceImpl implements PostService{
@Autowired
@Autowired
private
final
PostRepository
postRepository
;
private
final
PostRepository
postRepository
;
@Autowired
private
final
AmazonS3Service
amazonS3Service
;
@Autowired
@Autowired
private
final
CommentRepository
commentRepository
;
private
final
CommentRepository
commentRepository
;
...
@@ -37,8 +43,9 @@ public class PostServiceImpl implements PostService{
...
@@ -37,8 +43,9 @@ public class PostServiceImpl implements PostService{
@Autowired
@Autowired
private
final
LikeRepository
likeRepository
;
private
final
LikeRepository
likeRepository
;
public
PostServiceImpl
(
PostRepository
postRepository
,
CommentRepository
commentRepository
,
UserRepository
userRepository
,
LikeRepository
likeRepository
)
{
public
PostServiceImpl
(
PostRepository
postRepository
,
AmazonS3Service
amazonS3Service
,
CommentRepository
commentRepository
,
UserRepository
userRepository
,
LikeRepository
likeRepository
)
{
this
.
postRepository
=
postRepository
;
this
.
postRepository
=
postRepository
;
this
.
amazonS3Service
=
amazonS3Service
;
this
.
commentRepository
=
commentRepository
;
this
.
commentRepository
=
commentRepository
;
this
.
userRepository
=
userRepository
;
this
.
userRepository
=
userRepository
;
this
.
likeRepository
=
likeRepository
;
this
.
likeRepository
=
likeRepository
;
...
@@ -89,6 +96,8 @@ public class PostServiceImpl implements PostService{
...
@@ -89,6 +96,8 @@ public class PostServiceImpl implements PostService{
throw
new
ResponseStatusException
(
HttpStatus
.
UNAUTHORIZED
,
"token not found"
);
throw
new
ResponseStatusException
(
HttpStatus
.
UNAUTHORIZED
,
"token not found"
);
}
}
if
(
Objects
.
equals
(
byId
.
get
().
getUserId
(),
userInfoDto
.
getUserId
())){
if
(
Objects
.
equals
(
byId
.
get
().
getUserId
(),
userInfoDto
.
getUserId
())){
S3File
s3File
=
byId
.
get
().
getS3File
();
amazonS3Service
.
deleteFile
(
s3File
.
getUploadFilePath
(),
s3File
.
getUploadFileName
());
postRepository
.
deleteById
(
id
);
postRepository
.
deleteById
(
id
);
return
true
;
return
true
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment