[BE] 이슈 전체 조회 API 구현

be/src/main/java/com/issuetracker/config/CorsFilter.java

@@ -31,12 +31,4 @@ public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
             chain.doFilter(req, res);
         }
     }
-
-    public void init(FilterConfig filterConfig) {
-        // not needed
-    }
-
-    public void destroy() {
-        //not needed
-    }
 }

be/src/main/java/com/issuetracker/controller/IssueController.java

@@ -19,7 +19,6 @@ public IssueController(IssueService issueService) {
 
     @GetMapping
     public List<IssueDto> viewAllIssues(IssueSearchCondition searchCondition) {
-//        return issueService.getAllIssues();
         return issueService.searchIssuesByConditions(searchCondition);
     }
 

be/src/main/java/com/issuetracker/dto/LabelForIssueDetailDto.java

@@ -4,6 +4,8 @@
 import com.issuetracker.domain.Label;
 
 public class LabelForIssueDetailDto {
+    private Long id;
+
     private String title;
 
     @JsonProperty("color_code")
@@ -12,13 +14,17 @@ public class LabelForIssueDetailDto {
     @JsonProperty("font_light")
     private boolean fontLight;
 
-
-    public LabelForIssueDetailDto(String title, String colorCode, boolean fontLight) {
+    public LabelForIssueDetailDto(Long id, String title, String colorCode, boolean fontLight) {
+        this.id = id;
         this.title = title;
         this.colorCode = colorCode;
         this.fontLight = fontLight;
     }
 
+    public Long getId() {
+        return id;
+    }
+
     public String getTitle() {
         return title;
     }
@@ -33,6 +39,7 @@ public boolean isFontLight() {
 
     public static LabelForIssueDetailDto of(Label label) {
         return new LabelForIssueDetailDto(
+                label.getId(),
                 label.getTitle(),
                 label.getColorCode(),
                 label.isFontLight()

be/src/main/java/com/issuetracker/dto/MilestoneForIssueDetailDto.java

@@ -3,6 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class MilestoneForIssueDetailDto {
+    private Long id;
+
     private String title;
 
     @JsonProperty("opened_issue_count")
@@ -11,20 +13,26 @@ public class MilestoneForIssueDetailDto {
     @JsonProperty("closed_issue_count")
     private Integer closedIssueCount;
 
-    public MilestoneForIssueDetailDto(String title, Integer openedIssueCount, Integer closedIssueCount) {
+    public MilestoneForIssueDetailDto(Long id, String title, Integer openedIssueCount, Integer closedIssueCount) {
+        this.id = id;
         this.title = title;
         this.openedIssueCount = openedIssueCount;
         this.closedIssueCount = closedIssueCount;
     }
 
-    public static MilestoneForIssueDetailDto of(String title, Integer openedIssueCount, Integer closedIssueCount) {
+    public static MilestoneForIssueDetailDto of(Long id, String title, Integer openedIssueCount, Integer closedIssueCount) {
         return new MilestoneForIssueDetailDto(
+                id,
                 title,
                 openedIssueCount,
                 closedIssueCount
         );
     }
 
+    public Long getId() {
+        return id;
+    }
+
     public String getTitle() {
         return title;
     }

be/src/main/java/com/issuetracker/oauth/LoginController.java

@@ -17,7 +17,6 @@ public class LoginController {
 
     private Logger logger = LoggerFactory.getLogger(LoginController.class);
     private final Oauth oauthUtil;
-    // TODO: 추후 서비스 로직 분리 시 가져갈 것
     private final UserRepository userRepository;
 
     public LoginController(Oauth oauthUtil, UserRepository userRepository) {
@@ -33,7 +32,6 @@ public JwtDto login(@RequestParam String client, @RequestParam String code) {
         String secretId = null;
         String redirectUri = null;
 
-        // TODO: iOS 파트 추가//
         if (client.equals("ios")) {
             accessTokenUri = oauthUtil.getUriForAccesTokenIos(code);
             clientId = oauthUtil.getClientIdIos();

be/src/main/java/com/issuetracker/repository/IssueRepository.java

@@ -44,13 +44,6 @@ public void save(Issue issue) {
                 issue.getMilestoneId(),
                 issue.getAuthorUserId(),
                 issue.getNumber());
-
-        // TODO: issue에 딸려있는 Label insert 로직 추
-//        String queryForLabel = "insert into label (id, title, description, color_code, text_code) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
-//        jdbcTemplate.update(query, issue.getId(),
-//                issue.getTitle(),
-//                issue.getDescription(),
-//                issue.getAssignee()
     }
 
     public long simpleSave(Issue issue) {
@@ -62,7 +55,6 @@ public long simpleSave(Issue issue) {
 
 
     public List<Label> findAllLabelsByIssueId(Long issueId) {
-        System.out.println(issueId);
         String query = "select lbl.id, lbl.title, lbl.description, lbl.color_code, lbl.font_light\n" +
                 "from issue iss\n" +
                 "inner join issue_has_label\n" +
@@ -205,4 +197,10 @@ public void deleteIssueIdsConnectedByLabelId(Long id) {
         String query = "delete from issue_has_label where label_id = ?";
         jdbcTemplate.update(query, id);
     }
+
+//    public Long findIssueIdByMilestoneId(Long milestoneId) {
+//        String query = "select id from issue where milestone_id = ?";
+//        System.out.println(milestoneId);
+//        return jdbcTemplate.queryForObject(query, Long.class, milestoneId);
+//    }
 }

be/src/main/java/com/issuetracker/repository/UserRepository.java

@@ -15,7 +15,6 @@
 @Repository
 public class UserRepository {
 
-    Logger logger = LoggerFactory.getLogger(UserRepository.class);
     private final JdbcTemplate jdbcTemplate;
 
     public UserRepository(DataSource dataSource) {
@@ -28,7 +27,6 @@ public List<User> findAll() {
     }
 
     public User findOneById(Long userId) {
-        logger.info("User Id :{}", userId);
         String query = "select id, name, avatar_url\n" +
                 "from user\n" +
                 "where id = ?";
@@ -41,10 +39,8 @@ public void save(User user) {
     }
 
     public boolean hasSameUserId(Long userId) {
-        logger.info("User Id :{}", userId);
         String query = "select exists (select id from user where id = ?) as success";
         return jdbcTemplate.queryForObject(query, Boolean.class, userId);
-//        return null;
     }
 
     public List<User> findAllAuthors() {

be/src/main/java/com/issuetracker/s3/ImageService.java

@@ -28,7 +28,7 @@ public class ImageService {
     @Value("${cloud.aws.s3.bucket.url}")
     private String defaultUrl;
 
-    public String upload(MultipartFile file)  throws IOException {
+    public ImageUrlResponseDto upload(MultipartFile file)  throws IOException {
         ObjectMetadata data = new ObjectMetadata();
         data.setContentType(file.getContentType());
         data.setContentLength(file.getSize());
@@ -44,7 +44,7 @@ public String upload(MultipartFile file)  throws IOException {
         s3client.putObject(bucket, imageName, file.getInputStream(), data);
 
         String urlForMarkdown = defaultUrl + "/" + imageName;
-        return urlForMarkdown;
+        return new ImageUrlResponseDto(urlForMarkdown);
     }
 
     private String getImageName(MultipartFile file) {

be/src/main/java/com/issuetracker/s3/ImageUrlResponseDto.java

@@ -0,0 +1,16 @@
+package com.issuetracker.s3;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class ImageUrlResponseDto {
+    @JsonProperty("image_url")
+    private String imageUrl;
+
+    public ImageUrlResponseDto(String imageUrl) {
+        this.imageUrl = imageUrl;
+    }
+
+    public String getImageUrl() {
+        return imageUrl;
+    }
+}

be/src/main/java/com/issuetracker/s3/UploadController.java

@@ -17,9 +17,7 @@ public UploadController(ImageService imageService) {
     }
 
     @PostMapping("/api/images")
-    public String upload(@RequestParam("image") MultipartFile file) throws IOException {
-        return imageService.upload(file); // S3 bucket의 static/ 폴더를 지정한 것.
+    public ImageUrlResponseDto upload(@RequestParam("image") MultipartFile file) throws IOException {
+        return imageService.upload(file);
     }
-
-
 }

be/src/main/java/com/issuetracker/service/EmojisStatusService.java

@@ -6,6 +6,7 @@
 import com.issuetracker.dto.ResponseStatusDto;
 import com.issuetracker.repository.EmojisStatusRepository;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;

be/src/main/java/com/issuetracker/service/IssueService.java

@@ -33,13 +33,6 @@ public IssueService(IssueRepository issueRepository, UserRepository userReposito
         this.commentRepository = commentRepository;
     }
 
-    //    public List<IssueDto> getAllIssues() {
-//        return issueRepository.findAllIssues().stream()
-//                .map(issue -> IssueDto.of(issue, issueRepository.findMilestoneTitleByIssueId(issue.getId()), issueRepository.findAllLabelsByIssueId(issue.getId()),
-//                        userRepository.findOneById(issue.getAuthorUserId()), userRepository.findOneById(issue.getAssignee())))
-//                .collect(Collectors.toList());
-//    }
-
     public ResponseStatusDto saveIssue(IssueRequestDto requestDto, User author) {
         int lastNumOfIssues = issueRepository.findAllIssues().size();
 
@@ -75,9 +68,9 @@ public IssueDetailDto searchIssueDetailByIssueId(Long id) {
         Issue issue = issueRepository.findIssueByIssueId(id);
 
         MilestoneForIssueDetailDto milestoneDto = null;
-        logger.info("마일스톤아이디: {}", issue.getMilestoneId());
         if (issue.getMilestoneId() != 0) {
             milestoneDto = MilestoneForIssueDetailDto.of(
+                    issue.getMilestoneId(),
                     milestoneRepository.findMilestoneByMilestoneId(issue.getMilestoneId()),
                     issueRepository.countOpenedIssuesByMilestoneId(issue.getMilestoneId()),
                     issueRepository.countClosedIssuesByMilestoneId(issue.getMilestoneId())
@@ -93,7 +86,7 @@ public IssueDetailDto searchIssueDetailByIssueId(Long id) {
 
         UserDto assignee = null;
         if (issue.getAssignee() != 0) {
-            UserDto.of(userRepository.findOneById(issue.getAssignee()));
+            assignee = UserDto.of(userRepository.findOneById(issue.getAssignee()));
         }
 
         if (assignee == null) {

be/src/main/java/com/issuetracker/util/Oauth.java

@@ -29,9 +29,6 @@ public Oauth(Environment environment) {
     public static final String ALGORITHM_SECRET = "jwt.algorithm.secret";
     public static final String ISSUER = "jwt.issuer";
 
-    private String access_token;
-
-
     public String getClientIdIos() {
         return environment.getProperty(CLIENT_ID_iOS);
     }