Add Redis caching and improve contact data management

compose.yaml

@@ -10,5 +10,14 @@ services:
     volumes:
       - postgres_data:/var/lib/postgresql/data  # Persists database data
 
+  redis:
+    image: redis:7-alpine
+    ports:
+      - '6379:6379'
+    volumes:
+      - redis_data:/data
+    command: redis-server --appendonly yes
+
 volumes:
-  postgres_data:
+  postgres_data:
+  redis_data:

pom.xml

@@ -155,20 +155,31 @@
       <artifactId>cloudinary-http5</artifactId>
       <version>2.3.0</version>
     </dependency>
+
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-data-redis</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-hibernate6</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>org.flywaydb</groupId>
       <artifactId>flyway-core</artifactId>
       <version>10.10.0</version>
     </dependency>
+
     <dependency>
       <groupId>org.flywaydb</groupId>
       <artifactId>flyway-database-postgresql</artifactId>
       <version>10.10.0</version>
     </dependency>
-
+    
   </dependencies>
-
+  
   <build>
     <plugins>
       <plugin>

src/main/java/ua/com/javarush/gnew/contactm/ContactManagerSpringBootApplication.java

@@ -2,8 +2,10 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cache.annotation.EnableCaching;
 
 @SpringBootApplication
+@EnableCaching
 public class ContactManagerSpringBootApplication {
 
   public static void main(String[] args) {

src/main/java/ua/com/javarush/gnew/contactm/DTOs/ContactCacheDto.java

@@ -0,0 +1,25 @@
+package ua.com.javarush.gnew.contactm.DTOs;
+
+import java.util.Date;
+import java.util.List;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class ContactCacheDto {
+  private long id;
+  private String name;
+  private String lastName;
+  private String imageUrl;
+  private Date createDate;
+  private Date modifyDate;
+  private List<String> emailAddresses;
+  private List<String> phoneNumbers;
+  private List<String> socialNetworks;
+  private String contactBookName;
+}

src/main/java/ua/com/javarush/gnew/contactm/component/RedisHealthCheck.java

@@ -0,0 +1,26 @@
+package ua.com.javarush.gnew.contactm.component;
+
+import jakarta.annotation.PostConstruct;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class RedisHealthCheck {
+
+  private final RedisTemplate<String, Object> redisTemplate;
+
+  @PostConstruct
+  public void checkRedisConnection() {
+    try {
+      String pong = redisTemplate.getConnectionFactory().getConnection().ping();
+      log.info("Redis connection successful. Response: {}", pong);
+    } catch (Exception e) {
+      log.warn("Redis connection failed: {}", e.getMessage());
+      log.warn("Application will continue without Redis caching");
+    }
+  }
+}

src/main/java/ua/com/javarush/gnew/contactm/config/RedisConfig.java

@@ -0,0 +1,74 @@
+package ua.com.javarush.gnew.contactm.config;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.hibernate6.Hibernate6Module;
+import java.time.Duration;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.cache.RedisCacheConfiguration;
+import org.springframework.data.redis.cache.RedisCacheManager;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.RedisSerializationContext;
+import org.springframework.data.redis.serializer.RedisSerializer;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+@Slf4j
+@Configuration
+@RequiredArgsConstructor
+public class RedisConfig {
+
+  /** Shared ObjectMapper with Hibernate support. */
+  @Bean
+  public ObjectMapper redisObjectMapper() {
+    Hibernate6Module hibernateModule = new Hibernate6Module();
+    hibernateModule.configure(Hibernate6Module.Feature.FORCE_LAZY_LOADING, false);
+    hibernateModule.configure(
+        Hibernate6Module.Feature.SERIALIZE_IDENTIFIER_FOR_LAZY_NOT_LOADED_OBJECTS, true);
+
+    return new ObjectMapper().registerModule(hibernateModule);
+  }
+
+  /** Generic JSON serializer using the shared ObjectMapper. */
+  @Bean
+  public RedisSerializer<Object> genericJsonSerializer(ObjectMapper redisObjectMapper) {
+    return new GenericJackson2JsonRedisSerializer(redisObjectMapper);
+  }
+
+  /** A RedisTemplate that uses String keys and JSON‐serialized values. */
+  @Bean
+  public RedisTemplate<String, Object> redisTemplate(
+      RedisConnectionFactory connectionFactory, RedisSerializer<Object> genericJsonSerializer) {
+    RedisTemplate<String, Object> template = new RedisTemplate<>();
+    template.setConnectionFactory(connectionFactory);
+
+    // key serializers
+    StringRedisSerializer stringSerializer = new StringRedisSerializer();
+    template.setKeySerializer(stringSerializer);
+    template.setHashKeySerializer(stringSerializer);
+
+    // value serializers
+    template.setValueSerializer(genericJsonSerializer);
+    template.setHashValueSerializer(genericJsonSerializer);
+
+    template.afterPropertiesSet();
+    log.info("RedisTemplate<String,Object> initialized");
+    return template;
+  }
+
+  /** RedisCacheManager that applies a 60‐minute TTL and JSON serialization. */
+  @Bean
+  public RedisCacheManager cacheManager(
+      RedisConnectionFactory connectionFactory, RedisSerializer<Object> genericJsonSerializer) {
+    RedisCacheConfiguration cacheConfig =
+        RedisCacheConfiguration.defaultCacheConfig()
+            .entryTtl(Duration.ofMinutes(60))
+            .serializeValuesWith(
+                RedisSerializationContext.SerializationPair.fromSerializer(genericJsonSerializer));
+
+    return RedisCacheManager.builder(connectionFactory).cacheDefaults(cacheConfig).build();
+  }
+}

src/main/java/ua/com/javarush/gnew/contactm/controller/rest/ContactControllerApi.java

@@ -10,14 +10,14 @@
 import ua.com.javarush.gnew.contactm.DTOs.ContactDTO;
 import ua.com.javarush.gnew.contactm.entity.Contact;
 import ua.com.javarush.gnew.contactm.mapper.ContactMapper;
-import ua.com.javarush.gnew.contactm.repository.ContactRepository;
+import ua.com.javarush.gnew.contactm.services.ContactService;
 
 @Slf4j
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/api/v1/contact")
 public class ContactControllerApi {
-  private final ContactRepository contactRepository;
+  private final ContactService contactService;
   private final ContactMapper contactMapper;
 
   @PreAuthorize("hasRole('USER')")
@@ -35,7 +35,7 @@ public String adminEndpoint() {
   @GetMapping
   public ResponseEntity<ContactDTO> getContact(@RequestParam("id") Long id) {
     log.debug("getContact: id={}", id);
-    return contactRepository
+    return contactService
         .findById(id)
         .map(contact -> new ResponseEntity<>(contactMapper.toDto(contact), HttpStatus.OK))
         .orElseGet(() -> new ResponseEntity<>(HttpStatus.NOT_FOUND));
@@ -44,29 +44,29 @@ public ResponseEntity<ContactDTO> getContact(@RequestParam("id") Long id) {
   @PostMapping
   public ResponseEntity<ContactDTO> save(@RequestBody ContactDTO contactDTO) {
     Contact contact = contactMapper.toEntity(contactDTO);
-    Contact saved = contactRepository.save(contact);
+    Contact saved = contactService.save(contact);
     return new ResponseEntity<>(contactMapper.toDto(saved), HttpStatus.CREATED);
   }
 
   @PutMapping
   public ResponseEntity<ContactDTO> update(
       @RequestParam("id") Long id, @RequestBody ContactDTO contactDTO) {
-    Optional<Contact> existingOpt = contactRepository.findById(id);
+    Optional<Contact> existingOpt = contactService.findById(id);
     if (existingOpt.isEmpty()) {
       return new ResponseEntity<>(HttpStatus.NOT_FOUND);
     }
 
     Contact contactToUpdate = contactMapper.toEntity(contactDTO);
     contactToUpdate.setId(id);
 
-    Contact saved = contactRepository.save(contactToUpdate);
+    Contact saved = contactService.save(contactToUpdate);
     return new ResponseEntity<>(contactMapper.toDto(saved), HttpStatus.OK);
   }
 
   @DeleteMapping
   public ResponseEntity<Void> delete(@RequestParam("id") Long id) {
-    if (contactRepository.existsById(id)) {
-      contactRepository.deleteById(id);
+    if (contactService.existsById(id)) {
+      contactService.deleteById(id);
       return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     } else {
       return new ResponseEntity<>(HttpStatus.NOT_FOUND);

src/main/java/ua/com/javarush/gnew/contactm/controller/web/ContactController.java

@@ -1,6 +1,7 @@
 package ua.com.javarush.gnew.contactm.controller.web;
 
 import java.io.IOException;
+import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -11,6 +12,7 @@
 import ua.com.javarush.gnew.contactm.DTOs.EmailDTO;
 import ua.com.javarush.gnew.contactm.DTOs.PhoneDTO;
 import ua.com.javarush.gnew.contactm.DTOs.SocialNetworkDTO;
+import ua.com.javarush.gnew.contactm.entity.Contact;
 import ua.com.javarush.gnew.contactm.mapper.ContactMapper;
 import ua.com.javarush.gnew.contactm.services.CloudinaryService;
 import ua.com.javarush.gnew.contactm.services.ContactService;
@@ -26,8 +28,13 @@ public class ContactController {
 
   @GetMapping("/edit/{id}")
   public String edit(@PathVariable Long id, Model model) {
+    Optional<Contact> byId = contactService.findById(id);
+
+    // TODO: 404 if not found
+    Contact contact = byId.get();
+
+    ContactDTO dto = contactMapper.toDto(contact);
 
-    ContactDTO dto = contactMapper.toDto(contactService.findById(id));
     if (dto.getEmails().isEmpty()) dto.getEmails().add(new EmailDTO());
     if (dto.getPhones().isEmpty()) dto.getPhones().add(new PhoneDTO());
     if (dto.getNetworks().isEmpty()) dto.getNetworks().add(new SocialNetworkDTO());

src/main/java/ua/com/javarush/gnew/contactm/controller/web/HomeController.java

@@ -1,24 +1,24 @@
 package ua.com.javarush.gnew.contactm.controller.web;
 
 import java.util.List;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import ua.com.javarush.gnew.contactm.entity.Contact;
-import ua.com.javarush.gnew.contactm.repository.ContactRepository;
+import ua.com.javarush.gnew.contactm.services.ContactService;
 
 @Controller
+@RequiredArgsConstructor
+@Slf4j
 public class HomeController {
 
-  private final ContactRepository contactRepository;
-
-  public HomeController(ContactRepository contactRepository) {
-    this.contactRepository = contactRepository;
-  }
+  private final ContactService contactService;
 
   @GetMapping
   public String home(Model model) {
-    List<Contact> all = contactRepository.findAll();
+    List<Contact> all = contactService.findAll();
     model.addAttribute("tableName", "All contacts");
     model.addAttribute("contacts", all);
     return "home";

src/main/java/ua/com/javarush/gnew/contactm/entity/Contact.java

@@ -1,5 +1,7 @@
 package ua.com.javarush.gnew.contactm.entity;
 
+import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonManagedReference;
 import com.google.gson.annotations.Expose;
 import jakarta.persistence.*;
 import java.util.ArrayList;
@@ -26,6 +28,7 @@ public class Contact {
 
   @ManyToOne
   @JoinColumn(name = "contact_book_id")
+  @JsonBackReference
   private ContactBook contactBook;
 
   @Column(name = "name")
@@ -35,18 +38,21 @@ public class Contact {
   // Consider switching to LAZY loading if appropriate.
   @OneToMany(mappedBy = "contact", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
   @Expose
+  @JsonManagedReference
   private List<Email> emails = new ArrayList<>();
 
   @Column(name = "last_name")
   @Expose
   private String lastName;
 
-  @OneToMany(mappedBy = "contact", fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+  @OneToMany(mappedBy = "contact", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
   @Expose
+  @JsonManagedReference
   private List<Phone> phones = new ArrayList<>();
 
   @OneToMany(mappedBy = "contact", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
   @Expose
+  @JsonManagedReference
   private List<SocialNetwork> networks = new ArrayList<>();
 
   @Expose private String imageUrl;

src/main/java/ua/com/javarush/gnew/contactm/entity/ContactBook.java

@@ -1,5 +1,6 @@
 package ua.com.javarush.gnew.contactm.entity;
 
+import com.fasterxml.jackson.annotation.JsonManagedReference;
 import com.google.gson.annotations.Expose;
 import jakarta.persistence.*;
 import java.util.Date;
@@ -33,6 +34,7 @@ public class ContactBook {
 
   @OneToMany(mappedBy = "contactBook", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
   @Expose
+  @JsonManagedReference
   private List<Contact> contacts;
 
   @CreationTimestamp

src/main/java/ua/com/javarush/gnew/contactm/entity/Email.java

@@ -1,5 +1,6 @@
 package ua.com.javarush.gnew.contactm.entity;
 
+import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.google.gson.annotations.Expose;
 import jakarta.persistence.*;
 import lombok.Getter;
@@ -26,6 +27,7 @@ public class Email {
 
   @ManyToOne(fetch = FetchType.EAGER, optional = true)
   @JoinColumn(name = "contact_id", nullable = true)
+  @JsonBackReference
   private Contact contact;
 
   @Override

src/main/java/ua/com/javarush/gnew/contactm/entity/Phone.java

@@ -1,5 +1,6 @@
 package ua.com.javarush.gnew.contactm.entity;
 
+import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.google.gson.annotations.Expose;
 import jakarta.persistence.*;
 import lombok.Getter;
@@ -27,6 +28,7 @@ public class Phone {
 
   @ManyToOne(fetch = FetchType.LAZY, optional = true)
   @JoinColumn(name = "contact_id", nullable = true)
+  @JsonBackReference
   private Contact contact;
 
   @Override