change applications files

Author: Develop2Den

pom.xml

@@ -69,6 +69,7 @@
 			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
 			<version>42.7.4</version>
+			<scope>runtime</scope>
 		</dependency>
 
 		<!--Redis-->
@@ -86,9 +87,12 @@
 		<dependency>
 			<groupId>org.flywaydb</groupId>
 			<artifactId>flyway-core</artifactId>
-			<version>9.22.1</version>
+			<version>11.2.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.flywaydb</groupId>
+			<artifactId>flyway-database-postgresql</artifactId>
 		</dependency>
-
 
 		<!--Others-->
 		<dependency>

src/main/java/com/chat/yourway/config/redis/RedisConfig.java

@@ -1,17 +1,20 @@
 package com.chat.yourway.config.redis;
 
+import com.chat.yourway.model.redis.ContactOnline;
 import com.chat.yourway.model.redis.Token;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
 import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.repository.configuration.EnableRedisRepositories;
 import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 
 @Configuration
 @RequiredArgsConstructor
+@EnableRedisRepositories
 public class RedisConfig {
 
   private final RedisProperties properties;
@@ -35,4 +38,13 @@ public RedisTemplate<String, Token> redisTemplate() {
     return template;
   }
 
+  @Bean
+  public RedisTemplate<String, ContactOnline> contactOnlineRedisTemplate() {
+    RedisTemplate<String, ContactOnline> template = new RedisTemplate<>();
+    template.setConnectionFactory(jedisConnectionFactory());
+    template.setKeySerializer(new StringRedisSerializer());
+    template.setValueSerializer(new GenericJackson2JsonRedisSerializer());
+    return template;
+  }
+
 }

src/main/java/com/chat/yourway/config/redis/RedisProperties.java

@@ -13,7 +13,7 @@
 public class RedisProperties {
 
   private String host;
-  private int port;
+  private Integer port;
   private String password;
 
   @Value("${spring.profiles.active}")

src/main/java/com/chat/yourway/controller/rest/MessageController.java

@@ -80,7 +80,7 @@ public MessageResponseDto sendToPrivateContact(@PathVariable String sendToEmail,
                     @ApiResponse(responseCode = "404", description = TOPIC_NOT_FOUND,
                             content = @Content(schema = @Schema(implementation = ApiErrorResponseDto.class)))
             })
-    @GetMapping(path = TOPIC_ID, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
+    @GetMapping(path = TOPIC_ID, produces = APPLICATION_JSON_VALUE)
     public Page<MessageResponseDto> getMessagesByTopic(
             @Parameter(description = "Number of page (1..N)",
                         required = true,
@@ -103,7 +103,7 @@ public Page<MessageResponseDto> getMessagesByTopic(
                     @ApiResponse(responseCode = "404", description = MESSAGE_NOT_FOUND,
                             content = @Content(schema = @Schema(implementation = ApiErrorResponseDto.class)))
             })
-    @PostMapping(value = ID_REPORT, consumes = APPLICATION_JSON_VALUE)
+    @PostMapping(value = ID_REPORT, produces = APPLICATION_JSON_VALUE)
     public void reportMessage(@PathVariable UUID id) {
         messageService.reportMessageById(id);
     }
@@ -115,7 +115,7 @@ public void reportMessage(@PathVariable UUID id) {
                     @ApiResponse(responseCode = "404", description = MESSAGE_NOT_FOUND,
                             content = @Content(schema = @Schema(implementation = ApiErrorResponseDto.class)))
             })
-    @PostMapping(value = ID_READ, consumes = APPLICATION_JSON_VALUE)
+    @PostMapping(value = ID_READ)
     public void readMessage(@PathVariable UUID id) {
         messageService.readMessage(id);
     }

src/main/java/com/chat/yourway/model/Contact.java

@@ -53,6 +53,15 @@ public class Contact implements UserDetails {
     @OneToMany(mappedBy = "sender", fetch = FetchType.LAZY)
     private List<Message> messages;
 
+    @ManyToMany
+    @JoinTable(
+            schema = "chat",
+            name = "contact_messages_report",
+            joinColumns = @JoinColumn(name = "contact_id"),
+            inverseJoinColumns = @JoinColumn(name = "message_id")
+    )
+    private Set<Message> reportedMessages = new HashSet<>();
+
     @ManyToMany
     @JoinTable(
             schema = "chat",

src/main/java/com/chat/yourway/model/Message.java

@@ -32,6 +32,9 @@ public class Message {
     @JoinColumn(name = "send_by", referencedColumnName = "id", nullable = false)
     private Contact sender;
 
+    @ManyToMany(mappedBy = "reportedMessages")
+    private Set<Contact> reporters = new HashSet<>();
+
     @Column(name = "message_text", nullable = false)
     private String content;
 

src/main/java/com/chat/yourway/model/redis/ContactOnline.java

@@ -4,7 +4,6 @@
 import org.springframework.data.annotation.Id;
 import org.springframework.data.redis.core.RedisHash;
 import org.springframework.data.redis.core.index.Indexed;
-
 import java.time.LocalDateTime;
 import java.util.UUID;
 
@@ -16,13 +15,11 @@
 @ToString
 @RedisHash("ContactOnline")
 public class ContactOnline {
-
     @Id
     @Indexed
     private String id;
     private LocalDateTime timestamp;
     @Indexed
     private UUID topicId;
     private boolean typingStatus;
-
 }

src/main/java/com/chat/yourway/repository/redis/ContactOnlineRedisRepository.java

@@ -3,7 +3,6 @@
 import com.chat.yourway.model.redis.ContactOnline;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
-
 import java.util.List;
 import java.util.UUID;
 

src/main/java/com/chat/yourway/repository/redis/TokenRedisRepository.java

@@ -3,7 +3,6 @@
 import com.chat.yourway.model.redis.Token;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
-
 import java.util.List;
 import java.util.Optional;
 

src/main/resources/application.properties

@@ -23,14 +23,13 @@ spring.data.redis.port=${REDIS_PORT:6379}
 spring.data.redis.password=${REDIS_PASSWORD:admin}
 
 #Hibernate
-spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 spring.jpa.show-sql=true
 spring.jpa.properties.hibernate.format_sql=true
-spring.jpa.hibernate.ddl-auto=update
+spring.jpa.hibernate.ddl-auto=validate
 
 #Flyway:
 spring.flyway.enabled=true
-spring.flyway.locations=src/main/resources/db/migration
+spring.flyway.locations=classpath:db/migration
 spring.flyway.baseline-on-migrate=true
 
 #WebSocket config: