Merge pull request #28 from Yoon-Suji/main

Feat: 딥러닝 서버 주소 추가

Author: hak2711

src/main/java/com/fedi/domain/repository/TweetRepository.java

@@ -5,6 +5,7 @@
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Optional;
@@ -15,8 +16,9 @@ public interface TweetRepository extends JpaRepository<Tweet, Long> {
     List<Tweet> findAllById(Iterable<Long> ids);
     Tweet findByTweetUrl(String tweetUrl);
 
+    @Transactional
     @Modifying(clearAutomatically = true)
     @Query("UPDATE Tweet t SET t.retweets = :retweets WHERE t.tweetId = :id")
-    int updateRetweets(String retweets, Long id);
+    int updateRetweets(@Param("retweets") String retweets, @Param("id") Long id);
 
 }

src/main/java/com/fedi/service/ImageService.java

@@ -53,7 +53,7 @@ public List<VectorResponseDto> extractVector(List<ImageRequestDto> requestDto) t
     	RestTemplate restTemplate = new RestTemplate();
 
 		JSONParser jsonParser = new JSONParser();
-		String url = "http://localhost:5000/extract";
+		String url = "http://20.214.186.52/extract";
 
 		HttpHeaders httpHeaders = new HttpHeaders(); //Header 생성
 		httpHeaders.setContentType(MediaType.MULTIPART_FORM_DATA);
@@ -73,6 +73,7 @@ public List<VectorResponseDto> extractVector(List<ImageRequestDto> requestDto) t
     public String uploadImages(List<ImageRequestDto> images, List<VectorResponseDto> vectors) {
     	int count = 0;
     	for (VectorResponseDto vector : vectors) {
+    		System.out.println(vector);
     		int index = vector.getIndex();
     		ImageRequestDto image = images.get(index);
 
@@ -110,6 +111,7 @@ public String uploadImages(List<ImageRequestDto> images, List<VectorResponseDto>
 	        count++;
 
     	}
+    	System.out.println(count);
     	return "success: "+ String.valueOf(count);
     }
 

src/main/java/com/fedi/service/NetworkService.java

@@ -50,6 +50,7 @@ public List<RpaRequestDto> updateRetweets(List<LikeRpaResponseDto> response, Lis
 		List<LikeRpaResponseDto> retweets = new ArrayList<>(); // db에 추가할 내용.
 		List<RpaRequestDto> requests = new ArrayList<>(); // 신고 rpa에 넘겨줄 url
 		int idx = 0; 
+
 		for (LikeRpaResponseDto e : response) {
 			RpaRequestDto request = new RpaRequestDto(e.getUrl());
 			requests.add(request);
@@ -65,6 +66,11 @@ public List<RpaRequestDto> updateRetweets(List<LikeRpaResponseDto> response, Lis
 				retweets.clear();
 			}
 		}
+		Map<String, List<LikeRpaResponseDto>> retweetMap = new HashMap();
+		retweetMap.put("retweets", retweets);
+		String retweet = new Gson().toJson(retweetMap);
+		tweetRepository.updateRetweets(retweet, tweets.get(idx).getTweetId());
+		idx++;
 		return requests;
 
 

src/main/java/com/fedi/service/ResultService.java

@@ -45,7 +45,7 @@ public JSONObject getAnalysis(MultipartFile file, String images) throws ParseExc
 		restTemplate.getMessageConverters().add(new MappingJackson2HttpMessageConverter());
 
 		JSONParser jsonParser = new JSONParser();
-		String url = "http://localhost:5000/results";
+		String url = "http://20.214.186.52/results";
 
 		HttpHeaders httpHeaders = new HttpHeaders(); //Header 생성
 		httpHeaders.setContentType(MediaType.MULTIPART_FORM_DATA);

src/main/java/com/fedi/web/NetworkController.java

@@ -103,7 +103,7 @@ public ResponseEntity<Object> getNetworks(@RequestBody Map<String, Object> image
 		System.out.println("Update Success");
 
 		// 메일 발송
-		String networkUrl ="http://localhost:8080/retweets/" + ids.stream().map(s -> String.valueOf(s)).collect(Collectors.joining(","));
+		String networkUrl ="https://fedi.link/retweets/" + ids.stream().map(s -> String.valueOf(s)).collect(Collectors.joining(","));
 		ArrayList<String> url = (ArrayList<String>) requestDto.stream().map(RpaRequestDto::getTweetUrl).collect(Collectors.toList());
 		MailRequestDto mailReq = new MailRequestDto(email, url, networkUrl);
 
@@ -135,12 +135,12 @@ public ResponseEntity<Object> getNetworks(@RequestBody Map<String, Object> image
 			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Report RPA failed");
 		}
 
-		List<Long> tweetIds = tweets.stream().map(Tweet::getTweetId).collect(Collectors.toList());
-		tweetService.reportTweets(tweetIds);		
-		
+		List<Long> tweetIds = tweets.stream().map(Tweet::getTweetId).collect(Collectors.toList());	
+		System.out.println(tweetService.reportTweets(tweetIds));
 		return ResponseEntity.ok().body("success");
 
 	}
+	
 
 	@GetMapping("/retweets/{imageId}")
 	public NetworkResponseDto getRetweets(@PathVariable Long[] imageId){
@@ -152,7 +152,7 @@ public NetworkResponseDto getRetweets(@PathVariable Long[] imageId){
 
 		ArrayList<NodeDto> nodeDtos = new ArrayList<>();
 		ArrayList<LinkDto> linkDtos = new ArrayList<>();
-		
+
 		int id = 0;
 		int sourceId = 0;
 		int group = 0;