Redis

Dockerfile

@@ -0,0 +1,11 @@
+FROM maven:3.9.9-eclipse-temurin-24 AS builder
+WORKDIR /build
+COPY pom.xml .
+COPY src ./src
+RUN mvn clean package
+
+FROM openjdk:24-jdk
+WORKDIR /app
+ARG JAR_FILE=target/springboot25-0.0.1-SNAPSHOT.jar
+COPY --from=builder /build/${JAR_FILE} app.jar
+ENTRYPOINT ["java","-jar","/app/app.jar"]

compose.yaml

@@ -1,4 +1,8 @@
 services:
+  redis:
+    image: 'redis:7-alpine'
+    ports:
+      - "6379:6379"
   postgres:
     image: 'postgres:latest'
     container_name: 'postgres-db'
@@ -9,13 +13,19 @@ services:
     ports:
       - '5432:5432'
   app:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    image: 'catinder:latest'
     depends_on:
+      - redis
       - postgres
-    image: 'catinder:latest'
     env_file:
       - .env
     environment:
       - GOOGLE_CLIENT_ID=${GOOGLE_CLIENT_ID}
       - GOOGLE_CLIENT_SECRET=${GOOGLE_CLIENT_SECRET}
+      - SPRING_REDIS_HOST=redis
+      - SPRING_REDIS_PORT=6379
     ports:
       - "8080:8080"

pom.xml

@@ -51,12 +51,12 @@
             <artifactId>flyway-database-postgresql</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-devtools</artifactId>
-            <scope>runtime</scope>
-            <optional>true</optional>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-devtools</artifactId>-->
+<!--            <scope>runtime</scope>-->
+<!--            <optional>true</optional>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-docker-compose</artifactId>
@@ -148,6 +148,19 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+            <version>3.1.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-cache</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

src/main/java/org/example/springboot25/Springboot25Application.java

@@ -2,10 +2,12 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 
 @SpringBootApplication
 @EnableWebSecurity
+@EnableCaching
 public class Springboot25Application {
 
     public static void main(String[] args) {

src/main/java/org/example/springboot25/config/RedisCacheConfig.java

@@ -0,0 +1,24 @@
+package org.example.springboot25.config;
+
+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.lettuce.LettuceConnectionFactory;
+
+import java.time.Duration;
+
+@Configuration
+public class RedisCacheConfig {
+
+    @Bean
+    public RedisCacheManager cacheManager(LettuceConnectionFactory cf) {
+        RedisCacheConfiguration config = RedisCacheConfiguration.defaultCacheConfig()
+                .entryTtl(Duration.ofMinutes(10))
+                .disableCachingNullValues();
+
+        return RedisCacheManager.builder(cf)
+                .cacheDefaults(config)
+                .build();
+    }
+}

src/main/java/org/example/springboot25/controller/CatPhotoViewController.java

@@ -6,10 +6,11 @@
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 
+import java.io.Serializable;
 import java.util.List;
 
 @Controller  // 🔹 Detta gör att Spring vet att den ska hantera HTML-sidor
-public class CatPhotoViewController {
+public class CatPhotoViewController implements Serializable {
 
     private final CatPhotoService catPhotoService;
 
@@ -25,4 +26,3 @@ public String showCatPhotos(Model model) {
         return "catphoto/catphotos";  // 🔹 Returnerar en HTML-sida som heter "catphotos.html"
     }
 }
-

src/main/java/org/example/springboot25/controller/CatViewController.java

@@ -39,14 +39,12 @@ public CatViewController(CatService catService, UserService userService) {
         this.catService = catService;
         this.userService = userService;
     }
-
     @GetMapping
     public String showAllCats(Model model) {
         List<CatOutputDTO> cats = catService.getAllCats();
         model.addAttribute("cats", cats);
         return "cat/cats-list";
     }
-
     @GetMapping("/{catId}")
     public String showCatDetail(@PathVariable Long catId, Model model, Principal principal) {
         CatOutputDTO cat = catService.getCatDtoById(catId);

src/main/java/org/example/springboot25/dto/CatOutputDTO.java

@@ -1,6 +1,14 @@
 package org.example.springboot25.dto;
 
-public class CatOutputDTO {
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.OneToMany;
+import org.example.springboot25.entities.CatPhoto;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+public class CatOutputDTO implements Serializable {
     private Long catId;
     private String catName;
     private String catProfilePicture;
@@ -10,6 +18,17 @@ public class CatOutputDTO {
     private String catPersonality;
     private Long userId;
 
+    @OneToMany(mappedBy = "catPhotoCat", cascade = CascadeType.ALL, orphanRemoval = true)
+    private List<CatPhoto> catPhotos = new ArrayList<>();
+
+    public List<CatPhoto> getCatPhotos() {
+        return catPhotos;
+    }
+
+    public void setCatPhotos(List<CatPhoto> catPhotos) {
+        this.catPhotos = catPhotos;
+    }
+
     public Long getCatId() {
         return catId;
     }

src/main/java/org/example/springboot25/entities/Cat.java

@@ -5,12 +5,14 @@
 import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import org.springframework.data.redis.core.RedisHash;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
 @Entity
-public class Cat {
+public class Cat implements Serializable {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

src/main/java/org/example/springboot25/entities/User.java

@@ -8,12 +8,13 @@
 import jakarta.validation.constraints.NotNull;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
 @Entity
 @Table(name = "app_user")
-public class User {
+public class User implements Serializable {
 
     private static final BCryptPasswordEncoder ENCODER = new BCryptPasswordEncoder();
 

src/main/java/org/example/springboot25/service/CatPhotoService.java

@@ -2,6 +2,7 @@
 
 import org.example.springboot25.entities.CatPhoto;
 import org.example.springboot25.repository.CatPhotoRepository;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -50,4 +51,4 @@ public boolean deleteCatPhoto(Long id) {
         }
         return false;
     }
-}
+}

src/main/java/org/example/springboot25/service/CatService.java

@@ -15,6 +15,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.CachePut;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.WebDataBinder;
@@ -93,6 +96,7 @@ public Cat updateCat(Long catId, Cat catDetails) {
         }).orElseThrow(() -> new NotFoundException("Cat not found with id " + catId));
     }
 
+    @CacheEvict(cacheNames = "deleteCatById", key = "#catId")
     public void deleteCatById(Long catId) {
         if (!catRepository.existsById(catId)) {
             throw new NotFoundException("Cat not found with id " + catId);
@@ -101,6 +105,7 @@ public void deleteCatById(Long catId) {
         catRepository.deleteById(catId);
     }
 
+    @CacheEvict(cacheNames = "deleteCat", key = "#catId")
     public void deleteCat(Long catId) {
         deleteCatById(catId);
     }
@@ -109,18 +114,22 @@ public void deleteCat(Long catId) {
     // Externa metoder (DTO)
     // ========================
 
+    @Cacheable(cacheNames = "allCats")
     public List<CatOutputDTO> getAllCats() {
         return catRepository.findAll().stream().map(catMapper::toDto).toList();
     }
 
+    @Cacheable(cacheNames = "allCatsByUser", key = "#user")
     public List<CatOutputDTO> getAllCatsByUser(User user) {
         return catRepository.findAllByUserCatOwner(user).stream().map(catMapper::toDto).toList();
     }
 
+    @Cacheable(cacheNames = "allCatsByName", key = "#name")
     public List<CatOutputDTO> getCatsByName(String name) {
         return catRepository.findByCatNameContainingIgnoreCase(name).stream().map(catMapper::toDto).toList();
     }
 
+    @Cacheable(cacheNames = "catById", key = "#id")
     public CatOutputDTO getCatDtoById(Long id) {
         return catMapper.toDto(findCatById(id));
     }
@@ -136,13 +145,15 @@ public Cat addCat(Cat cat) {
         return saveCat(cat);
     }
 
+    @CachePut(cacheNames = "putCat", key = "#catId")
     public CatOutputDTO updateCat(Long catId, CatUpdateDTO dto) {
         Cat cat = findCatById(catId);
         log.info("Updating cat: {}", cat.getCatName());
         catMapper.updateCatFromDto(dto, cat);
         return catMapper.toDto(saveCat(cat));
     }
 
+    @CachePut(cacheNames = "patchCat", key = "#catId")
     public CatOutputDTO partialUpdateCat(Long catId, Map<String, Object> updates) {
         Cat cat = findCatById(catId);
 

src/main/resources/application-dev.properties

@@ -9,3 +9,17 @@ spring.config.import=optional:file:.env[.properties]
 server.servlet.session.persistent=false
 catapi.key=${CATAPI_KEY}
 
+# Enable caching
+spring.cache.type=redis
+
+# Toggle Redis
+spring.redis.enabled=true
+spring.data.redis.repositories.enabled=false
+
+# Redis connection details
+spring.data.redis.host=${SPRING_REDIS_HOST:localhost}
+spring.data.redis.port=${SPRING_REDIS_PORT:6379}
+
+spring.datasource.url=jdbc:postgresql://postgres:5432/mydatabase
+spring.datasource.username=myuser
+spring.datasource.password=secret