Create sessions for countries endpoints

docker-compose.yml

@@ -0,0 +1,15 @@
+version: '3.8'
+
+services:
+  redis:
+    image: redis:latest
+    container_name: redis_container
+    ports:
+      - "6379:6379" # Expose Redis on port 6379
+    volumes:
+      - redis_data:/data # Persist data
+    command: ["redis-server", "--appendonly", "yes"] # Enable AOF persistence
+
+volumes:
+  redis_data:
+    driver: local

pom.xml

@@ -56,6 +56,18 @@
             <artifactId>mysql-connector-java</artifactId>
             <version>8.0.33</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-docker-compose</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.session</groupId>
+            <artifactId>spring-session-data-redis</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>

src/main/java/org/airpenthouse/GoTel/GoTelApplication.java

@@ -4,12 +4,10 @@
 import org.airpenthouse.GoTel.util.PropertiesUtilManager;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
+import org.springframework.cache.annotation.EnableCaching;
 
-@Configuration
-@PropertySource("classpath:application.properties")
 @SpringBootApplication
+@EnableCaching
 public class GoTelApplication {
 
     public static void main(String[] args) {

src/main/java/org/airpenthouse/GoTel/controllers/CountriesController.java

@@ -1,5 +1,6 @@
 package org.airpenthouse.GoTel.controllers;
 
+import jakarta.servlet.http.HttpSession;
 import org.airpenthouse.GoTel.services.country.CountriesService;
 import org.airpenthouse.GoTel.util.PropertiesUtilManager;
 import org.airpenthouse.GoTel.util.dto.binder.CountriesRequestCombiner;
@@ -22,10 +23,11 @@ public class CountriesController {
     public CountriesService executor;
 
     @GetMapping("/getAllCountries")
-    public ResponseEntity<Set<? extends CountriesRequestCombiner>> getAllCountries() {
+    public ResponseEntity<Set<? extends CountriesRequestCombiner>> getAllCountries(HttpSession session) {
         CountriesService.SERVICE_HANDLER = "FIND_ALL_COUNTRIES";
         CountriesExecutors.setMapper(mapper);
         Set<? extends CountriesRequestCombiner> entities = executor.initializeCountriesService();
+        session.setAttribute("_getAllCountries",entities);
         if (entities.isEmpty()) {
             return ResponseEntity.notFound().build();
         } else {
@@ -34,13 +36,14 @@ public ResponseEntity<Set<? extends CountriesRequestCombiner>> getAllCountries()
     }
 
     @GetMapping("/{memberUsername}/getAllCountries")
-    public ResponseEntity<Set<? extends CountriesRequestCombiner>> membersGetAllCountries(@PathVariable String memberUsername, @RequestHeader(name = "x-auth-membership-token") String memberToken) {
+    public ResponseEntity<Set<? extends CountriesRequestCombiner>> membersGetAllCountries(HttpSession session,@PathVariable String memberUsername, @RequestHeader(name = "x-auth-membership-token") String memberToken) {
         CountriesService.SERVICE_HANDLER = "FIND_ALL_COUNTRIES";
         CountriesExecutors.setMapper(mapper);
         PropertiesUtilManager.setProperties("memberUsername", memberUsername);
         PropertiesUtilManager.setProperties("memberToken", memberToken);
         if (executor.checkMemberShipStatusAndTokenMatch()) {
             Set<? extends CountriesRequestCombiner> entities = executor.initializeCountriesService();
+            session.setAttribute("_getAllCountriesMembers",entities);
             if (entities.isEmpty()) {
                 return ResponseEntity.notFound().build();
             } else {
@@ -52,14 +55,15 @@ public ResponseEntity<Set<? extends CountriesRequestCombiner>> membersGetAllCoun
     }
 
     @GetMapping("/{memberUsername}/getCountryByName/{countryName}")
-    public ResponseEntity<Set<? extends CountriesRequestCombiner>> membersGetCountryByName(@PathVariable String countryName, @PathVariable String memberUsername, @RequestHeader(name = "x-auth-membership-token") String memberToken) {
+    public ResponseEntity<Set<? extends CountriesRequestCombiner>> membersGetCountryByName(HttpSession session,@PathVariable String countryName, @PathVariable String memberUsername, @RequestHeader(name = "x-auth-membership-token") String memberToken) {
         CountriesService.SERVICE_HANDLER = "FIND_COUNTRY_BY_NAME";
         CountriesExecutors.setMapper(mapper);
         PropertiesUtilManager.setProperties("memberUsername", memberUsername);
         PropertiesUtilManager.setProperties("countryName", countryName);
         PropertiesUtilManager.setProperties("memberToken", memberToken);
         if (executor.checkMemberShipStatusAndTokenMatch()) {
             Set<? extends CountriesRequestCombiner> entities = executor.initializeCountriesService();
+            session.setAttribute("_getAllCountriesMembership",entities);
             if (entities.isEmpty()) {
                 return ResponseEntity.notFound().build();
             } else {
@@ -71,24 +75,27 @@ public ResponseEntity<Set<? extends CountriesRequestCombiner>> membersGetCountry
     }
 
     @GetMapping("/getCountryByName/{countryName}")
-    public ResponseEntity<Set<? extends CountriesRequestCombiner>> getCountryByName(@PathVariable String countryName) {
+    public ResponseEntity<Set<? extends CountriesRequestCombiner>> getCountryByName(HttpSession session,@PathVariable String countryName) {
         CountriesService.SERVICE_HANDLER = "FIND_COUNTRY_BY_NAME";
         CountriesExecutors.setMapper(mapper);
         PropertiesUtilManager.setProperties("countryName", countryName);
         Set<? extends CountriesRequestCombiner> entities = executor.initializeCountriesService();
+        session.setAttribute("_getAllCountries",entities);
         if (entities.isEmpty()) {
             return ResponseEntity.notFound().build();
+
         } else {
             return ResponseEntity.ok(entities);
         }
     }
 
     @GetMapping("/getCountryByContinent/{continentName}")
-    public ResponseEntity<Set<? extends CountriesRequestCombiner>> getCountryByContinent(@PathVariable String continentName) {
+    public ResponseEntity<Set<? extends CountriesRequestCombiner>> getCountryByContinent(HttpSession session,@PathVariable String continentName) {
         CountriesService.SERVICE_HANDLER = "FIND_COUNTRY_BY_CONTINENT";
         CountriesExecutors.setMapper(mapper);
         PropertiesUtilManager.setProperties("continentName", continentName);
         Set<? extends CountriesRequestCombiner> entities = executor.initializeCountriesService();
+        session.setAttribute("_getAllCountries",entities);
         if (entities.isEmpty()) {
             return ResponseEntity.notFound().build();
         } else {
@@ -97,14 +104,15 @@ public ResponseEntity<Set<? extends CountriesRequestCombiner>> getCountryByConti
     }
 
     @GetMapping("/{memberUsername}/getCountryByRegion/{regionName}")
-    public ResponseEntity<Set<? extends CountriesRequestCombiner>> memberGetCountryByRegion(@PathVariable String regionName, @PathVariable String memberUsername, @RequestHeader(name = "x-auth-membership-token") String memberToken) {
+    public ResponseEntity<Set<? extends CountriesRequestCombiner>> memberGetCountryByRegion(HttpSession session,@PathVariable String regionName, @PathVariable String memberUsername, @RequestHeader(name = "x-auth-membership-token") String memberToken) {
         CountriesService.SERVICE_HANDLER = "FIND_COUNTRY_BY_REGION";
         CountriesExecutors.setMapper(mapper);
         PropertiesUtilManager.setProperties("regionName", regionName);
         PropertiesUtilManager.setProperties("memberToken", memberToken);
         PropertiesUtilManager.setProperties("memberUsername", memberUsername);
         if (executor.checkMemberShipStatusAndTokenMatch()) {
             Set<? extends CountriesRequestCombiner> entities = executor.initializeCountriesService();
+            session.setAttribute("_getAllCountriesMembership",entities);
             if (entities.isEmpty()) {
                 return ResponseEntity.notFound().build();
             } else {
@@ -116,7 +124,7 @@ public ResponseEntity<Set<? extends CountriesRequestCombiner>> memberGetCountryB
     }
 
     @GetMapping("/{memberUsername}/getCountryByContinent/{continentName}")
-    public ResponseEntity<Set<? extends CountriesRequestCombiner>> memberGetCountryByContinent(@PathVariable String continentName, @PathVariable String memberUsername, @RequestHeader String memberToken) {
+    public ResponseEntity<Set<? extends CountriesRequestCombiner>> memberGetCountryByContinent(HttpSession session,@PathVariable String continentName, @PathVariable String memberUsername, @RequestHeader String memberToken) {
         CountriesService.SERVICE_HANDLER = "FIND_COUNTRY_BY_CONTINENT";
         CountriesExecutors.setMapper(mapper);
         PropertiesUtilManager.setProperties("memberUsername", memberUsername);
@@ -125,6 +133,7 @@ public ResponseEntity<Set<? extends CountriesRequestCombiner>> memberGetCountryB
 
         if (executor.checkMemberShipStatusAndTokenMatch()) {
             Set<? extends CountriesRequestCombiner> entities = executor.initializeCountriesService();
+            session.setAttribute("_getAllCountries",entities);
             if (entities.isEmpty()) {
                 return ResponseEntity.notFound().build();
             } else {
@@ -136,11 +145,12 @@ public ResponseEntity<Set<? extends CountriesRequestCombiner>> memberGetCountryB
     }
 
     @GetMapping("/getCountryByRegion/{regionName}")
-    public ResponseEntity<Set<? extends CountriesRequestCombiner>> getCountryByRegion(@PathVariable String regionName) {
+    public ResponseEntity<Set<? extends CountriesRequestCombiner>> getCountryByRegion(HttpSession session,@PathVariable String regionName) {
         CountriesService.SERVICE_HANDLER = "FIND_COUNTRY_BY_REGION";
         CountriesExecutors.setMapper(mapper);
         PropertiesUtilManager.setProperties("regionName", regionName);
         Set<? extends CountriesRequestCombiner> entities = executor.initializeCountriesService();
+        session.setAttribute("_getAllCountries",entities);
         if (entities.isEmpty()) {
             return ResponseEntity.notFound().build();
         } else {

src/main/java/org/airpenthouse/GoTel/dtos/countries/CountriesRequest.java

@@ -5,9 +5,11 @@
 import lombok.Getter;
 import org.airpenthouse.GoTel.util.dto.binder.CountriesRequestCombiner;
 
+import java.io.Serializable;
+
 @AllArgsConstructor
 @Getter
-public class CountriesRequest implements CountriesRequestCombiner {
+public class CountriesRequest implements CountriesRequestCombiner, Serializable {
     @JsonProperty("country_name")
     private String countryName;
     @JsonProperty("_country_region")

src/main/java/org/airpenthouse/GoTel/services/country/CountriesService.java

@@ -5,6 +5,7 @@
 import org.airpenthouse.GoTel.util.dto.binder.CountriesRequestCombiner;
 import org.airpenthouse.GoTel.util.executors.CountriesExecutors;
 import org.airpenthouse.GoTel.util.mappers.CountriesMapper;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
@@ -20,6 +21,7 @@ public class CountriesService extends CountriesExecutors implements Callable<Set
     private CountriesMapper mapper;
     private MembershipCountriesRequest membershipCountriesRequest;
 
+    @Cacheable("countriesAllData")
     private Set<? extends CountriesRequestCombiner> getAllCountries() {
         ENTITY_TRIGGER = "FIND_ALL_COUNTRIES";
         return getRequest();
@@ -35,16 +37,19 @@ private Set<? extends CountriesRequestCombiner> getRequest() {
             return initializeCountriesEntity().stream().map(mapper::mapper).collect(Collectors.toSet());
     }
 
+    @Cacheable("countriesDataByName")
     private Set<? extends CountriesRequestCombiner> getCountryByName() {
         ENTITY_TRIGGER = "FIND_COUNTRY_BY_NAME";
         return getRequest();
     }
 
+    @Cacheable("CountriesDataContinent")
     private Set<? extends CountriesRequestCombiner> getCountryByContinent() {
         ENTITY_TRIGGER = "FIND_COUNTRY_BY_CONTINENT";
         return getRequest();
     }
 
+    @Cacheable("CountriesDataByRegion")
     private Set<? extends CountriesRequestCombiner> getCountryByRegion() {
         ENTITY_TRIGGER = "FIND_COUNTRY_BY_REGION";
         return getRequest();

src/main/resources/application.properties

@@ -1,6 +1,7 @@
 spring.application.name=GoTel
 jdbc.url=jdbc:mysql://localhost:3306/world
 jdbc.username=root
+spring.docker.compose.lifecycle-management=start_only
 #Retrieve all
 jdbc.query.allCountries=SELECT * FROM `country`
 jdbc.query.allLanguage=SELECT country.Name,countrylanguage.Language,countrylanguage.isOfficial FROM `countrylanguage` JOIN country ON countrylanguage.CountryCode = country.Code