Merge pull request #35 from AleksandraKrasteva/dev

Dev
AleksandraKrasteva · Jun 22, 2024 · 466e792 · 466e792
2 parents daf5a76 + 5fe05b0
commit 466e792
Show file tree

Hide file tree

Showing 34 changed files with 73 additions and 142 deletions.
diff --git a/JourneyService/build.gradle b/JourneyService/build.gradle
@@ -13,13 +13,11 @@ version = '0.0.1-SNAPSHOT'
 java {
     sourceCompatibility = '17'
 }
-
 configurations {
     compileOnly {
         extendsFrom annotationProcessor
     }
 }
-
 repositories {
     mavenCentral()
 }
@@ -43,7 +41,6 @@ dependencies {
     tasks.named('test') {
     useJUnitPlatform()
 }
-
 test {
     finalizedBy jacocoTestReport
 }
@@ -78,5 +75,4 @@ task integrationTests(type: Test) {
     }
     description 'run unit tests'
     finalizedBy jacocoTestReport
-
-}
+}
diff --git a/JourneyService/src/main/java/com/skipass/journeyservice/business/JourneyService.java b/JourneyService/src/main/java/com/skipass/journeyservice/business/JourneyService.java
@@ -9,12 +9,8 @@
 @Service
 public interface JourneyService {
     JourneyEntity createJourney(String authorUsername);
-
     List<JourneyEntity> getAllForUser(String authorUsername);
-
     JourneyEntity getJourneyById(long journeyId);
-
     void deleteJourneyById(long journeyId);
-
     void deleteJourneysForAuthor(String authorUsername);
 }
diff --git a/...neyService/src/main/java/com/skipass/journeyservice/business/impl/JourneyServiceImpl.java b/...neyService/src/main/java/com/skipass/journeyservice/business/impl/JourneyServiceImpl.java
@@ -64,7 +64,6 @@ public List<JourneyEntity> getAllForUser(String authorUsername) {
         List<JourneyEntity> journeys = journeyRepository.getJourneyEntitiesByAuthorUsernameIs(authorUsername);
         return journeys;
     }
-
     @Override
     public JourneyEntity getJourneyById(long journeyId) {
         Optional<JourneyEntity> journey = journeyRepository.findById(journeyId);
@@ -73,7 +72,6 @@ public JourneyEntity getJourneyById(long journeyId) {
         }
         return null;
     }
-
     @Override
     public void deleteJourneyById(long journeyId) {
         Optional<JourneyEntity> journey = journeyRepository.findById(journeyId);
@@ -85,6 +83,5 @@ public void deleteJourneyById(long journeyId) {
     @Override
     public void deleteJourneysForAuthor(String authorUsername) {
         journeyRepository.deleteAllByAuthorUsernameIs(authorUsername);
-
     }
 }
diff --git a/JourneyService/src/main/java/com/skipass/journeyservice/controllers/JourneyController.java b/JourneyService/src/main/java/com/skipass/journeyservice/controllers/JourneyController.java
@@ -17,31 +17,25 @@ public class JourneyController {
 
     @PostMapping("/create-journey")
     public ResponseEntity<JourneyEntity> createJourney(@RequestBody String username){
-        System.out.println(username);
-        System.out.println(username.substring(1, username.length()-1));
         String usernameFormed = username.substring(1, username.length()-1);
         JourneyEntity journey = journeyService.createJourney(usernameFormed);
         return ResponseEntity.ok().body(journey);
     }
-
     @GetMapping("/view-journey/{id}")
     public ResponseEntity<JourneyEntity> getJourneyById(@PathVariable(value = "id") long id) {
         JourneyEntity journey = journeyService.getJourneyById(id);
         return ResponseEntity.ok().body(journey);
     }
-
     @GetMapping("/view-journeys-user/{username}")
     public ResponseEntity<List<JourneyEntity>> getJourneysForUser(@PathVariable(value = "username") String username) {
         List<JourneyEntity> journeys = journeyService.getAllForUser(username);
         return ResponseEntity.ok().body(journeys);
     }
-
     @DeleteMapping("/delete-journey/{id}")
     public ResponseEntity deleteJourneyById(@PathVariable(value = "id") long id) {
         journeyService.deleteJourneyById(id);
         return ResponseEntity.ok().build();
     }
-
     @DeleteMapping("/delete-journeys-user/{username}")
     public ResponseEntity deleteJourneysForUser(@PathVariable(value = "username") String username) {
         journeyService.deleteJourneysForAuthor(username);

diff --git a/JourneyService/src/main/java/com/skipass/journeyservice/messaging/RabbitMQConfig.java b/JourneyService/src/main/java/com/skipass/journeyservice/messaging/RabbitMQConfig.java
@@ -9,7 +9,6 @@
 
 @Configuration
 public class RabbitMQConfig {
-
     static final String fanoutExchangeName = "delete-post";
     static final String postsQueueName = "delete-post-for-journey";
     @Bean
@@ -24,5 +23,4 @@ public Queue postQueue() {
     public Binding postsBinding() {
         return BindingBuilder.bind(postQueue()).to(deletePostExchange());
     }
-
 }
diff --git a/JourneyService/src/main/java/com/skipass/journeyservice/messaging/RabbitMQProducer.java b/JourneyService/src/main/java/com/skipass/journeyservice/messaging/RabbitMQProducer.java
@@ -7,19 +7,13 @@
 
 @Component
 public class RabbitMQProducer {
-
     @Autowired
-
     private RabbitTemplate rabbitTemplate;
-
     @Autowired
     private FanoutExchange deletePostExchange;
-
-    // Routing key is not set, as the exchange is fanout
     public void sendDeletePostMessage(long journeyId) {
-        System.out.println("In rabbitmq ");
+        System.out.println("In send delete post message");
         System.out.println(journeyId);
-
         rabbitTemplate.convertAndSend(
                 deletePostExchange.getName(), "", journeyId);
     }

diff --git a/JourneyService/src/main/java/com/skipass/journeyservice/messaging/RabbitMQReceiver.java b/JourneyService/src/main/java/com/skipass/journeyservice/messaging/RabbitMQReceiver.java
@@ -8,7 +8,6 @@
 @Component
 @AllArgsConstructor
 public class RabbitMQReceiver {
-
     private final JourneyService journeyService;
     @RabbitListener(queues = "delete-journey-for-post")
     public void receiveMessage(int journeyId) {

diff --git a/JourneyService/src/main/java/com/skipass/journeyservice/persistance/JourneyEntity.java b/JourneyService/src/main/java/com/skipass/journeyservice/persistance/JourneyEntity.java
@@ -17,7 +17,6 @@
 @AllArgsConstructor
 @NoArgsConstructor
 public class JourneyEntity {
-
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private long id;

diff --git a/JourneyService/src/main/java/com/skipass/journeyservice/persistance/JourneyRepository.java b/JourneyService/src/main/java/com/skipass/journeyservice/persistance/JourneyRepository.java
@@ -8,12 +8,10 @@
 @Repository
 
 public interface JourneyRepository extends JpaRepository<JourneyEntity, Long> {
-
     List<JourneyEntity> getJourneyEntitiesByAuthorUsernameIs(String authorUsername);
     @Transactional
     void deleteAllByIdIs(long journeyId);
     @Transactional
     void deleteAllByAuthorUsernameIs(String authorUsername);
 
-}
-
+}
diff --git a/...src/test/java/com/skipass/journeyservice/integration/DeletePostAndJourneyIntegration.java b/...src/test/java/com/skipass/journeyservice/integration/DeletePostAndJourneyIntegration.java
@@ -30,7 +30,6 @@
 import java.util.Optional;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-
 @Testcontainers()
 @SpringBootTest(
         webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
@@ -42,7 +41,6 @@ public class DeletePostAndJourneyIntegration {
     @Autowired
     private JourneyService journeyService;
     public static Network network =  Network.newNetwork();
-
     static RabbitMQContainer rabbit = new RabbitMQContainer(DockerImageName
             .parse("ghcr.io/aleksandrakrasteva/rabbitmq:dev")
             .asCompatibleSubstituteFor("rabbitmq"))
@@ -54,7 +52,6 @@ public class DeletePostAndJourneyIntegration {
     static GenericContainer postService =  new GenericContainer((DockerImageName
             .parse("ghcr.io/aleksandrakrasteva/post-service:dev")))
             .withImagePullPolicy(PullPolicy.alwaysPull());
-
     @DynamicPropertySource
     static void registerProperties(DynamicPropertyRegistry registry) {
         registry.add("spring.rabbitmq.host", rabbit::getHost);
@@ -65,7 +62,6 @@ static void registerProperties(DynamicPropertyRegistry registry) {
         registry.add("spring.datasource.username", journeyPostgres::getUsername);
         registry.add("spring.datasource.password", journeyPostgres::getPassword);
     }
-
     @BeforeAll
     public static void setPostService(){
         postsPostgres.withNetwork(network).withNetworkAliases("postdb").start();
@@ -87,7 +83,6 @@ public static void setPostService(){
         final String logs = postService.getLogs();
         System.out.println(logs);
     }
-
     @BeforeEach
     void insertTestData() {
         JourneyEntity journey = journeyService.createJourney("testUser");
@@ -103,21 +98,15 @@ void insertTestData() {
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_JSON);
 
-        // Create the HttpEntity
         HttpEntity<String> requestEntity = new HttpEntity<>(jsonBody, headers);
 
-        // Send the POST request
         ResponseEntity<String> response = restTemplate.exchange(
                 createPostEndpoint,
                 HttpMethod.POST,
                 requestEntity,
                 String.class
         );
-
-        System.out.println("HERE IS THE RETURN" + response);
-
     }
-
     @Test
     @Tag("integration")
     void deletePostsForUserRabbitMQListenerTest()  {
@@ -136,19 +125,14 @@ void deletePostsForUserRabbitMQListenerTest()  {
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_JSON);
 
-        // Create the HttpEntity
         HttpEntity<String> requestEntity = new HttpEntity<>(jsonBody, headers);
 
-        // Send the POST request
         ResponseEntity<String> response = restTemplate.exchange(
                 deletePostEndpoint,
                 HttpMethod.DELETE,
                 requestEntity,
                 String.class);
 
-        final String logs = postService.getLogs();
-        System.out.println(logs);
-
         Optional<JourneyEntity> after = repository.findById(1L);
 
         assertEquals(true, before.isPresent() );

diff --git a/PostManagement/src/main/java/com/skipass/postmanagement/business/PostService.java b/PostManagement/src/main/java/com/skipass/postmanagement/business/PostService.java
@@ -9,14 +9,10 @@
 @Service
 public interface PostService {
     List<Post> getPostsForUser(String userEmail);
-
     List<Post> getAllPosts();
     void deletePostById(DeletePostRequest request);
     CreatePostResponse createPost(CreatePostRequest request);
-
     void deletePostsForUser(DeletePostsRequest userEmail);
-
     Long updatePostById(UpdatePostRequest request);
-
     void deletePostForJourney(long journeyId);
 }
diff --git a/PostManagement/src/main/java/com/skipass/postmanagement/business/ReactionService.java b/PostManagement/src/main/java/com/skipass/postmanagement/business/ReactionService.java
@@ -11,9 +11,7 @@
 public interface ReactionService {
     void deleteReaction(long reactionId);
     long createReaction(CreateReactionRequest request);
-
     void deleteAllReactionsForPost(long postId);
     void deleteAllReactionsFromUser(String username);
-
     List<ReactionEntity> getReactionsForUser(String username);
 }
diff --git a/PostManagement/src/main/java/com/skipass/postmanagement/business/impl/PostServiceImpl.java b/PostManagement/src/main/java/com/skipass/postmanagement/business/impl/PostServiceImpl.java
@@ -17,7 +17,6 @@
 @Service
 @AllArgsConstructor
 public class PostServiceImpl implements PostService {
-
     private final PostRepository postRepository;
     private final ReactionRepository reactionRepository;
     private final RabbitMQProducer producer;
@@ -27,7 +26,6 @@ public List<Post> getPostsForUser(String username) {
                 stream().map(this::convertToPost).collect(Collectors.toList());
         return posts;
     }
-
     private Post convertToPost(PostEntity post) {
         List<ReactionEntity> reactionEntities = reactionRepository.getReactionEntitiesByPostIdIs(post.getId());
         List<Reaction> reactions = reactionEntities.stream().map(this::convertReactions).collect(Collectors.toList());
@@ -36,7 +34,6 @@ private Post convertToPost(PostEntity post) {
                 .text(post.getText()).username(post.getUsername()).reactions(reactions).build();
         return postDto;
     }
-
     private Reaction convertReactions(ReactionEntity reaction){
         return Reaction.builder().postId(reaction.getPostId())
                 .id(reaction.getId())
@@ -47,7 +44,6 @@ public List<Post> getAllPosts() {
         List<Post> posts = postRepository.findAll().
                 stream().map(this::convertToPost).collect(Collectors.toList());
         return posts;
-
     }
     @Override
     public void deletePostById(DeletePostRequest postRequest) {
@@ -80,7 +76,6 @@ public void deletePostsForUser(DeletePostsRequest request) {
         postRepository.deletePostEntitiesByUsernameIs(request.getUsername());
         reactionRepository.deleteAllByCreatorIs(request.getUsername());
     }
-
     @Override
     public Long updatePostById(UpdatePostRequest request) {
         Optional<PostEntity> post = postRepository.findById(request.getPostId());
@@ -91,7 +86,6 @@ public Long updatePostById(UpdatePostRequest request) {
         }
         return null;
     }
-
     @Override
     public void deletePostForJourney(long journeyId) {
         Optional<PostEntity> post = postRepository.getPostEntityByJourneyIdIs(journeyId);
@@ -100,6 +94,5 @@ public void deletePostForJourney(long journeyId) {
             DeletePostRequest request = DeletePostRequest.builder().deleteJourney(false).postId(post.get().getId()).build();
             deletePostById(request);
         }
-
     }
 }
diff --git a/...anagement/src/main/java/com/skipass/postmanagement/business/impl/ReactionServiceImpl.java b/...anagement/src/main/java/com/skipass/postmanagement/business/impl/ReactionServiceImpl.java
@@ -17,10 +17,8 @@
 public class ReactionServiceImpl implements ReactionService {
     private final ReactionRepository reactionRepository;
     private final PostRepository postRepository;
-
     @Override
     public void deleteReaction(long reactionId) {
-        System.out.println(reactionId);
         reactionRepository.deleteById(reactionId);
     }
     @Override
@@ -29,19 +27,14 @@ public long createReaction(CreateReactionRequest request) {
         ReactionEntity returned = reactionRepository.save(reaction);
         return returned.getId();
     }
-
     @Override
     public void deleteAllReactionsForPost(long postId) {
         reactionRepository.deleteAllByPostIdIs(postId);
-
     }
-
     @Override
     public void deleteAllReactionsFromUser(String username) {
         reactionRepository.deleteAllByCreatorIs(username);
-
     }
-
     @Override
     public List<ReactionEntity> getReactionsForUser(String username) {
         return reactionRepository.getReactionEntitiesByCreatorIs(username);

diff --git a/PostManagement/src/main/java/com/skipass/postmanagement/controllers/PostController.java b/PostManagement/src/main/java/com/skipass/postmanagement/controllers/PostController.java
@@ -15,7 +15,6 @@
 public class PostController {
 
     private final PostService postService;
-
     @PostMapping("/create-post")
     public ResponseEntity createPost(@RequestBody CreatePostRequest request) {
         CreatePostResponse response = postService.createPost(request);
@@ -36,7 +35,6 @@ public ResponseEntity deletePost(@RequestBody DeletePostRequest postRequest) {
         postService.deletePostById(postRequest);
         return ResponseEntity.ok().build();
     }
-
     @DeleteMapping("/delete-all-posts")
     public ResponseEntity deleteAllPostsForUser(@RequestBody DeletePostsRequest postsRequest) {
         postService.deletePostsForUser(postsRequest);

diff --git a/PostManagement/src/main/java/com/skipass/postmanagement/controllers/ReactionController.java b/PostManagement/src/main/java/com/skipass/postmanagement/controllers/ReactionController.java
@@ -32,7 +32,6 @@ public ResponseEntity deleteReaction(@PathVariable(value = "id") long reactionId
         reactionService.deleteReaction(reactionId);
         return ResponseEntity.ok().build();
     }
-
     @DeleteMapping("/delete-reactions/{username}")
     public ResponseEntity deleteReactions(@PathVariable(value = "username") String username) {
         reactionService.deleteAllReactionsFromUser(username);

diff --git a/PostManagement/src/main/java/com/skipass/postmanagement/domain/CreatePostRequest.java b/PostManagement/src/main/java/com/skipass/postmanagement/domain/CreatePostRequest.java
@@ -9,4 +9,4 @@ public class CreatePostRequest {
     private String text;
     private String username;
     private long journeyId;
-}
+}
diff --git a/PostManagement/src/main/java/com/skipass/postmanagement/domain/CreatePostResponse.java b/PostManagement/src/main/java/com/skipass/postmanagement/domain/CreatePostResponse.java
@@ -7,4 +7,4 @@
 @Builder
 public class CreatePostResponse {
     private long id;
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,4 +7,4 @@ @@
     @Builder
     public class CreatePostResponse {
         private long id;
-    }
+    }