From dbdf164280a96c58d4265000d0918d32bcdf5a02 Mon Sep 17 00:00:00 2001 From: Dibbiii Date: Tue, 5 Aug 2025 19:18:30 +0200 Subject: [PATCH] Update Docker and Kafka configs; refactor TomatoesControllers --- .DS_Store | Bin 0 -> 8196 bytes docker-compose.yml | 7 +++- src/.DS_Store | Bin 0 -> 6148 bytes .../ketchapp/KetchappApplication.java | 2 +- .../controllers/TomatoesControllers.java | 37 ++++++++++++------ src/main/resources/application.properties | 2 +- 6 files changed, 33 insertions(+), 15 deletions(-) create mode 100644 .DS_Store create mode 100644 src/.DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..0a5d483b1d697872ab2fd8bc82c6796770d36197 GIT binary patch literal 8196 zcmeHMziSjh6n>N4Gk0hav`CuBf+E<65n{bLPDt8ZFXnO~9_+bCel#{N*h&5au}K>Q z3qjOIlfufzPAs(dKd|z9Gn3nSw|nWLf^UwQx6Jouzi+?&#oHqy)86kd5iJl=6P@GS zMGQ5Kaqg8i<7ciT8my;md#Ssb4@Z?uolpnV0d+tfPzTh3f5id3v$-{=y!RcdqdK4t z{Fe^!^C3a!nEF__XdfLIYzcrEW7;-s&+!Ig;$!M#;UW+;c#aMRiKe6d#QWtep2h@S816;eubc?oWKzpKoZ*)&WY?yaCy)5rx zuKD##`~Hu`Pb(7dpNWqi2HyrQC0I(cmUo9Xs81Pf3HIpeay28=5Pv(KKXDo+_A|^& zCDXHnp4dJ$8qhO@W1@>`bZeHtXZ-WT5vnzbJ1Zc?n;>zl> zKUR@Za@S`F{#L^L7jWk5?+QA4J&A`JZaiPT`rh3WVjrRB({h9k`oKCOT#Y-lDSS8I z*GeSh{(P`@%I(*MtW{L-MY#Um3tZp-?7TL0;QSqk9K{0H|M#YU|37~r%AgLY1Aol{ z6L-3uHt2nAT@k{yc7px@og3#BF4`p+IECkJIgU8~!w}nv$5I~)7lEMZhX8AX4(h-k Gb>KJfZxbj0 literal 0 HcmV?d00001 diff --git a/docker-compose.yml b/docker-compose.yml index 429703d..2af63ee 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,3 @@ -version: "3.8" services: ketchapp-api: build: . @@ -6,3 +5,9 @@ services: - "8081:8081" environment: - GEMINI_API_KEY=AIzaSyCkkuxXPPoohG40PbiIFECLbr7sjAqo-a0 + networks: + - ketchapp-net + +networks: + ketchapp-net: + external: true diff --git a/src/.DS_Store b/src/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..996006c2c27426c072f7385eb1ab57aadde49ee3 GIT binary patch literal 6148 zcmeHK%}&EG47OPhmALFSE})1fU_3!Kl>_I!0E{7qw9-k8d&C3qLWnc3#pl>SBPxyv zfh{GU@j z-BYiw<+j~t-64NbmrkUvi!KQ-PYw)?%=x!yYUy8YV?eC${E;t@3;G!nr#34>_DT zD*EgUI0GdEBVCT={y)PfGuY&pDZX+BoPj^a09VbTnd7DGZvFCla@Pio3k(s7OQJxa l7e4`5$T@P5o$3#wBQ6>yMcGB{IUVRf0+|q>oPi%;;0<=5L9PG* literal 0 HcmV?d00001 diff --git a/src/main/java/com/alessandra_alessandro/ketchapp/KetchappApplication.java b/src/main/java/com/alessandra_alessandro/ketchapp/KetchappApplication.java index 7edbdc0..cbec81f 100644 --- a/src/main/java/com/alessandra_alessandro/ketchapp/KetchappApplication.java +++ b/src/main/java/com/alessandra_alessandro/ketchapp/KetchappApplication.java @@ -9,4 +9,4 @@ public class KetchappApplication { public static void main(String[] args) { SpringApplication.run(KetchappApplication.class, args); } -} \ No newline at end of file +} diff --git a/src/main/java/com/alessandra_alessandro/ketchapp/controllers/TomatoesControllers.java b/src/main/java/com/alessandra_alessandro/ketchapp/controllers/TomatoesControllers.java index 7dcc656..909e682 100644 --- a/src/main/java/com/alessandra_alessandro/ketchapp/controllers/TomatoesControllers.java +++ b/src/main/java/com/alessandra_alessandro/ketchapp/controllers/TomatoesControllers.java @@ -7,22 +7,28 @@ import com.alessandra_alessandro.ketchapp.repositories.ActivitiesRepository; import com.alessandra_alessandro.ketchapp.repositories.TomatoesRepository; import com.alessandra_alessandro.ketchapp.utils.EntityMapper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; +import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; @Service public class TomatoesControllers { - private static final Logger log = LoggerFactory.getLogger(TomatoesControllers.class); + + private static final Logger log = LoggerFactory.getLogger( + TomatoesControllers.class + ); final TomatoesRepository tomatoesRepository; private final ActivitiesRepository activitiesRepository; private final EntityMapper entityMapper; @Autowired - public TomatoesControllers(TomatoesRepository tomatoesRepository, ActivitiesRepository activitiesRepository, EntityMapper entityMapper) { + public TomatoesControllers( + TomatoesRepository tomatoesRepository, + ActivitiesRepository activitiesRepository, + EntityMapper entityMapper + ) { this.tomatoesRepository = tomatoesRepository; this.activitiesRepository = activitiesRepository; this.entityMapper = entityMapper; @@ -59,12 +65,19 @@ public TomatoDto createTomato(TomatoDto tomatoDto) { */ public List getActivitiesByTomatoId(Integer tomatoId) { log.info("Fetching activities for tomatoId: {}", tomatoId); - List activities = activitiesRepository.findByTomatoId(tomatoId); - log.info("Found {} activities for tomatoId {}", activities.size(), tomatoId); - List result = activities.stream() - .map(entityMapper::activityEntityToDto) - .collect(java.util.stream.Collectors.toList()); + List activities = activitiesRepository.findByTomatoId( + tomatoId + ); + log.info( + "Found {} activities for tomatoId {}", + activities.size(), + tomatoId + ); + List result = activities + .stream() + .map(entityMapper::activityEntityToDto) + .collect(java.util.stream.Collectors.toList()); log.info("Mapped activities to ActivityDto list: {}", result); return result; } -} \ No newline at end of file +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 1a88db6..68ec616 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -31,7 +31,7 @@ GEMINI_API_KEY=AIzaSyClXWWxzTCaB6mMZl1Uqcr_3Pe2xZgFHyE # Kafka Configuration app.kafka.topic.mail-service=MailService -spring.kafka.bootstrap-servers=localhost:29092 +spring.kafka.bootstrap-servers=kafka:9092 spring.kafka.consumer.group-id=KafkaID spring.kafka.consumer.auto-offset-reset=earliest # important for initial consumer