From 42532ca11e545e2c7f5e50a12f80b8c7805cce08 Mon Sep 17 00:00:00 2001 From: patrickmac3 Date: Wed, 26 Mar 2025 00:08:05 -0400 Subject: [PATCH 1/9] GH-424: [feat] Changes to kafka event library to add events related to getting a user profile from the event service --- .../sportahub/kafkevents/user/UserEvent.java | 8 +++++++ .../kafkevents/user/UserFetchEvent.java | 24 +++++++++++++++++++ .../kafkevents/user/UserFetchedEvent.java | 24 +++++++++++++++++++ .../kafkevents/user/UserRequestEvent.java | 23 ++++++++++++++++++ .../kafkevents/user/UserResponseEvent.java | 23 ++++++++++++++++++ 5 files changed, 102 insertions(+) create mode 100644 libs/kafka-events/src/main/java/app/sportahub/kafkevents/user/UserEvent.java create mode 100644 libs/kafka-events/src/main/java/app/sportahub/kafkevents/user/UserFetchEvent.java create mode 100644 libs/kafka-events/src/main/java/app/sportahub/kafkevents/user/UserFetchedEvent.java create mode 100644 libs/kafka-events/src/main/java/app/sportahub/kafkevents/user/UserRequestEvent.java create mode 100644 libs/kafka-events/src/main/java/app/sportahub/kafkevents/user/UserResponseEvent.java diff --git a/libs/kafka-events/src/main/java/app/sportahub/kafkevents/user/UserEvent.java b/libs/kafka-events/src/main/java/app/sportahub/kafkevents/user/UserEvent.java new file mode 100644 index 00000000..3e8fbf0c --- /dev/null +++ b/libs/kafka-events/src/main/java/app/sportahub/kafkevents/user/UserEvent.java @@ -0,0 +1,8 @@ +package app.sportahub.kafkevents.user; + +public class UserEvent { + public static final String REQUEST_TOPIC = "user.request"; + public static final String RESPONSE_TOPIC = "user.response"; + public static final String FETCH_TOPIC = "user.fetch"; + public static final String FETCHED_TOPIC = "user.fetched"; +} diff --git a/libs/kafka-events/src/main/java/app/sportahub/kafkevents/user/UserFetchEvent.java b/libs/kafka-events/src/main/java/app/sportahub/kafkevents/user/UserFetchEvent.java new file mode 100644 index 00000000..4b98d631 --- /dev/null +++ b/libs/kafka-events/src/main/java/app/sportahub/kafkevents/user/UserFetchEvent.java @@ -0,0 +1,24 @@ +package app.sportahub.kafkevents.user; + +import app.sportahub.kafkevents.BaseEvent; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.lang.String; + + +public class UserFetchEvent { + private final BaseEvent baseEvent; + private final String userId; + + @JsonCreator + public UserFetchEvent( + @JsonProperty("baseEvent") BaseEvent baseEvent, + @JsonProperty("userId") String userId) + { + this.baseEvent = baseEvent; + this.userId = userId; + } + public String getUserId() {return this.userId;} + public BaseEvent getBaseEvent() {return this.baseEvent;} +} diff --git a/libs/kafka-events/src/main/java/app/sportahub/kafkevents/user/UserFetchedEvent.java b/libs/kafka-events/src/main/java/app/sportahub/kafkevents/user/UserFetchedEvent.java new file mode 100644 index 00000000..cc6c07e3 --- /dev/null +++ b/libs/kafka-events/src/main/java/app/sportahub/kafkevents/user/UserFetchedEvent.java @@ -0,0 +1,24 @@ +package app.sportahub.kafkevents.user; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; + +import app.sportahub.kafkevents.BaseEvent; + + +public class UserFetchedEvent { + private final BaseEvent baseEvent; + private final String user; + + @JsonCreator + public UserFetchedEvent( + @JsonProperty("baseEvent") BaseEvent baseEvent, + @JsonProperty("user") String user) + { + this.baseEvent = baseEvent; + this.user = user; + } + + public BaseEvent getBaseEvent() {return this.baseEvent;} + public String getUser() {return this.user;} +} diff --git a/libs/kafka-events/src/main/java/app/sportahub/kafkevents/user/UserRequestEvent.java b/libs/kafka-events/src/main/java/app/sportahub/kafkevents/user/UserRequestEvent.java new file mode 100644 index 00000000..1a195407 --- /dev/null +++ b/libs/kafka-events/src/main/java/app/sportahub/kafkevents/user/UserRequestEvent.java @@ -0,0 +1,23 @@ +package app.sportahub.kafkevents.user; + +import app.sportahub.kafkevents.BaseEvent; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.lang.String; + +public class UserRequestEvent { + private final BaseEvent baseEvent; + private final String userId; + + @JsonCreator + public UserRequestEvent( + @JsonProperty("baseEvent") BaseEvent baseEvent, + @JsonProperty("userId") String userId) + { + this.baseEvent = baseEvent; + this.userId = userId; + } + public String getUserId() {return this.userId;} + public BaseEvent getBaseEvent() {return this.baseEvent;} +} diff --git a/libs/kafka-events/src/main/java/app/sportahub/kafkevents/user/UserResponseEvent.java b/libs/kafka-events/src/main/java/app/sportahub/kafkevents/user/UserResponseEvent.java new file mode 100644 index 00000000..0b5afb75 --- /dev/null +++ b/libs/kafka-events/src/main/java/app/sportahub/kafkevents/user/UserResponseEvent.java @@ -0,0 +1,23 @@ +package app.sportahub.kafkevents.user; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; + +import app.sportahub.kafkevents.BaseEvent; + + +public class UserResponseEvent { + private final BaseEvent baseEvent; + private final String user; + + @JsonCreator + public UserResponseEvent( + @JsonProperty("baseEvent") BaseEvent baseEvent, + @JsonProperty("user") String user) + { + this.baseEvent = baseEvent; + this.user = user; + } + public String getUser() {return this.user;} + public BaseEvent getBaseEvent() {return this.baseEvent;} +} From a9e29314b2031c0b85bff9323b99e18a7308a074 Mon Sep 17 00:00:00 2001 From: patrickmac3 Date: Thu, 27 Mar 2025 14:56:07 -0400 Subject: [PATCH 2/9] GH-424: [feat] added the kafka consumer is user-service for retrieving requested user --- .../OrchestrationServiceConsumer.java | 5 ++ .../OrchestrationServiceConsumerImpl.java | 71 +++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 Microservices/user-service/src/main/java/app/sportahub/userservice/service/kafka/consumer/OrchestrationServiceConsumer.java create mode 100644 Microservices/user-service/src/main/java/app/sportahub/userservice/service/kafka/consumer/OrchestrationServiceConsumerImpl.java diff --git a/Microservices/user-service/src/main/java/app/sportahub/userservice/service/kafka/consumer/OrchestrationServiceConsumer.java b/Microservices/user-service/src/main/java/app/sportahub/userservice/service/kafka/consumer/OrchestrationServiceConsumer.java new file mode 100644 index 00000000..b53d2902 --- /dev/null +++ b/Microservices/user-service/src/main/java/app/sportahub/userservice/service/kafka/consumer/OrchestrationServiceConsumer.java @@ -0,0 +1,5 @@ +package app.sportahub.userservice.service.kafka.consumer; + +public interface OrchestrationServiceConsumer { + +} diff --git a/Microservices/user-service/src/main/java/app/sportahub/userservice/service/kafka/consumer/OrchestrationServiceConsumerImpl.java b/Microservices/user-service/src/main/java/app/sportahub/userservice/service/kafka/consumer/OrchestrationServiceConsumerImpl.java new file mode 100644 index 00000000..040cdb67 --- /dev/null +++ b/Microservices/user-service/src/main/java/app/sportahub/userservice/service/kafka/consumer/OrchestrationServiceConsumerImpl.java @@ -0,0 +1,71 @@ +package app.sportahub.userservice.service.kafka.consumer; + +import java.time.Instant; +import java.util.UUID; + +import org.apache.kafka.clients.producer.ProducerRecord; +import org.apache.kafka.common.header.internals.RecordHeader; +import org.springframework.kafka.annotation.KafkaListener; +import org.springframework.kafka.core.KafkaTemplate; +import org.springframework.kafka.support.KafkaHeaders; +import org.springframework.messaging.handler.annotation.Header; +import org.springframework.messaging.handler.annotation.Payload; +import org.springframework.stereotype.Service; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + +import app.sportahub.kafkevents.BaseEvent; +import app.sportahub.kafkevents.user.UserEvent; +import app.sportahub.kafkevents.user.UserFetchEvent; +import app.sportahub.kafkevents.user.UserFetchedEvent; +import app.sportahub.userservice.model.user.User; +import app.sportahub.userservice.repository.user.UserRepository; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; + +@Service +@Slf4j +@AllArgsConstructor +public class OrchestrationServiceConsumerImpl { + + private final KafkaTemplate kafkaTemplate; + private final UserRepository userRepository; + + @KafkaListener(topics = UserEvent.FETCH_TOPIC, groupId = "OrchestrationServiceKafkaConsumer") + public void handleEventsByUserRequest( + @Payload UserFetchEvent fetchEvent, + @Header(KafkaHeaders.CORRELATION_ID) byte[] correlationId) { + + log.info("OrchestrationServiceConsumerImpl::handleEventsByUserRequest: received fetch request for user with id: {}", fetchEvent.getUserId()); + + String userId = fetchEvent.getUserId(); + User user = userRepository.findById(userId).orElse(null); + log.info("OrchestrationServiceConsumerImpl::handleEventsByUserRequest: fetched user {}", user); + + ObjectMapper objectMapper = new ObjectMapper(); + String userJsonString; + try { + userJsonString = objectMapper.writeValueAsString(user); + } catch (JsonProcessingException e) { + log.error("Error serializing user object to JSON", e); + userJsonString = "{}"; // Default to empty JSON object + } + + log.info("OrchestrationServiceConsumerImpl::handleEventsByUserRequest: response: {}", userJsonString); + + BaseEvent responseBaseEvent = new BaseEvent( + UUID.randomUUID().toString(), + "response", + "user-service", + Instant.now(), + fetchEvent.getBaseEvent().getCorrelationId() + ); + + UserFetchedEvent fetchedEvent = new UserFetchedEvent(responseBaseEvent, userJsonString); + ProducerRecord responseRecord = new ProducerRecord<>(UserEvent.FETCHED_TOPIC, fetchedEvent); + responseRecord.headers().add(new RecordHeader(KafkaHeaders.CORRELATION_ID, correlationId)); + kafkaTemplate.send(responseRecord); + log.info("OrchestrationServiceConsumerImpl::handleEventsByUserRequest: sent user with id: {}", fetchEvent.getUserId()); + } +} From cca1d26161de422881721a4a0c1235ce49ed5421 Mon Sep 17 00:00:00 2001 From: patrickmac3 Date: Thu, 27 Mar 2025 14:58:28 -0400 Subject: [PATCH 3/9] GH-424: [feat] added kafka consumer in orchestration service to receive user request and return fetched user to event-service --- .../consumer/UserServiceConsumerImpl.java | 140 ++++++++++++++++++ 1 file changed, 140 insertions(+) diff --git a/Microservices/orchestration-service/src/main/java/app/sportahub/orchestrationservice/service/consumer/UserServiceConsumerImpl.java b/Microservices/orchestration-service/src/main/java/app/sportahub/orchestrationservice/service/consumer/UserServiceConsumerImpl.java index b76a1dc1..b4d7a185 100644 --- a/Microservices/orchestration-service/src/main/java/app/sportahub/orchestrationservice/service/consumer/UserServiceConsumerImpl.java +++ b/Microservices/orchestration-service/src/main/java/app/sportahub/orchestrationservice/service/consumer/UserServiceConsumerImpl.java @@ -4,6 +4,11 @@ import app.sportahub.kafka.events.SportaKafkaEvents; import app.sportahub.kafka.events.forgotpassword.ForgotPasswordRequestedEvent; import app.sportahub.kafka.events.forgotpassword.ForgotPasswordSendEmailEvent; +import app.sportahub.kafkevents.user.UserEvent; +import app.sportahub.kafkevents.user.UserFetchEvent; +import app.sportahub.kafkevents.user.UserFetchedEvent; +import app.sportahub.kafkevents.user.UserRequestEvent; +import app.sportahub.kafkevents.user.UserResponseEvent; import app.sportahub.kafka.events.joinsporteventevent.*; import app.sportahub.orchestrationservice.service.producer.EmailServiceProducer; import lombok.RequiredArgsConstructor; @@ -14,6 +19,7 @@ import org.apache.kafka.common.errors.TimeoutException; import org.apache.kafka.common.header.internals.RecordHeader; import org.springframework.kafka.annotation.KafkaListener; +import org.springframework.kafka.annotation.RetryableTopic; import org.springframework.kafka.core.KafkaTemplate; import org.springframework.kafka.requestreply.ReplyingKafkaTemplate; import org.springframework.kafka.requestreply.RequestReplyFuture; @@ -21,6 +27,7 @@ import org.springframework.kafka.support.SendResult; import org.springframework.messaging.handler.annotation.Header; import org.springframework.messaging.handler.annotation.Payload; +import org.springframework.retry.annotation.Backoff; import org.springframework.stereotype.Service; import java.time.Instant; @@ -132,4 +139,137 @@ public void listenForJoinedEventsByUserRequestEvent( replyingKafkaTemplate.stop(); } } + + @SneakyThrows + @KafkaListener(topics = UserEvent.REQUEST_TOPIC, groupId = "UserServiceKafkaConsumer") + public void listenForUserRequests( + @Payload UserRequestEvent requestEvent, + @Header(KafkaHeaders.CORRELATION_ID) byte[] correlationId + ) { + log.info("EventServiceConsumer::listenForUserRequests: received user request event with id: {}", requestEvent.getUserId()); + + String userId = requestEvent.getUserId(); + BaseEvent fetchBaseEvent = new BaseEvent( + UUID.randomUUID().toString(), + "request", + "orchestration-service", + Instant.now(), + requestEvent.getBaseEvent().getCorrelationId() + ); + + UserFetchEvent fetchEvent = new UserFetchEvent(fetchBaseEvent, userId); + ProducerRecord record = new ProducerRecord<>(UserEvent.FETCH_TOPIC, fetchEvent); + record.headers().add(new RecordHeader(KafkaHeaders.REPLY_TOPIC, UserEvent.FETCHED_TOPIC.getBytes())); + record.headers().add(new RecordHeader(KafkaHeaders.CORRELATION_ID, correlationId)); + + // RequestReplyFuture future = replyingKafkaTemplate.sendAndReceive(record); + replyingKafkaTemplate.send(record); + log.info("EventServiceConsumer::listenForUserRequests: sent fetch request for user with id: {}", userId); + } + + @SneakyThrows + @KafkaListener(topics = UserEvent.FETCHED_TOPIC, groupId = "UserServiceKafkaConsumer") + public void listenForFetchedUsers( + @Payload UserFetchedEvent fetchedEvent, + @Header(KafkaHeaders.CORRELATION_ID) byte[] correlationId + ) { + + log.info("EventServiceConsumer::listenForFetchedUsers: received fetched user event with id: {}", fetchedEvent.getUser()); + + BaseEvent fetchedBaseEvent = new BaseEvent( + UUID.randomUUID().toString(), + "response", + "orchestration-service", + Instant.now(), + fetchedEvent.getBaseEvent().getCorrelationId() + ); + + UserResponseEvent responseEvent = new UserResponseEvent(fetchedBaseEvent, fetchedEvent.getUser()); + ProducerRecord responseRecord = new ProducerRecord<>(UserEvent.RESPONSE_TOPIC, responseEvent); + responseRecord.headers().add(new RecordHeader(KafkaHeaders.CORRELATION_ID, correlationId)); + responseRecord.headers().forEach(header -> log.info("Header key: {}, value: {}", header.key(),header.value().toString())); + kafkaTemplate.send(responseRecord); + log.info("EventServiceConsumer::listenForFetchedUsers: sent response to event-service for user with id: {}", fetchedEvent.getUser()); + } + + // @SneakyThrows + // @KafkaListener(topics = {UserEvent.REQUEST_TOPIC, UserEvent.FETCHED_TOPIC}, groupId = "UserServiceKafkaConsumer") + // public void listenForUserEvents( + // @Payload UserRequestEvent requestEvent, + // @Header(KafkaHeaders.CORRELATION_ID) byte[] correlationId + // ) { + // log.info("EventServiceConsumerImpl::listenForUserEvents: received user event with id : {} ", requestEvent.getUserId()); + + // String userId = requestEvent.getUserId(); + // BaseEvent fetchBaseEvent = new BaseEvent( + // UUID.randomUUID().toString(), + // "request", + // "orchestration-service", + // Instant.now(), + // requestEvent.getBaseEvent().getCorrelationId() + // ); + + // try { + // UserFetchEvent fetchEvent = new UserFetchEvent( + // fetchBaseEvent, + // userId + // ); + // ProducerRecord record = new ProducerRecord<>( + // UserEvent.FETCH_TOPIC, + // fetchEvent + // ); + // record.headers().add(new RecordHeader(KafkaHeaders.REPLY_TOPIC, UserEvent.FETCHED_TOPIC.getBytes())); + // record.headers().add(new RecordHeader(KafkaHeaders.CORRELATION_ID, correlationId)); + + // RequestReplyFuture future = replyingKafkaTemplate.sendAndReceive(record); + // log.info("EventServiceConsumer::listenForUserEvents: send fetch requeest for user with id: {}", userId); + + // SendResult sendResult = future.getSendFuture().get(); + // sendResult.getProducerRecord().headers().forEach(header -> System.out.println(header.key() + ":" + header.value().toString())); + // log.info("EventServiceConsumer::listenForUserEvents: received reply 1 for user with id: {}: {}", userId, sendResult); + + // ConsumerRecord response = future.get(100, TimeUnit.SECONDS); + // log.info("EventServiceConsumer::listenForUserEvents: received reply for user with id: {}", userId); + + // log.info("EventServiceConsumer::listenForUserEvents: response value: {}", response.value()); + + // if(response.value() instanceof UserFetchedEvent fetchedEvent + // && Objects.equals(fetchedEvent.getBaseEvent().getCorrelationId(), fetchEvent.getBaseEvent().getCorrelationId())) { + // log.info("EventServiceConsumer::listenForUserEvents: received user with id: {}", requestEvent.getUserId()); + + // } + // else{ + // throw new RuntimeException("Invalid response received"); + // } + + // BaseEvent fetchedBaseEvent = new BaseEvent( + // UUID.randomUUID().toString(), + // "response", + // "orchestration-service", + // Instant.now(), + // fetchedEvent.getBaseEvent().getCorrelationId() + // ); + + // UserResponseEvent responseEvent = new UserResponseEvent( + // fetchedBaseEvent, + // fetchedEvent.getUser() + // ); + + + // ProducerRecord responseRecord = new ProducerRecord<>(UserEvent.RESPONSE_TOPIC, responseEvent); + // responseRecord.headers().add(new RecordHeader(KafkaHeaders.CORRELATION_ID, correlationId)); + + // kafkaTemplate.send(responseRecord); + // log.info("EventServiceConsumer::listenForUserEvents: sent response to event-service for user with id: {}", userId); + + // } catch(InterruptedException e) { + // log.error(e.getMessage()); + // } catch(ExecutionException e) { + // log.error(e.getMessage()); + // } catch(TimeoutException e) { + // log.error(e.getMessage()); + // } catch(Exception e) { + // log.error(e.getMessage()); + // } + // } } From 075402dec17915607da119b78be752a9c9456174 Mon Sep 17 00:00:00 2001 From: patrickmac3 Date: Thu, 27 Mar 2025 23:34:04 -0400 Subject: [PATCH 4/9] GH-242: [feat] implemented recommendation service which uses different score calculating strategies. --- .../config/kafka/KafkaProducerConfig.java | 29 +++- .../controller/event/EventController.java | 57 +++++--- .../eventservice/model/user/UserProfile.java | 42 ++++++ .../repository/event/EventRepository.java | 16 ++- .../OrchestrationServiceProducer.java | 5 +- .../OrchestrationServiceProducerImpl.java | 83 +++++++++++- .../recommendation/RecommendationService.java | 11 ++ .../RecommendationServiceImpl.java | 99 ++++++++++++++ .../factory/ScoringFactory.java | 48 +++++++ .../strategies/HistoryScoreStrategy.java | 127 ++++++++++++++++++ .../strategies/ProfileScoreStrategy.java | 54 ++++++++ .../strategies/ScoreStrategy.java | 10 ++ .../config/KafkaProducerConfig.java | 2 + .../consumer/UserServiceConsumerImpl.java | 84 +----------- 14 files changed, 552 insertions(+), 115 deletions(-) create mode 100644 Microservices/event-service/src/main/java/app/sportahub/eventservice/model/user/UserProfile.java create mode 100644 Microservices/event-service/src/main/java/app/sportahub/eventservice/service/recommendation/RecommendationService.java create mode 100644 Microservices/event-service/src/main/java/app/sportahub/eventservice/service/recommendation/RecommendationServiceImpl.java create mode 100644 Microservices/event-service/src/main/java/app/sportahub/eventservice/service/recommendation/factory/ScoringFactory.java create mode 100644 Microservices/event-service/src/main/java/app/sportahub/eventservice/service/recommendation/strategies/HistoryScoreStrategy.java create mode 100644 Microservices/event-service/src/main/java/app/sportahub/eventservice/service/recommendation/strategies/ProfileScoreStrategy.java create mode 100644 Microservices/event-service/src/main/java/app/sportahub/eventservice/service/recommendation/strategies/ScoreStrategy.java diff --git a/Microservices/event-service/src/main/java/app/sportahub/eventservice/config/kafka/KafkaProducerConfig.java b/Microservices/event-service/src/main/java/app/sportahub/eventservice/config/kafka/KafkaProducerConfig.java index 62b84ea5..12a5ffa0 100644 --- a/Microservices/event-service/src/main/java/app/sportahub/eventservice/config/kafka/KafkaProducerConfig.java +++ b/Microservices/event-service/src/main/java/app/sportahub/eventservice/config/kafka/KafkaProducerConfig.java @@ -1,5 +1,9 @@ package app.sportahub.eventservice.config.kafka; +import java.time.Duration; +import java.util.HashMap; +import java.util.Map; + import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.serialization.StringSerializer; import org.springframework.beans.factory.annotation.Value; @@ -10,9 +14,7 @@ import org.springframework.kafka.core.KafkaTemplate; import org.springframework.kafka.core.ProducerFactory; import org.springframework.kafka.support.serializer.JsonSerializer; - -import java.util.HashMap; -import java.util.Map; +import java.util.UUID; @EnableKafka @Configuration @@ -32,6 +34,23 @@ public ProducerFactory producerFactory() { @Bean public KafkaTemplate kafkaTemplate(ProducerFactory producerFactory) { - return new KafkaTemplate<>(producerFactory); + return new KafkaTemplate<>(producerFactory()); + } + + @Bean + public ReplyingKafkaTemplate replyingKafkaTemplate( + ProducerFactory producerFactory, + KafkaMessageListenerContainer replyContainer) { + ReplyingKafkaTemplate template = new ReplyingKafkaTemplate<>(producerFactory, replyContainer); + template.setDefaultReplyTimeout(Duration.ofSeconds(6)); + return template; + } + + @Bean + public KafkaMessageListenerContainer replyContainer( + ConsumerFactory consumerFactory) { + ContainerProperties containerProperties = new ContainerProperties(UserEvent.RESPONSE_TOPIC); + containerProperties.setGroupId("OrchestrationServiceConsumer"); + return new KafkaMessageListenerContainer<>(consumerFactory, containerProperties); } -} +} \ No newline at end of file diff --git a/Microservices/event-service/src/main/java/app/sportahub/eventservice/controller/event/EventController.java b/Microservices/event-service/src/main/java/app/sportahub/eventservice/controller/event/EventController.java index 7cf7c5aa..d270ef90 100644 --- a/Microservices/event-service/src/main/java/app/sportahub/eventservice/controller/event/EventController.java +++ b/Microservices/event-service/src/main/java/app/sportahub/eventservice/controller/event/EventController.java @@ -1,32 +1,42 @@ package app.sportahub.eventservice.controller.event; -import app.sportahub.eventservice.dto.request.event.EventRequest; +import java.util.List; + +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PatchMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.RestController; + import app.sportahub.eventservice.dto.request.event.WhitelistRequest; import app.sportahub.eventservice.dto.request.event.EventCancellationRequest; +import app.sportahub.eventservice.dto.request.event.EventRequest; import app.sportahub.eventservice.dto.response.EventResponse; import app.sportahub.eventservice.dto.response.ParticipantResponse; +import app.sportahub.eventservice.dto.response.ReactionResponse; import app.sportahub.eventservice.enums.EventSortingField; -import app.sportahub.eventservice.enums.SortDirection; -import app.sportahub.eventservice.model.event.Location; import app.sportahub.eventservice.enums.SkillLevelEnum; -import app.sportahub.eventservice.dto.response.ReactionResponse; +import app.sportahub.eventservice.enums.SortDirection; import app.sportahub.eventservice.model.event.reactor.ReactionType; import app.sportahub.eventservice.service.event.EventService; +import app.sportahub.eventservice.service.recommendation.RecommendationService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import java.util.List; - -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageRequest; -import org.springframework.data.domain.Pageable; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - @RestController @RequestMapping("/event") @@ -35,6 +45,7 @@ public class EventController { private final EventService eventService; + private final RecommendationService recommendationService; @GetMapping("/{id}") @ResponseStatus(HttpStatus.OK) @@ -201,4 +212,20 @@ public EventResponse whitelistUsers(@PathVariable String id, @RequestBody WhitelistRequest whitelistRequest) { return eventService.whitelistUsers(id, whitelistRequest); } -} + + + @GetMapping("/recommendation") + @PreAuthorize("authentication.name == #userId || hasRole('ROLE_ADMIN')") + @ResponseStatus(HttpStatus.OK) + @Operation(summary = "Retrieve events by location", + description = "Fetches events based on the provided location.") + public Page getEventRecommendations( + @RequestParam String userId, + @RequestParam double longitude, + @RequestParam double latitude, + @RequestParam(defaultValue = "30.0") double radius, + @RequestParam(defaultValue = "0") int page, + @RequestParam(defaultValue = "10") int size) { + return recommendationService.getRecommendations(userId, longitude, latitude, radius, page, size); + } +} \ No newline at end of file diff --git a/Microservices/event-service/src/main/java/app/sportahub/eventservice/model/user/UserProfile.java b/Microservices/event-service/src/main/java/app/sportahub/eventservice/model/user/UserProfile.java new file mode 100644 index 00000000..026a1c7e --- /dev/null +++ b/Microservices/event-service/src/main/java/app/sportahub/eventservice/model/user/UserProfile.java @@ -0,0 +1,42 @@ +package app.sportahub.eventservice.model.user; + +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; + +import app.sportahub.eventservice.enums.SkillLevelEnum; +import lombok.Data; + +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +public class UserProfile { + + @JsonProperty("profile") + private Profile profile; + + @Data + @JsonIgnoreProperties(ignoreUnknown = true) + public static class Profile { + @JsonProperty("sportsOfPreference") + private List sportsOfPreference; + } + + @Data + @JsonIgnoreProperties(ignoreUnknown = true) + public static class SportPreferences { + @JsonProperty("name") + private String sport; + + @JsonProperty("ranking") + private SkillLevelEnum ranking; + + public void setRanking(String ranking) { + try { + this.ranking = SkillLevelEnum.valueOf(ranking.toUpperCase()); + } catch (IllegalArgumentException | NullPointerException e) { + this.ranking = SkillLevelEnum.BEGINNER; + } + } + } +} \ No newline at end of file diff --git a/Microservices/event-service/src/main/java/app/sportahub/eventservice/repository/event/EventRepository.java b/Microservices/event-service/src/main/java/app/sportahub/eventservice/repository/event/EventRepository.java index 754aa8ad..05796d58 100644 --- a/Microservices/event-service/src/main/java/app/sportahub/eventservice/repository/event/EventRepository.java +++ b/Microservices/event-service/src/main/java/app/sportahub/eventservice/repository/event/EventRepository.java @@ -1,7 +1,8 @@ package app.sportahub.eventservice.repository.event; -import app.sportahub.eventservice.model.event.Event; -import app.sportahub.eventservice.repository.SearchingEventRepository; +import java.util.List; +import java.util.Optional; + import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.geo.Distance; @@ -10,8 +11,8 @@ import org.springframework.data.mongodb.repository.Query; import org.springframework.stereotype.Repository; -import java.util.List; -import java.util.Optional; +import app.sportahub.eventservice.model.event.Event; +import app.sportahub.eventservice.repository.SearchingEventRepository; @Repository public interface EventRepository extends MongoRepository, SearchingEventRepository { @@ -23,9 +24,10 @@ public interface EventRepository extends MongoRepository, Searchi Optional findEventByEventName(String eventName); Page findByParticipantsUserId(String userId, Pageable pageable); + + @Query("{ 'participants.userId' : ?0 }") + List findAllByParticipantUserId(String userId); Page findByCreatedBy(String userId, Pageable pageable); - @Query("{ 'participants.userId' : ?0 }") - List findAllByParticipantUserId(String userId); -} +} \ No newline at end of file diff --git a/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/kafka/producer/OrchestrationServiceProducer.java b/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/kafka/producer/OrchestrationServiceProducer.java index d8773b45..420051a3 100644 --- a/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/kafka/producer/OrchestrationServiceProducer.java +++ b/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/kafka/producer/OrchestrationServiceProducer.java @@ -2,9 +2,8 @@ import app.sportahub.kafka.events.notification.NotificationEvent; -import java.util.List; -import java.util.Map; public interface OrchestrationServiceProducer { void sendNotificationEvent(NotificationEvent event); -} + String getUserById(String userId); +} \ No newline at end of file diff --git a/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/kafka/producer/OrchestrationServiceProducerImpl.java b/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/kafka/producer/OrchestrationServiceProducerImpl.java index 6da51fc6..cb7e36bd 100644 --- a/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/kafka/producer/OrchestrationServiceProducerImpl.java +++ b/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/kafka/producer/OrchestrationServiceProducerImpl.java @@ -1,11 +1,29 @@ package app.sportahub.eventservice.service.kafka.producer; import app.sportahub.kafka.events.notification.NotificationEvent; +import app.sportahub.kafka.events.BaseEvent; import app.sportahub.kafka.events.SportaKafkaEvents; +import app.sportahub.kafka.events.user.UserEvent; +import app.sportahub.kafka.events.user.UserRequestEvent; +import app.sportahub.kafka.events.user.UserResponseEvent; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; + +import java.time.Instant; +import java.util.Objects; +import java.util.UUID; +import java.util.concurrent.TimeoutException; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; + +import org.springframework.kafka.support.SendResult; +import org.apache.kafka.clients.consumer.ConsumerRecord; +import org.apache.kafka.clients.producer.ProducerRecord; import org.springframework.kafka.core.KafkaTemplate; +import org.springframework.kafka.requestreply.ReplyingKafkaTemplate; +import org.springframework.kafka.requestreply.RequestReplyFuture; +import org.springframework.kafka.support.KafkaHeaders; import org.springframework.stereotype.Service; @Service @@ -14,11 +32,72 @@ public class OrchestrationServiceProducerImpl implements OrchestrationServiceProducer { private final KafkaTemplate kafkaTemplate; + private final ReplyingKafkaTemplate replyingKafkaTemplate; @SneakyThrows @Override public void sendNotificationEvent(NotificationEvent event) { kafkaTemplate.send(SportaKafkaEvents.NOTIFICATION_REQUEST_TOPIC, event); - log.info("OrchestrationServiceProducerImpl::sendNotificationEvent: NotificationEvent sent to topic for user {}", event.getUserId()); + log.info("OrchestrationServiceProducerImpl::sendNotificationEvent: NotificationEvent sent to topic for user {}", + event.getUserId()); + } + + @SneakyThrows + @Override + public String getUserById(String userId) { + BaseEvent baseEvent = new BaseEvent( + UUID.randomUUID().toString(), + "request", + "event-service", + Instant.now(), + UUID.randomUUID().toString()); + + try { + UserRequestEvent userRequestEvent = new UserRequestEvent(baseEvent, userId); + + ProducerRecord record = new ProducerRecord<>( + UserEvent.REQUEST_TOPIC, + userRequestEvent); + record.headers().add(KafkaHeaders.REPLY_TOPIC, UserEvent.RESPONSE_TOPIC.getBytes()); + + RequestReplyFuture future = replyingKafkaTemplate.sendAndReceive(record); + log.info("OrchestrationServiceProducerImpl::getUserById: sent request for user with id: {}", + userRequestEvent.getUserId()); + + SendResult sendResult = future.getSendFuture().get(); + sendResult.getProducerRecord().headers() + .forEach(header -> log.info( + "OrchestrationServiceProducerImpl::getUserById: header key: {}, header value: {}", + header.key(), header.value())); + + ConsumerRecord response = future.get(15, TimeUnit.SECONDS); + log.info("OrchestrationServiceProducerImpl::getUserById: received response for user with id: {}", + userRequestEvent.getUserId()); + + if (response.value() instanceof UserResponseEvent userResponseEvent + && Objects.equals(userResponseEvent.getBaseEvent().getCorrelationId(), + userRequestEvent.getBaseEvent().getCorrelationId())) { + log.info("OrchestrationServiceImpl::getUserById: response is of type UserResponseEvent: {}", + response.value()); + + return userResponseEvent.getUser(); + } else { + log.info("OrchestrationServiceImpl::getUserById: response is not of type UserResponseEvent: {}", + response.value()); + return null; + } + + } catch (InterruptedException e) { + log.error(e.getMessage()); + } catch (ExecutionException e) { + log.error(e.getMessage()); + } catch (TimeoutException e) { + log.error(e.getMessage()); + log.error(e.getCause().getMessage()); + } catch (Exception e) { + log.error(e.getMessage()); + } + + return "{}"; } -} +} \ No newline at end of file diff --git a/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/recommendation/RecommendationService.java b/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/recommendation/RecommendationService.java new file mode 100644 index 00000000..d0d1e1a8 --- /dev/null +++ b/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/recommendation/RecommendationService.java @@ -0,0 +1,11 @@ +package app.sportahub.eventservice.service.recommendation; + +import org.springframework.data.domain.Page; + +import app.sportahub.eventservice.dto.response.EventResponse; + +public interface RecommendationService { + + public Page getRecommendations(String userId, double longitude, double latitude, double radius, int page, int size); + +} \ No newline at end of file diff --git a/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/recommendation/RecommendationServiceImpl.java b/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/recommendation/RecommendationServiceImpl.java new file mode 100644 index 00000000..75e584a9 --- /dev/null +++ b/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/recommendation/RecommendationServiceImpl.java @@ -0,0 +1,99 @@ +package app.sportahub.eventservice.service.recommendation; + +import java.time.LocalDateTime; +import java.time.OffsetDateTime; +import java.time.ZoneId; +import java.time.ZoneOffset; +import java.time.format.DateTimeParseException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageImpl; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.data.geo.Distance; +import org.springframework.data.geo.Metrics; +import org.springframework.data.mongodb.core.geo.GeoJsonPoint; +import org.springframework.stereotype.Service; + +import app.sportahub.eventservice.dto.response.EventResponse; +import app.sportahub.eventservice.mapper.event.EventMapper; +import app.sportahub.eventservice.model.event.Event; +import app.sportahub.eventservice.repository.event.EventRepository; +import app.sportahub.eventservice.service.kafka.producer.OrchestrationServiceProducer; +import app.sportahub.eventservice.service.recommendation.factory.ScoringFactory; +import app.sportahub.eventservice.service.recommendation.strategies.ScoreStrategy; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + +@Slf4j +@Service("recommendationService") +@RequiredArgsConstructor +public class RecommendationServiceImpl implements RecommendationService{ + + private final EventRepository eventRepository; + private final OrchestrationServiceProducer orchestrationServiceProducer; + private final EventMapper eventMapper; + + @Override + public Page getRecommendations(String userId, double longitude, double latitude, double radius, int page, int size) { + GeoJsonPoint point = new GeoJsonPoint(longitude, latitude); + Distance distance = new Distance(radius, Metrics.KILOMETERS); + Pageable pageable = PageRequest.of(page, size); + List eventsList = eventRepository.findByLocationCoordinatesNear(point, distance, pageable).getContent() + .stream() + .collect(Collectors.toList()); + + eventsList.removeIf(event -> !(event.getIsPrivate() && event.getWhitelistedUsers().contains(userId) ) + || isEventCutOffTimePassed(event.getCutOffTime())); + + if(eventsList.isEmpty()) { + log.info("RecommendationServiceImpl::getRecommendations: no valid events found for user {}", userId); + return new PageImpl<>(new ArrayList<>(), pageable, 0); + } + log.info("RecommendationServiceImpl::getRecommendations: found {} events for user {}", eventsList.size(), userId); + + List userEventHistoryList = eventRepository.findAllByParticipantUserId(userId); + + ScoreStrategy scoreService = new ScoringFactory(orchestrationServiceProducer).getScoringStrategy(userEventHistoryList, userId); + log.info("RecommendationServiceImpl::getRecommendations: Strategy used for calculating recommendation scores: {}", scoreService.getClass().getSimpleName()); + Map eventScores = scoreService.computeScores(eventsList); + + List eventResponse = eventScores.entrySet().parallelStream() + .sorted((e1, e2) -> e2.getValue().compareTo(e1.getValue())) + .map(Map.Entry::getKey) + .map(eventMapper::eventToEventResponse) + .collect(Collectors.toList()); + + log.info("RecommendationServiceImpl::getRecommendations: returning {} events for user {}", eventResponse.size(), userId); + int fromIndex = (int) pageable.getOffset() > eventResponse.size() ? eventResponse.size() : (int) pageable.getOffset(); + int toIndex = Math.min(fromIndex + size, eventResponse.size()); + if (fromIndex > toIndex) { + fromIndex = toIndex; + } + return new PageImpl<>(eventResponse.subList(fromIndex, toIndex), pageable, eventResponse.size()); + } + + private boolean isEventCutOffTimePassed(String cutOffTime) { + try{ + LocalDateTime currentTime = LocalDateTime.now(); + // handle for offset time + if(cutOffTime.contains("+") || cutOffTime.charAt(cutOffTime.length()-6) == '-' || cutOffTime.contains("Z")) { + ZoneId localZoneId = ZoneId.systemDefault(); + ZoneOffset localZoneOffset = localZoneId.getRules().getOffset(currentTime); + OffsetDateTime currentOffsetDateTime = currentTime.atOffset(localZoneOffset); + return OffsetDateTime.parse(cutOffTime).isBefore(currentOffsetDateTime); + } + // handle for local time + else { + return LocalDateTime.parse(cutOffTime).isBefore(currentTime); + } + + } catch (DateTimeParseException e) { + return false; + } + } +} \ No newline at end of file diff --git a/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/recommendation/factory/ScoringFactory.java b/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/recommendation/factory/ScoringFactory.java new file mode 100644 index 00000000..a4993e54 --- /dev/null +++ b/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/recommendation/factory/ScoringFactory.java @@ -0,0 +1,48 @@ +package app.sportahub.eventservice.service.recommendation.factory; + +import java.util.List; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + +import app.sportahub.eventservice.model.event.Event; +import app.sportahub.eventservice.model.user.UserProfile; +import app.sportahub.eventservice.service.kafka.producer.OrchestrationServiceProducer; +import app.sportahub.eventservice.service.recommendation.strategies.HistoryScoreStrategy; +import app.sportahub.eventservice.service.recommendation.strategies.ProfileScoreStrategy; +import app.sportahub.eventservice.service.recommendation.strategies.ScoreStrategy; +import lombok.extern.slf4j.Slf4j; + + +@Slf4j +public class ScoringFactory { + + private final OrchestrationServiceProducer orchestrationServiceProducer; + + public ScoringFactory(OrchestrationServiceProducer orchestrationServiceProducer) { + this.orchestrationServiceProducer = orchestrationServiceProducer; + } + + public ScoreStrategy getScoringStrategy(List userEventHistory, String userId) { + if(userEventHistory.isEmpty()){ + ObjectMapper objectMapper = new ObjectMapper(); + String userString = orchestrationServiceProducer.getUserById(userId); + log.info("ScoringFactory::getScoringStrategy: user string {}", userString); + UserProfile userProfile; + try { + userProfile = objectMapper.readValue(userString, UserProfile.class); + log.info("ScoringFactory::getScoringStrategy: user profile {}", userProfile); + } catch (JsonProcessingException e) { + + log.error("Error processing JSON for user data", e); + throw new RuntimeException("Error processing JSON for user data"); + } + + log.info("ScoringFactory::getScoringStrategy: user retrieved {}", userProfile); + return new ProfileScoreStrategy(userProfile); + + } else { + return new HistoryScoreStrategy(userEventHistory); + } + } +} \ No newline at end of file diff --git a/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/recommendation/strategies/HistoryScoreStrategy.java b/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/recommendation/strategies/HistoryScoreStrategy.java new file mode 100644 index 00000000..a8014a00 --- /dev/null +++ b/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/recommendation/strategies/HistoryScoreStrategy.java @@ -0,0 +1,127 @@ +package app.sportahub.eventservice.service.recommendation.strategies; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + +import app.sportahub.eventservice.enums.SkillLevelEnum; +import app.sportahub.eventservice.model.event.Event; +import app.sportahub.eventservice.model.event.participant.Participant; + +public class HistoryScoreStrategy implements ScoreStrategy { + + private List userEventHistory; + + // earth radius in km and conversion factor from degrees to radians + private static final double EARTH_RADIUS = 6371; + private static final double DEG_TO_RAD = Math.PI / 180.0; + // score weights + private static final double DISTANCE_WEIGHT = 2 / 5.0; + private static final double CATEGORICAL_WEIGHT = 2 / 5.0; + private static final double TIME_WEIGHT = 1 / 5.0; + + + public HistoryScoreStrategy(List userEventHistory) { + this.userEventHistory = userEventHistory; + } + + @Override + public Map computeScores(List events) { + Map eventScores = events.parallelStream().collect(Collectors.toConcurrentMap( + event -> event, + event -> generateEventScore(event, userEventHistory) + )); + + return eventScores; + } + + private double generateEventScore(Event event, List userEventHistoryList) { + List eventScores = new ArrayList<>(); + userEventHistoryList.forEach(historyEvent -> { + + if(historyEvent.getId().equals(event.getId())) { + return; + } + + double distanceScore = haversineDistance(historyEvent, event) / 100; + double timeScore = timeSimilarity(historyEvent, event); + double categoricalScore = jaccardSimilarity(historyEvent, event); + + double score = DISTANCE_WEIGHT * distanceScore + CATEGORICAL_WEIGHT * categoricalScore + timeScore * TIME_WEIGHT; + + eventScores.add(score); + }); + + double averageScore = eventScores.stream().mapToDouble(Double::doubleValue).average().orElse(0.0); + + return averageScore; + } + + private double jaccardSimilarity(Event event1, Event event2) { + Set participants1 = event1.getParticipants().stream() + .map(Participant::getUserId) + .collect(Collectors.toSet()); + + Set participants2 = event2.getParticipants().stream() + .map(Participant::getUserId) + .collect(Collectors.toSet()); + + Set intersection = new HashSet<>(participants1); + intersection.retainAll(participants2); + Set union = new HashSet<>(participants1); + union.addAll(participants2); + + double participantScore = (double) intersection.size() / union.size(); + + Set skills1 = event1.getRequiredSkillLevel().stream() + .map(SkillLevelEnum::toString) + .collect(Collectors.toSet()); + + Set skills2 = event2.getRequiredSkillLevel().stream() + .map(SkillLevelEnum::toString) + .collect(Collectors.toSet()); + + Set intersectionSkills = new HashSet<>(skills1); + intersectionSkills.retainAll(skills2); + Set unionSkills = new HashSet<>(skills1); + unionSkills.addAll(skills2); + + double skillScore = (double) intersectionSkills.size() / unionSkills.size(); + + double sportTypeScore = event1.getSportType().equalsIgnoreCase(event2.getSportType()) ? 1.0 : 0.0; + double similarityScore = (participantScore + skillScore + sportTypeScore) / 3.0; + + return similarityScore; + } + + private double timeSimilarity(Event event1, Event event2) { + double startTimeScore = 1 - Math.abs(event1.getStartTime().toSecondOfDay() - event2.getStartTime().toSecondOfDay()) / 86400.0; + double duration1 = event1.getDuration().isEmpty() ? 0.0 : Double.parseDouble(event1.getDuration()); + double duration2 = event2.getDuration().isEmpty() ? 0.0 : Double.parseDouble(event2.getDuration()); + double durationScore = 1 - Math.abs(duration1 - duration2) / 24.0; + double similarityScore = (startTimeScore + durationScore) / 2.0; + + return similarityScore; + } + + private double haversineDistance(Event event1, Event event2) { + double longitude1 = event1.getLocation().getCoordinates().getX() * DEG_TO_RAD; + double latitude1 = event1.getLocation().getCoordinates().getY() * DEG_TO_RAD; + double longitude2 = event2.getLocation().getCoordinates().getX() * DEG_TO_RAD; + double latitude2 = event2.getLocation().getCoordinates().getY() * DEG_TO_RAD; + + double dlat = latitude2 - latitude1; + double dlon = longitude2 - longitude1; + + double a = Math.pow(Math.sin(dlat / 2), 2) + + Math.pow(Math.sin(dlon / 2), 2) * + Math.cos(latitude1) * + Math.cos(latitude2); + + double distance = EARTH_RADIUS * 2 * Math.asin(Math.sqrt(a)); + return distance; + } +} \ No newline at end of file diff --git a/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/recommendation/strategies/ProfileScoreStrategy.java b/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/recommendation/strategies/ProfileScoreStrategy.java new file mode 100644 index 00000000..ebe51f63 --- /dev/null +++ b/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/recommendation/strategies/ProfileScoreStrategy.java @@ -0,0 +1,54 @@ +package app.sportahub.eventservice.service.recommendation.strategies; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import app.sportahub.eventservice.enums.SkillLevelEnum; +import app.sportahub.eventservice.model.event.Event; +import app.sportahub.eventservice.model.user.UserProfile; +import lombok.extern.slf4j.Slf4j; + +@Slf4j +public class ProfileScoreStrategy implements ScoreStrategy { + + private UserProfile user; + + public ProfileScoreStrategy(UserProfile user) { + this.user = user; + } + + @Override + public Map computeScores(List events) { + log.info("ProfileScoreStrategy::computeScores: computing scores for {} events with user profile {}", events.size(), user); + Map eventScores = events.parallelStream().collect(Collectors.toConcurrentMap( + event -> event, + event -> generateEventScore(event) + )); + return eventScores; + } + + private double generateEventScore(Event event) { + if(user.getProfile() == null || user.getProfile().getSportsOfPreference().isEmpty()){ + log.info("ProfileScoreStrategy::generateEventScore: user has no sports of preference, returning 0.0"); + return 0.0; + } + + log.info("ProfileScoreStrategy::generateEventScore: user has sports of preference, calculating score for event {}", event); + Map sports = user.getProfile().getSportsOfPreference().stream() + .collect(Collectors.toMap( + sport -> sport.getSport().toLowerCase().trim(), + sport -> sport.getRanking() + )); + + Integer score = 0; + if(sports.containsKey(event.getSportType().toLowerCase().trim())) { + score += 1; + if(event.getRequiredSkillLevel().contains(sports.get(event.getSportType()))){ + score += 1; + } + } + + return score == 0 ? 0.0 : score/2.0; + } +} \ No newline at end of file diff --git a/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/recommendation/strategies/ScoreStrategy.java b/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/recommendation/strategies/ScoreStrategy.java new file mode 100644 index 00000000..81ba62ca --- /dev/null +++ b/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/recommendation/strategies/ScoreStrategy.java @@ -0,0 +1,10 @@ +package app.sportahub.eventservice.service.recommendation.strategies; + +import java.util.List; +import java.util.Map; + +import app.sportahub.eventservice.model.event.Event; + +public interface ScoreStrategy { + public Map computeScores(List events); +} \ No newline at end of file diff --git a/Microservices/orchestration-service/src/main/java/app/sportahub/orchestrationservice/config/KafkaProducerConfig.java b/Microservices/orchestration-service/src/main/java/app/sportahub/orchestrationservice/config/KafkaProducerConfig.java index edf6f4eb..ccaf5d03 100644 --- a/Microservices/orchestration-service/src/main/java/app/sportahub/orchestrationservice/config/KafkaProducerConfig.java +++ b/Microservices/orchestration-service/src/main/java/app/sportahub/orchestrationservice/config/KafkaProducerConfig.java @@ -1,6 +1,8 @@ package app.sportahub.orchestrationservice.config; import app.sportahub.kafka.events.SportaKafkaEvents; +import app.sportahub.kafka.events.user.UserEvent; +import app.sportahub.kafka.events.JoinedSportEventEvent.JoinedEventsByUserEvent; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.serialization.StringSerializer; import org.springframework.beans.factory.annotation.Value; diff --git a/Microservices/orchestration-service/src/main/java/app/sportahub/orchestrationservice/service/consumer/UserServiceConsumerImpl.java b/Microservices/orchestration-service/src/main/java/app/sportahub/orchestrationservice/service/consumer/UserServiceConsumerImpl.java index b4d7a185..3d35e450 100644 --- a/Microservices/orchestration-service/src/main/java/app/sportahub/orchestrationservice/service/consumer/UserServiceConsumerImpl.java +++ b/Microservices/orchestration-service/src/main/java/app/sportahub/orchestrationservice/service/consumer/UserServiceConsumerImpl.java @@ -162,7 +162,6 @@ public void listenForUserRequests( record.headers().add(new RecordHeader(KafkaHeaders.REPLY_TOPIC, UserEvent.FETCHED_TOPIC.getBytes())); record.headers().add(new RecordHeader(KafkaHeaders.CORRELATION_ID, correlationId)); - // RequestReplyFuture future = replyingKafkaTemplate.sendAndReceive(record); replyingKafkaTemplate.send(record); log.info("EventServiceConsumer::listenForUserRequests: sent fetch request for user with id: {}", userId); } @@ -191,85 +190,4 @@ public void listenForFetchedUsers( kafkaTemplate.send(responseRecord); log.info("EventServiceConsumer::listenForFetchedUsers: sent response to event-service for user with id: {}", fetchedEvent.getUser()); } - - // @SneakyThrows - // @KafkaListener(topics = {UserEvent.REQUEST_TOPIC, UserEvent.FETCHED_TOPIC}, groupId = "UserServiceKafkaConsumer") - // public void listenForUserEvents( - // @Payload UserRequestEvent requestEvent, - // @Header(KafkaHeaders.CORRELATION_ID) byte[] correlationId - // ) { - // log.info("EventServiceConsumerImpl::listenForUserEvents: received user event with id : {} ", requestEvent.getUserId()); - - // String userId = requestEvent.getUserId(); - // BaseEvent fetchBaseEvent = new BaseEvent( - // UUID.randomUUID().toString(), - // "request", - // "orchestration-service", - // Instant.now(), - // requestEvent.getBaseEvent().getCorrelationId() - // ); - - // try { - // UserFetchEvent fetchEvent = new UserFetchEvent( - // fetchBaseEvent, - // userId - // ); - // ProducerRecord record = new ProducerRecord<>( - // UserEvent.FETCH_TOPIC, - // fetchEvent - // ); - // record.headers().add(new RecordHeader(KafkaHeaders.REPLY_TOPIC, UserEvent.FETCHED_TOPIC.getBytes())); - // record.headers().add(new RecordHeader(KafkaHeaders.CORRELATION_ID, correlationId)); - - // RequestReplyFuture future = replyingKafkaTemplate.sendAndReceive(record); - // log.info("EventServiceConsumer::listenForUserEvents: send fetch requeest for user with id: {}", userId); - - // SendResult sendResult = future.getSendFuture().get(); - // sendResult.getProducerRecord().headers().forEach(header -> System.out.println(header.key() + ":" + header.value().toString())); - // log.info("EventServiceConsumer::listenForUserEvents: received reply 1 for user with id: {}: {}", userId, sendResult); - - // ConsumerRecord response = future.get(100, TimeUnit.SECONDS); - // log.info("EventServiceConsumer::listenForUserEvents: received reply for user with id: {}", userId); - - // log.info("EventServiceConsumer::listenForUserEvents: response value: {}", response.value()); - - // if(response.value() instanceof UserFetchedEvent fetchedEvent - // && Objects.equals(fetchedEvent.getBaseEvent().getCorrelationId(), fetchEvent.getBaseEvent().getCorrelationId())) { - // log.info("EventServiceConsumer::listenForUserEvents: received user with id: {}", requestEvent.getUserId()); - - // } - // else{ - // throw new RuntimeException("Invalid response received"); - // } - - // BaseEvent fetchedBaseEvent = new BaseEvent( - // UUID.randomUUID().toString(), - // "response", - // "orchestration-service", - // Instant.now(), - // fetchedEvent.getBaseEvent().getCorrelationId() - // ); - - // UserResponseEvent responseEvent = new UserResponseEvent( - // fetchedBaseEvent, - // fetchedEvent.getUser() - // ); - - - // ProducerRecord responseRecord = new ProducerRecord<>(UserEvent.RESPONSE_TOPIC, responseEvent); - // responseRecord.headers().add(new RecordHeader(KafkaHeaders.CORRELATION_ID, correlationId)); - - // kafkaTemplate.send(responseRecord); - // log.info("EventServiceConsumer::listenForUserEvents: sent response to event-service for user with id: {}", userId); - - // } catch(InterruptedException e) { - // log.error(e.getMessage()); - // } catch(ExecutionException e) { - // log.error(e.getMessage()); - // } catch(TimeoutException e) { - // log.error(e.getMessage()); - // } catch(Exception e) { - // log.error(e.getMessage()); - // } - // } -} +} \ No newline at end of file From 6f954ef4b5c07b64e2ac3071f6702de1c2eddb04 Mon Sep 17 00:00:00 2001 From: patrickmac3 Date: Tue, 1 Apr 2025 15:33:49 -0400 Subject: [PATCH 5/9] GH-424: [refractor] made changes requested in pr --- .../config/kafka/KafkaProducerConfig.java | 12 ++- .../exception/GlobalExceptionHandler.java | 19 +++- .../factory/ScoringFactory.java | 27 ++---- .../mapper/user/UserProfileMapper.java | 19 ++++ .../repository/event/EventRepository.java | 3 +- .../OrchestrationServiceProducerImpl.java | 77 +++++++--------- .../RecommendationServiceImpl.java | 66 ++++++++------ .../strategies/HistoryScoreStrategy.java | 90 ++++++++----------- .../strategies/ProfileScoreStrategy.java | 27 +++--- .../eventservice/utils/Haversine.java | 27 ++++++ 10 files changed, 201 insertions(+), 166 deletions(-) rename Microservices/event-service/src/main/java/app/sportahub/eventservice/{service/recommendation => }/factory/ScoringFactory.java (59%) create mode 100644 Microservices/event-service/src/main/java/app/sportahub/eventservice/mapper/user/UserProfileMapper.java create mode 100644 Microservices/event-service/src/main/java/app/sportahub/eventservice/utils/Haversine.java diff --git a/Microservices/event-service/src/main/java/app/sportahub/eventservice/config/kafka/KafkaProducerConfig.java b/Microservices/event-service/src/main/java/app/sportahub/eventservice/config/kafka/KafkaProducerConfig.java index 12a5ffa0..13892d9d 100644 --- a/Microservices/event-service/src/main/java/app/sportahub/eventservice/config/kafka/KafkaProducerConfig.java +++ b/Microservices/event-service/src/main/java/app/sportahub/eventservice/config/kafka/KafkaProducerConfig.java @@ -10,10 +10,17 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.kafka.annotation.EnableKafka; +import org.springframework.kafka.core.ConsumerFactory; import org.springframework.kafka.core.DefaultKafkaProducerFactory; import org.springframework.kafka.core.KafkaTemplate; import org.springframework.kafka.core.ProducerFactory; +import org.springframework.kafka.listener.ContainerProperties; +import org.springframework.kafka.listener.KafkaMessageListenerContainer; +import org.springframework.kafka.requestreply.ReplyingKafkaTemplate; import org.springframework.kafka.support.serializer.JsonSerializer; + +import app.sportahub.kafka.events.user.UserEvent; + import java.util.UUID; @EnableKafka @@ -33,7 +40,7 @@ public ProducerFactory producerFactory() { } @Bean - public KafkaTemplate kafkaTemplate(ProducerFactory producerFactory) { + public KafkaTemplate kafkaTemplate() { return new KafkaTemplate<>(producerFactory()); } @@ -41,7 +48,8 @@ public KafkaTemplate kafkaTemplate(ProducerFactory replyingKafkaTemplate( ProducerFactory producerFactory, KafkaMessageListenerContainer replyContainer) { - ReplyingKafkaTemplate template = new ReplyingKafkaTemplate<>(producerFactory, replyContainer); + ReplyingKafkaTemplate template = new ReplyingKafkaTemplate<>(producerFactory, + replyContainer); template.setDefaultReplyTimeout(Duration.ofSeconds(6)); return template; } diff --git a/Microservices/event-service/src/main/java/app/sportahub/eventservice/exception/GlobalExceptionHandler.java b/Microservices/event-service/src/main/java/app/sportahub/eventservice/exception/GlobalExceptionHandler.java index 8403a152..60894740 100644 --- a/Microservices/event-service/src/main/java/app/sportahub/eventservice/exception/GlobalExceptionHandler.java +++ b/Microservices/event-service/src/main/java/app/sportahub/eventservice/exception/GlobalExceptionHandler.java @@ -1,14 +1,20 @@ package app.sportahub.eventservice.exception; +import java.util.HashMap; +import java.util.Map; + +import org.springframework.core.Ordered; +import org.springframework.core.annotation.Order; +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.server.ResponseStatusException; -import java.util.HashMap; -import java.util.Map; +import lombok.extern.slf4j.Slf4j; @ControllerAdvice +@Slf4j public class GlobalExceptionHandler { @ExceptionHandler(ResponseStatusException.class) @@ -18,4 +24,13 @@ public class GlobalExceptionHandler { response.put("message", ex.getStatusCode().value()); return ResponseEntity.status(ex.getStatusCode()).body(response); } + + @ExceptionHandler(Exception.class) + public ResponseEntity> handleException(Exception ex) { + Map response = new HashMap<>(); + response.put("error", "Internal Server Error"); + response.put("message", ex.getMessage()); + log.error(ex.getMessage(), ex); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response); + } } \ No newline at end of file diff --git a/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/recommendation/factory/ScoringFactory.java b/Microservices/event-service/src/main/java/app/sportahub/eventservice/factory/ScoringFactory.java similarity index 59% rename from Microservices/event-service/src/main/java/app/sportahub/eventservice/service/recommendation/factory/ScoringFactory.java rename to Microservices/event-service/src/main/java/app/sportahub/eventservice/factory/ScoringFactory.java index a4993e54..a2936be1 100644 --- a/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/recommendation/factory/ScoringFactory.java +++ b/Microservices/event-service/src/main/java/app/sportahub/eventservice/factory/ScoringFactory.java @@ -1,10 +1,8 @@ -package app.sportahub.eventservice.service.recommendation.factory; +package app.sportahub.eventservice.factory; import java.util.List; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; - +import app.sportahub.eventservice.mapper.user.UserProfileMapper; import app.sportahub.eventservice.model.event.Event; import app.sportahub.eventservice.model.user.UserProfile; import app.sportahub.eventservice.service.kafka.producer.OrchestrationServiceProducer; @@ -13,34 +11,23 @@ import app.sportahub.eventservice.service.recommendation.strategies.ScoreStrategy; import lombok.extern.slf4j.Slf4j; - @Slf4j public class ScoringFactory { - + + private final UserProfileMapper userProfileMapper; private final OrchestrationServiceProducer orchestrationServiceProducer; public ScoringFactory(OrchestrationServiceProducer orchestrationServiceProducer) { this.orchestrationServiceProducer = orchestrationServiceProducer; + this.userProfileMapper = new UserProfileMapper(); } public ScoreStrategy getScoringStrategy(List userEventHistory, String userId) { - if(userEventHistory.isEmpty()){ - ObjectMapper objectMapper = new ObjectMapper(); + if (userEventHistory.isEmpty()) { String userString = orchestrationServiceProducer.getUserById(userId); - log.info("ScoringFactory::getScoringStrategy: user string {}", userString); - UserProfile userProfile; - try { - userProfile = objectMapper.readValue(userString, UserProfile.class); - log.info("ScoringFactory::getScoringStrategy: user profile {}", userProfile); - } catch (JsonProcessingException e) { - - log.error("Error processing JSON for user data", e); - throw new RuntimeException("Error processing JSON for user data"); - } - + UserProfile userProfile = userProfileMapper.userStringToUserProfile(userString); log.info("ScoringFactory::getScoringStrategy: user retrieved {}", userProfile); return new ProfileScoreStrategy(userProfile); - } else { return new HistoryScoreStrategy(userEventHistory); } diff --git a/Microservices/event-service/src/main/java/app/sportahub/eventservice/mapper/user/UserProfileMapper.java b/Microservices/event-service/src/main/java/app/sportahub/eventservice/mapper/user/UserProfileMapper.java new file mode 100644 index 00000000..fb44fc42 --- /dev/null +++ b/Microservices/event-service/src/main/java/app/sportahub/eventservice/mapper/user/UserProfileMapper.java @@ -0,0 +1,19 @@ +package app.sportahub.eventservice.mapper.user; + +import com.fasterxml.jackson.databind.ObjectMapper; + +import app.sportahub.eventservice.model.user.UserProfile; + +public class UserProfileMapper { + + public UserProfile userStringToUserProfile(String user) { + ObjectMapper objectMapper = new ObjectMapper(); + UserProfile userProfile; + try { + userProfile = objectMapper.readValue(user, UserProfile.class); + } catch (Exception e) { + throw new RuntimeException("Error processing JSON for user data"); + } + return userProfile; + } +} \ No newline at end of file diff --git a/Microservices/event-service/src/main/java/app/sportahub/eventservice/repository/event/EventRepository.java b/Microservices/event-service/src/main/java/app/sportahub/eventservice/repository/event/EventRepository.java index 05796d58..aa858f8e 100644 --- a/Microservices/event-service/src/main/java/app/sportahub/eventservice/repository/event/EventRepository.java +++ b/Microservices/event-service/src/main/java/app/sportahub/eventservice/repository/event/EventRepository.java @@ -25,8 +25,7 @@ public interface EventRepository extends MongoRepository, Searchi Page findByParticipantsUserId(String userId, Pageable pageable); - @Query("{ 'participants.userId' : ?0 }") - List findAllByParticipantUserId(String userId); + List findByParticipantsUserId(String userId); Page findByCreatedBy(String userId, Pageable pageable); diff --git a/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/kafka/producer/OrchestrationServiceProducerImpl.java b/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/kafka/producer/OrchestrationServiceProducerImpl.java index cb7e36bd..9ad814d0 100644 --- a/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/kafka/producer/OrchestrationServiceProducerImpl.java +++ b/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/kafka/producer/OrchestrationServiceProducerImpl.java @@ -52,52 +52,39 @@ public String getUserById(String userId) { Instant.now(), UUID.randomUUID().toString()); - try { - UserRequestEvent userRequestEvent = new UserRequestEvent(baseEvent, userId); - - ProducerRecord record = new ProducerRecord<>( - UserEvent.REQUEST_TOPIC, - userRequestEvent); - record.headers().add(KafkaHeaders.REPLY_TOPIC, UserEvent.RESPONSE_TOPIC.getBytes()); - - RequestReplyFuture future = replyingKafkaTemplate.sendAndReceive(record); - log.info("OrchestrationServiceProducerImpl::getUserById: sent request for user with id: {}", - userRequestEvent.getUserId()); - - SendResult sendResult = future.getSendFuture().get(); - sendResult.getProducerRecord().headers() - .forEach(header -> log.info( - "OrchestrationServiceProducerImpl::getUserById: header key: {}, header value: {}", - header.key(), header.value())); - - ConsumerRecord response = future.get(15, TimeUnit.SECONDS); - log.info("OrchestrationServiceProducerImpl::getUserById: received response for user with id: {}", - userRequestEvent.getUserId()); - - if (response.value() instanceof UserResponseEvent userResponseEvent - && Objects.equals(userResponseEvent.getBaseEvent().getCorrelationId(), - userRequestEvent.getBaseEvent().getCorrelationId())) { - log.info("OrchestrationServiceImpl::getUserById: response is of type UserResponseEvent: {}", - response.value()); - - return userResponseEvent.getUser(); - } else { - log.info("OrchestrationServiceImpl::getUserById: response is not of type UserResponseEvent: {}", - response.value()); - return null; - } - - } catch (InterruptedException e) { - log.error(e.getMessage()); - } catch (ExecutionException e) { - log.error(e.getMessage()); - } catch (TimeoutException e) { - log.error(e.getMessage()); - log.error(e.getCause().getMessage()); - } catch (Exception e) { - log.error(e.getMessage()); + UserRequestEvent userRequestEvent = new UserRequestEvent(baseEvent, userId); + + ProducerRecord record = new ProducerRecord<>( + UserEvent.REQUEST_TOPIC, + userRequestEvent); + record.headers().add(KafkaHeaders.REPLY_TOPIC, UserEvent.RESPONSE_TOPIC.getBytes()); + + RequestReplyFuture future = replyingKafkaTemplate.sendAndReceive(record); + log.info("OrchestrationServiceProducerImpl::getUserById: sent request for user with id: {}", + userRequestEvent.getUserId()); + + SendResult sendResult = future.getSendFuture().get(); + sendResult.getProducerRecord().headers() + .forEach(header -> log.info( + "OrchestrationServiceProducerImpl::getUserById: header key: {}, header value: {}", + header.key(), header.value())); + + ConsumerRecord response = future.get(15, TimeUnit.SECONDS); + log.info("OrchestrationServiceProducerImpl::getUserById: received response for user with id: {}", + userRequestEvent.getUserId()); + + if (response.value() instanceof UserResponseEvent userResponseEvent + && Objects.equals(userResponseEvent.getBaseEvent().getCorrelationId(), + userRequestEvent.getBaseEvent().getCorrelationId())) { + log.info("OrchestrationServiceImpl::getUserById: response is of type UserResponseEvent: {}", + response.value()); + + return userResponseEvent.getUser(); + } else { + log.info("OrchestrationServiceImpl::getUserById: response is not of type UserResponseEvent: {}", + response.value()); + return null; } - return "{}"; } } \ No newline at end of file diff --git a/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/recommendation/RecommendationServiceImpl.java b/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/recommendation/RecommendationServiceImpl.java index 75e584a9..2af8578e 100644 --- a/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/recommendation/RecommendationServiceImpl.java +++ b/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/recommendation/RecommendationServiceImpl.java @@ -20,11 +20,11 @@ import org.springframework.stereotype.Service; import app.sportahub.eventservice.dto.response.EventResponse; +import app.sportahub.eventservice.factory.ScoringFactory; import app.sportahub.eventservice.mapper.event.EventMapper; import app.sportahub.eventservice.model.event.Event; import app.sportahub.eventservice.repository.event.EventRepository; import app.sportahub.eventservice.service.kafka.producer.OrchestrationServiceProducer; -import app.sportahub.eventservice.service.recommendation.factory.ScoringFactory; import app.sportahub.eventservice.service.recommendation.strategies.ScoreStrategy; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -32,68 +32,76 @@ @Slf4j @Service("recommendationService") @RequiredArgsConstructor -public class RecommendationServiceImpl implements RecommendationService{ +public class RecommendationServiceImpl implements RecommendationService { private final EventRepository eventRepository; private final OrchestrationServiceProducer orchestrationServiceProducer; private final EventMapper eventMapper; @Override - public Page getRecommendations(String userId, double longitude, double latitude, double radius, int page, int size) { + public Page getRecommendations(String userId, double longitude, double latitude, double radius, + int page, int size) { GeoJsonPoint point = new GeoJsonPoint(longitude, latitude); Distance distance = new Distance(radius, Metrics.KILOMETERS); Pageable pageable = PageRequest.of(page, size); List eventsList = eventRepository.findByLocationCoordinatesNear(point, distance, pageable).getContent() - .stream() - .collect(Collectors.toList()); - - eventsList.removeIf(event -> !(event.getIsPrivate() && event.getWhitelistedUsers().contains(userId) ) - || isEventCutOffTimePassed(event.getCutOffTime())); - - if(eventsList.isEmpty()) { + .stream() + .collect(Collectors.toList()); + + eventsList.removeIf(event -> !(event.getIsPrivate() && event.getWhitelistedUsers().contains(userId)) + || isEventCutOffTimePassed(event.getCutOffTime())); + + if (eventsList.isEmpty()) { log.info("RecommendationServiceImpl::getRecommendations: no valid events found for user {}", userId); return new PageImpl<>(new ArrayList<>(), pageable, 0); } - log.info("RecommendationServiceImpl::getRecommendations: found {} events for user {}", eventsList.size(), userId); + log.info("RecommendationServiceImpl::getRecommendations: found {} events for user {}", eventsList.size(), + userId); - List userEventHistoryList = eventRepository.findAllByParticipantUserId(userId); + List userEventHistoryList = eventRepository.findByParticipantsUserId(userId); - ScoreStrategy scoreService = new ScoringFactory(orchestrationServiceProducer).getScoringStrategy(userEventHistoryList, userId); - log.info("RecommendationServiceImpl::getRecommendations: Strategy used for calculating recommendation scores: {}", scoreService.getClass().getSimpleName()); + ScoreStrategy scoreService = new ScoringFactory(orchestrationServiceProducer) + .getScoringStrategy(userEventHistoryList, userId); + log.info( + "RecommendationServiceImpl::getRecommendations: Strategy used for calculating recommendation scores: {}", + scoreService.getClass().getSimpleName()); Map eventScores = scoreService.computeScores(eventsList); - + List eventResponse = eventScores.entrySet().parallelStream() - .sorted((e1, e2) -> e2.getValue().compareTo(e1.getValue())) - .map(Map.Entry::getKey) - .map(eventMapper::eventToEventResponse) - .collect(Collectors.toList()); - - log.info("RecommendationServiceImpl::getRecommendations: returning {} events for user {}", eventResponse.size(), userId); - int fromIndex = (int) pageable.getOffset() > eventResponse.size() ? eventResponse.size() : (int) pageable.getOffset(); + .sorted((e1, e2) -> e2.getValue().compareTo(e1.getValue())) + .map(Map.Entry::getKey) + .map(eventMapper::eventToEventResponse) + .collect(Collectors.toList()); + + log.info("RecommendationServiceImpl::getRecommendations: returning {} events for user {}", eventResponse.size(), + userId); + int fromIndex = (int) pageable.getOffset() > eventResponse.size() ? eventResponse.size() + : (int) pageable.getOffset(); int toIndex = Math.min(fromIndex + size, eventResponse.size()); if (fromIndex > toIndex) { fromIndex = toIndex; } return new PageImpl<>(eventResponse.subList(fromIndex, toIndex), pageable, eventResponse.size()); } - + private boolean isEventCutOffTimePassed(String cutOffTime) { - try{ + try { LocalDateTime currentTime = LocalDateTime.now(); // handle for offset time - if(cutOffTime.contains("+") || cutOffTime.charAt(cutOffTime.length()-6) == '-' || cutOffTime.contains("Z")) { + if (cutOffTime.contains("+") || cutOffTime.charAt(cutOffTime.length() - 6) == '-' + || cutOffTime.contains("Z")) { ZoneId localZoneId = ZoneId.systemDefault(); ZoneOffset localZoneOffset = localZoneId.getRules().getOffset(currentTime); OffsetDateTime currentOffsetDateTime = currentTime.atOffset(localZoneOffset); return OffsetDateTime.parse(cutOffTime).isBefore(currentOffsetDateTime); - } + } // handle for local time else { return LocalDateTime.parse(cutOffTime).isBefore(currentTime); } - } catch (DateTimeParseException e) { + } catch (DateTimeParseException e) { return false; } - } -} \ No newline at end of file + } +} \ No newline at end of file diff --git a/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/recommendation/strategies/HistoryScoreStrategy.java b/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/recommendation/strategies/HistoryScoreStrategy.java index a8014a00..e5d131b7 100644 --- a/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/recommendation/strategies/HistoryScoreStrategy.java +++ b/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/recommendation/strategies/HistoryScoreStrategy.java @@ -10,31 +10,27 @@ import app.sportahub.eventservice.enums.SkillLevelEnum; import app.sportahub.eventservice.model.event.Event; import app.sportahub.eventservice.model.event.participant.Participant; +import app.sportahub.eventservice.utils.Haversine; public class HistoryScoreStrategy implements ScoreStrategy { private List userEventHistory; - // earth radius in km and conversion factor from degrees to radians - private static final double EARTH_RADIUS = 6371; - private static final double DEG_TO_RAD = Math.PI / 180.0; - // score weights + // score weights private static final double DISTANCE_WEIGHT = 2 / 5.0; private static final double CATEGORICAL_WEIGHT = 2 / 5.0; private static final double TIME_WEIGHT = 1 / 5.0; - public HistoryScoreStrategy(List userEventHistory) { this.userEventHistory = userEventHistory; } - + @Override public Map computeScores(List events) { Map eventScores = events.parallelStream().collect(Collectors.toConcurrentMap( - event -> event, - event -> generateEventScore(event, userEventHistory) - )); - + event -> event, + event -> generateEventScore(event, userEventHistory))); + return eventScores; } @@ -42,86 +38,74 @@ private double generateEventScore(Event event, List userEventHistoryList) List eventScores = new ArrayList<>(); userEventHistoryList.forEach(historyEvent -> { - if(historyEvent.getId().equals(event.getId())) { + if (historyEvent.getId().equals(event.getId())) { return; } - + double distanceScore = haversineDistance(historyEvent, event) / 100; double timeScore = timeSimilarity(historyEvent, event); double categoricalScore = jaccardSimilarity(historyEvent, event); - - double score = DISTANCE_WEIGHT * distanceScore + CATEGORICAL_WEIGHT * categoricalScore + timeScore * TIME_WEIGHT; - + + double score = DISTANCE_WEIGHT * distanceScore + CATEGORICAL_WEIGHT * categoricalScore + + timeScore * TIME_WEIGHT; + eventScores.add(score); }); - + double averageScore = eventScores.stream().mapToDouble(Double::doubleValue).average().orElse(0.0); - + return averageScore; } private double jaccardSimilarity(Event event1, Event event2) { Set participants1 = event1.getParticipants().stream() - .map(Participant::getUserId) - .collect(Collectors.toSet()); - + .map(Participant::getUserId) + .collect(Collectors.toSet()); + Set participants2 = event2.getParticipants().stream() - .map(Participant::getUserId) - .collect(Collectors.toSet()); - + .map(Participant::getUserId) + .collect(Collectors.toSet()); + Set intersection = new HashSet<>(participants1); intersection.retainAll(participants2); Set union = new HashSet<>(participants1); union.addAll(participants2); - + double participantScore = (double) intersection.size() / union.size(); - + Set skills1 = event1.getRequiredSkillLevel().stream() - .map(SkillLevelEnum::toString) - .collect(Collectors.toSet()); - + .map(SkillLevelEnum::toString) + .collect(Collectors.toSet()); + Set skills2 = event2.getRequiredSkillLevel().stream() - .map(SkillLevelEnum::toString) - .collect(Collectors.toSet()); - + .map(SkillLevelEnum::toString) + .collect(Collectors.toSet()); + Set intersectionSkills = new HashSet<>(skills1); intersectionSkills.retainAll(skills2); Set unionSkills = new HashSet<>(skills1); unionSkills.addAll(skills2); - + double skillScore = (double) intersectionSkills.size() / unionSkills.size(); - + double sportTypeScore = event1.getSportType().equalsIgnoreCase(event2.getSportType()) ? 1.0 : 0.0; double similarityScore = (participantScore + skillScore + sportTypeScore) / 3.0; - + return similarityScore; } - + private double timeSimilarity(Event event1, Event event2) { - double startTimeScore = 1 - Math.abs(event1.getStartTime().toSecondOfDay() - event2.getStartTime().toSecondOfDay()) / 86400.0; + double startTimeScore = 1 + - Math.abs(event1.getStartTime().toSecondOfDay() - event2.getStartTime().toSecondOfDay()) / 86400.0; double duration1 = event1.getDuration().isEmpty() ? 0.0 : Double.parseDouble(event1.getDuration()); double duration2 = event2.getDuration().isEmpty() ? 0.0 : Double.parseDouble(event2.getDuration()); double durationScore = 1 - Math.abs(duration1 - duration2) / 24.0; double similarityScore = (startTimeScore + durationScore) / 2.0; - + return similarityScore; } - + private double haversineDistance(Event event1, Event event2) { - double longitude1 = event1.getLocation().getCoordinates().getX() * DEG_TO_RAD; - double latitude1 = event1.getLocation().getCoordinates().getY() * DEG_TO_RAD; - double longitude2 = event2.getLocation().getCoordinates().getX() * DEG_TO_RAD; - double latitude2 = event2.getLocation().getCoordinates().getY() * DEG_TO_RAD; - - double dlat = latitude2 - latitude1; - double dlon = longitude2 - longitude1; - - double a = Math.pow(Math.sin(dlat / 2), 2) + - Math.pow(Math.sin(dlon / 2), 2) * - Math.cos(latitude1) * - Math.cos(latitude2); - - double distance = EARTH_RADIUS * 2 * Math.asin(Math.sqrt(a)); - return distance; + return Haversine.EventHaversineDistance(event1, event2); } } \ No newline at end of file diff --git a/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/recommendation/strategies/ProfileScoreStrategy.java b/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/recommendation/strategies/ProfileScoreStrategy.java index ebe51f63..04af2686 100644 --- a/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/recommendation/strategies/ProfileScoreStrategy.java +++ b/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/recommendation/strategies/ProfileScoreStrategy.java @@ -20,35 +20,36 @@ public ProfileScoreStrategy(UserProfile user) { @Override public Map computeScores(List events) { - log.info("ProfileScoreStrategy::computeScores: computing scores for {} events with user profile {}", events.size(), user); + log.info("ProfileScoreStrategy::computeScores: computing scores for {} events with user profile {}", + events.size(), user); Map eventScores = events.parallelStream().collect(Collectors.toConcurrentMap( - event -> event, - event -> generateEventScore(event) - )); + event -> event, + event -> generateEventScore(event))); return eventScores; } private double generateEventScore(Event event) { - if(user.getProfile() == null || user.getProfile().getSportsOfPreference().isEmpty()){ + if (user.getProfile() == null || user.getProfile().getSportsOfPreference().isEmpty()) { log.info("ProfileScoreStrategy::generateEventScore: user has no sports of preference, returning 0.0"); return 0.0; } - log.info("ProfileScoreStrategy::generateEventScore: user has sports of preference, calculating score for event {}", event); + log.info( + "ProfileScoreStrategy::generateEventScore: user has sports of preference, calculating score for event {}", + event); Map sports = user.getProfile().getSportsOfPreference().stream() - .collect(Collectors.toMap( - sport -> sport.getSport().toLowerCase().trim(), - sport -> sport.getRanking() - )); + .collect(Collectors.toMap( + sport -> sport.getSport().toLowerCase().trim(), + sport -> sport.getRanking())); Integer score = 0; - if(sports.containsKey(event.getSportType().toLowerCase().trim())) { + if (sports.containsKey(event.getSportType().toLowerCase().trim())) { score += 1; - if(event.getRequiredSkillLevel().contains(sports.get(event.getSportType()))){ + if (event.getRequiredSkillLevel().contains(sports.get(event.getSportType()))) { score += 1; } } - return score == 0 ? 0.0 : score/2.0; + return score == 0 ? 0.0 : score / 2.0; } } \ No newline at end of file diff --git a/Microservices/event-service/src/main/java/app/sportahub/eventservice/utils/Haversine.java b/Microservices/event-service/src/main/java/app/sportahub/eventservice/utils/Haversine.java new file mode 100644 index 00000000..b8bf4d17 --- /dev/null +++ b/Microservices/event-service/src/main/java/app/sportahub/eventservice/utils/Haversine.java @@ -0,0 +1,27 @@ +package app.sportahub.eventservice.utils; + +import app.sportahub.eventservice.model.event.Event; + +public class Haversine { + + private static final double EARTH_RADIUS = 6371; + private static final double DEG_TO_RAD = Math.PI / 180.0; + + public static double EventHaversineDistance(Event event1, Event event2) { + double longitude1 = event1.getLocation().getCoordinates().getX() * DEG_TO_RAD; + double latitude1 = event1.getLocation().getCoordinates().getY() * DEG_TO_RAD; + double longitude2 = event2.getLocation().getCoordinates().getX() * DEG_TO_RAD; + double latitude2 = event2.getLocation().getCoordinates().getY() * DEG_TO_RAD; + + double dlat = latitude2 - latitude1; + double dlon = longitude2 - longitude1; + + double a = Math.pow(Math.sin(dlat / 2), 2) + + Math.pow(Math.sin(dlon / 2), 2) * + Math.cos(latitude1) * + Math.cos(latitude2); + + double distance = EARTH_RADIUS * 2 * Math.asin(Math.sqrt(a)); + return distance; + } +} From ba8a1481683a4b8af5f1e0b2768ac65a3a2e00ef Mon Sep 17 00:00:00 2001 From: patrickmac3 Date: Wed, 2 Apr 2025 18:00:11 -0400 Subject: [PATCH 6/9] GH-424: [fix] updated orchestration service consumer in event-service to use new repository method for retrieving all events a user has participated in --- .../kafka/consumer/OrchestrationServiceConsumerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/kafka/consumer/OrchestrationServiceConsumerImpl.java b/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/kafka/consumer/OrchestrationServiceConsumerImpl.java index 5b9b3b9c..35615307 100644 --- a/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/kafka/consumer/OrchestrationServiceConsumerImpl.java +++ b/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/kafka/consumer/OrchestrationServiceConsumerImpl.java @@ -38,7 +38,7 @@ public void handleEventsByUserRequest( String userId = fetchEvent.getUserId(); - List eventIds = eventRepository.findAllByParticipantUserId(userId) + List eventIds = eventRepository.findByParticipantsUserId(userId) .stream() .map(Event::getId) .collect(Collectors.toList()); From 2ed06902675d3747b3307be71c9e215f9c1c95bb Mon Sep 17 00:00:00 2001 From: patrickmac3 Date: Thu, 10 Apr 2025 20:11:57 -0400 Subject: [PATCH 7/9] GH-424: [refractor] added the user events into the kafka event package --- .gradle/8.8/checksums/checksums.lock | Bin 17 -> 0 bytes .gradle/8.8/checksums/md5-checksums.bin | Bin 23197 -> 0 bytes .gradle/8.8/checksums/sha1-checksums.bin | Bin 26813 -> 0 bytes .../8.8/dependencies-accessors/gc.properties | 0 .gradle/8.8/fileChanges/last-build.bin | Bin 1 -> 0 bytes .gradle/8.8/fileHashes/fileHashes.bin | Bin 18547 -> 0 bytes .gradle/8.8/fileHashes/fileHashes.lock | Bin 17 -> 0 bytes .gradle/8.8/gc.properties | 0 .gradle/8.9/checksums/checksums.lock | Bin 17 -> 0 bytes .gradle/8.9/checksums/sha1-checksums.bin | Bin 24653 -> 0 bytes .../8.9/dependencies-accessors/gc.properties | 0 .../8.9/executionHistory/executionHistory.lock | Bin 17 -> 0 bytes .gradle/8.9/fileChanges/last-build.bin | Bin 1 -> 0 bytes .gradle/8.9/fileHashes/fileHashes.lock | Bin 17 -> 0 bytes .gradle/8.9/gc.properties | 0 .gradle/buildOutputCleanup/cache.properties | 2 +- .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43453 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 +++++++ libs/kafka-events/gradlew | 4 +--- libs/kafka-events/gradlew.bat | 2 -- .../events}/user/UserEvent.java | 2 +- .../events}/user/UserFetchEvent.java | 4 ++-- .../events}/user/UserFetchedEvent.java | 4 ++-- .../events}/user/UserRequestEvent.java | 4 ++-- .../events}/user/UserResponseEvent.java | 4 ++-- 25 files changed, 18 insertions(+), 15 deletions(-) delete mode 100644 .gradle/8.8/checksums/checksums.lock delete mode 100644 .gradle/8.8/checksums/md5-checksums.bin delete mode 100644 .gradle/8.8/checksums/sha1-checksums.bin delete mode 100644 .gradle/8.8/dependencies-accessors/gc.properties delete mode 100644 .gradle/8.8/fileChanges/last-build.bin delete mode 100644 .gradle/8.8/fileHashes/fileHashes.bin delete mode 100644 .gradle/8.8/fileHashes/fileHashes.lock delete mode 100644 .gradle/8.8/gc.properties delete mode 100644 .gradle/8.9/checksums/checksums.lock delete mode 100644 .gradle/8.9/checksums/sha1-checksums.bin delete mode 100644 .gradle/8.9/dependencies-accessors/gc.properties delete mode 100644 .gradle/8.9/executionHistory/executionHistory.lock delete mode 100644 .gradle/8.9/fileChanges/last-build.bin delete mode 100644 .gradle/8.9/fileHashes/fileHashes.lock delete mode 100644 .gradle/8.9/gc.properties create mode 100644 libs/kafka-events/gradle/wrapper/gradle-wrapper.jar create mode 100644 libs/kafka-events/gradle/wrapper/gradle-wrapper.properties rename libs/kafka-events/src/main/java/app/sportahub/{kafkevents => kafka/events}/user/UserEvent.java (87%) rename libs/kafka-events/src/main/java/app/sportahub/{kafkevents => kafka/events}/user/UserFetchEvent.java (87%) rename libs/kafka-events/src/main/java/app/sportahub/{kafkevents => kafka/events}/user/UserFetchedEvent.java (86%) rename libs/kafka-events/src/main/java/app/sportahub/{kafkevents => kafka/events}/user/UserRequestEvent.java (87%) rename libs/kafka-events/src/main/java/app/sportahub/{kafkevents => kafka/events}/user/UserResponseEvent.java (86%) diff --git a/.gradle/8.8/checksums/checksums.lock b/.gradle/8.8/checksums/checksums.lock deleted file mode 100644 index 89e73855e10ee67baeb5a59ee63f0e9ea2e1f93f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17 UcmZR!`o+@xp(^b diff --git a/.gradle/8.8/checksums/md5-checksums.bin b/.gradle/8.8/checksums/md5-checksums.bin deleted file mode 100644 index c9cc5275252c139daa1aa52e9ae4aa49d276a7b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23197 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 LK*~gechUa=PJK}r diff --git a/.gradle/8.8/checksums/sha1-checksums.bin b/.gradle/8.8/checksums/sha1-checksums.bin deleted file mode 100644 index 59a046bdf7d167830db3e28d0f50d0b7c7e90cbc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 26813 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 diff --git a/.gradle/8.8/gc.properties b/.gradle/8.8/gc.properties deleted file mode 100644 index e69de29b..00000000 diff --git a/.gradle/8.9/checksums/checksums.lock b/.gradle/8.9/checksums/checksums.lock deleted file mode 100644 index ac203378a85894051d4cb3a18d6a3f3cd625f138..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17 UcmZR++h%z!PA%;M0|b-+05!A(qyPW_ diff --git a/.gradle/8.9/checksums/sha1-checksums.bin b/.gradle/8.9/checksums/sha1-checksums.bin deleted file mode 100644 index afbdcad73370e6c46406f0ff130ed8851fdffa16..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24653 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 ZU+u5Ds=&d9VCd-|vEmSmhQbcE{s)_@rNICI diff --git a/.gradle/8.9/dependencies-accessors/gc.properties b/.gradle/8.9/dependencies-accessors/gc.properties deleted file mode 100644 index e69de29b..00000000 diff --git a/.gradle/8.9/executionHistory/executionHistory.lock b/.gradle/8.9/executionHistory/executionHistory.lock deleted file mode 100644 index 3f7fb203387383d6baef89813ac6bc72eee61dd4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17 TcmZQJD(hRaVAJ#a3{U_7I%x#< diff --git a/.gradle/8.9/fileChanges/last-build.bin b/.gradle/8.9/fileChanges/last-build.bin deleted file mode 100644 index f76dd238ade08917e6712764a16a22005a50573d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1 IcmZPo000310RR91 diff --git a/.gradle/8.9/fileHashes/fileHashes.lock b/.gradle/8.9/fileHashes/fileHashes.lock deleted file mode 100644 index 1643d56273e0c6028c31f1d7beddc0a9cd526a25..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17 ScmZRstSGp-*uYAU0SW*umjihK diff --git a/.gradle/8.9/gc.properties b/.gradle/8.9/gc.properties deleted file mode 100644 index e69de29b..00000000 diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties index 9c6b7dba..4df428e8 100644 --- a/.gradle/buildOutputCleanup/cache.properties +++ b/.gradle/buildOutputCleanup/cache.properties @@ -1,2 +1,2 @@ -#Tue Mar 25 22:21:14 EDT 2025 +#Thu Apr 10 14:53:51 EDT 2025 gradle.version=8.12 diff --git a/libs/kafka-events/gradle/wrapper/gradle-wrapper.jar b/libs/kafka-events/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e6441136f3d4ba8a0da8d277868979cfbc8ad796 GIT binary patch literal 43453 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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
NnX)EH+Nua)3Y(c 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 /dev/null && printf '%s\n' "$PWD" ) || exit +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/libs/kafka-events/gradlew.bat b/libs/kafka-events/gradlew.bat index 9d21a218..25da30db 100644 --- a/libs/kafka-events/gradlew.bat +++ b/libs/kafka-events/gradlew.bat @@ -13,8 +13,6 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem -@rem SPDX-License-Identifier: Apache-2.0 -@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## diff --git a/libs/kafka-events/src/main/java/app/sportahub/kafkevents/user/UserEvent.java b/libs/kafka-events/src/main/java/app/sportahub/kafka/events/user/UserEvent.java similarity index 87% rename from libs/kafka-events/src/main/java/app/sportahub/kafkevents/user/UserEvent.java rename to libs/kafka-events/src/main/java/app/sportahub/kafka/events/user/UserEvent.java index 3e8fbf0c..08fad101 100644 --- a/libs/kafka-events/src/main/java/app/sportahub/kafkevents/user/UserEvent.java +++ b/libs/kafka-events/src/main/java/app/sportahub/kafka/events/user/UserEvent.java @@ -1,4 +1,4 @@ -package app.sportahub.kafkevents.user; +package app.sportahub.kafka.events.user; public class UserEvent { public static final String REQUEST_TOPIC = "user.request"; diff --git a/libs/kafka-events/src/main/java/app/sportahub/kafkevents/user/UserFetchEvent.java b/libs/kafka-events/src/main/java/app/sportahub/kafka/events/user/UserFetchEvent.java similarity index 87% rename from libs/kafka-events/src/main/java/app/sportahub/kafkevents/user/UserFetchEvent.java rename to libs/kafka-events/src/main/java/app/sportahub/kafka/events/user/UserFetchEvent.java index 4b98d631..9f40e11a 100644 --- a/libs/kafka-events/src/main/java/app/sportahub/kafkevents/user/UserFetchEvent.java +++ b/libs/kafka-events/src/main/java/app/sportahub/kafka/events/user/UserFetchEvent.java @@ -1,6 +1,6 @@ -package app.sportahub.kafkevents.user; +package app.sportahub.kafka.events.user; -import app.sportahub.kafkevents.BaseEvent; +import app.sportahub.kafka.events.BaseEvent; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/libs/kafka-events/src/main/java/app/sportahub/kafkevents/user/UserFetchedEvent.java b/libs/kafka-events/src/main/java/app/sportahub/kafka/events/user/UserFetchedEvent.java similarity index 86% rename from libs/kafka-events/src/main/java/app/sportahub/kafkevents/user/UserFetchedEvent.java rename to libs/kafka-events/src/main/java/app/sportahub/kafka/events/user/UserFetchedEvent.java index cc6c07e3..2292f0ed 100644 --- a/libs/kafka-events/src/main/java/app/sportahub/kafkevents/user/UserFetchedEvent.java +++ b/libs/kafka-events/src/main/java/app/sportahub/kafka/events/user/UserFetchedEvent.java @@ -1,9 +1,9 @@ -package app.sportahub.kafkevents.user; +package app.sportahub.kafka.events.user; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import app.sportahub.kafkevents.BaseEvent; +import app.sportahub.kafka.events.BaseEvent; public class UserFetchedEvent { diff --git a/libs/kafka-events/src/main/java/app/sportahub/kafkevents/user/UserRequestEvent.java b/libs/kafka-events/src/main/java/app/sportahub/kafka/events/user/UserRequestEvent.java similarity index 87% rename from libs/kafka-events/src/main/java/app/sportahub/kafkevents/user/UserRequestEvent.java rename to libs/kafka-events/src/main/java/app/sportahub/kafka/events/user/UserRequestEvent.java index 1a195407..307cfa2f 100644 --- a/libs/kafka-events/src/main/java/app/sportahub/kafkevents/user/UserRequestEvent.java +++ b/libs/kafka-events/src/main/java/app/sportahub/kafka/events/user/UserRequestEvent.java @@ -1,6 +1,6 @@ -package app.sportahub.kafkevents.user; +package app.sportahub.kafka.events.user; -import app.sportahub.kafkevents.BaseEvent; +import app.sportahub.kafka.events.BaseEvent; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/libs/kafka-events/src/main/java/app/sportahub/kafkevents/user/UserResponseEvent.java b/libs/kafka-events/src/main/java/app/sportahub/kafka/events/user/UserResponseEvent.java similarity index 86% rename from libs/kafka-events/src/main/java/app/sportahub/kafkevents/user/UserResponseEvent.java rename to libs/kafka-events/src/main/java/app/sportahub/kafka/events/user/UserResponseEvent.java index 0b5afb75..64aab76f 100644 --- a/libs/kafka-events/src/main/java/app/sportahub/kafkevents/user/UserResponseEvent.java +++ b/libs/kafka-events/src/main/java/app/sportahub/kafka/events/user/UserResponseEvent.java @@ -1,9 +1,9 @@ -package app.sportahub.kafkevents.user; +package app.sportahub.kafka.events.user; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import app.sportahub.kafkevents.BaseEvent; +import app.sportahub.kafka.events.BaseEvent; public class UserResponseEvent { From 503695b15411658f8007b43f3140d9ddd9ae0b1d Mon Sep 17 00:00:00 2001 From: patrickmac3 Date: Thu, 10 Apr 2025 20:12:30 -0400 Subject: [PATCH 8/9] GH-424: [fix] fixed conflicts --- .../config/kafka/KafkaProducerConfig.java | 2 -- .../producer/OrchestrationServiceProducerImpl.java | 2 -- .../config/KafkaProducerConfig.java | 1 - .../service/consumer/UserServiceConsumerImpl.java | 12 +++++------- .../consumer/OrchestrationServiceConsumerImpl.java | 8 ++++---- libs/kafka-events/build.gradle | 2 +- 6 files changed, 10 insertions(+), 17 deletions(-) diff --git a/Microservices/event-service/src/main/java/app/sportahub/eventservice/config/kafka/KafkaProducerConfig.java b/Microservices/event-service/src/main/java/app/sportahub/eventservice/config/kafka/KafkaProducerConfig.java index 13892d9d..70f1bdb6 100644 --- a/Microservices/event-service/src/main/java/app/sportahub/eventservice/config/kafka/KafkaProducerConfig.java +++ b/Microservices/event-service/src/main/java/app/sportahub/eventservice/config/kafka/KafkaProducerConfig.java @@ -21,8 +21,6 @@ import app.sportahub.kafka.events.user.UserEvent; -import java.util.UUID; - @EnableKafka @Configuration public class KafkaProducerConfig { diff --git a/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/kafka/producer/OrchestrationServiceProducerImpl.java b/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/kafka/producer/OrchestrationServiceProducerImpl.java index 9ad814d0..c73503ec 100644 --- a/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/kafka/producer/OrchestrationServiceProducerImpl.java +++ b/Microservices/event-service/src/main/java/app/sportahub/eventservice/service/kafka/producer/OrchestrationServiceProducerImpl.java @@ -13,8 +13,6 @@ import java.time.Instant; import java.util.Objects; import java.util.UUID; -import java.util.concurrent.TimeoutException; -import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import org.springframework.kafka.support.SendResult; diff --git a/Microservices/orchestration-service/src/main/java/app/sportahub/orchestrationservice/config/KafkaProducerConfig.java b/Microservices/orchestration-service/src/main/java/app/sportahub/orchestrationservice/config/KafkaProducerConfig.java index ccaf5d03..0d100613 100644 --- a/Microservices/orchestration-service/src/main/java/app/sportahub/orchestrationservice/config/KafkaProducerConfig.java +++ b/Microservices/orchestration-service/src/main/java/app/sportahub/orchestrationservice/config/KafkaProducerConfig.java @@ -2,7 +2,6 @@ import app.sportahub.kafka.events.SportaKafkaEvents; import app.sportahub.kafka.events.user.UserEvent; -import app.sportahub.kafka.events.JoinedSportEventEvent.JoinedEventsByUserEvent; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.serialization.StringSerializer; import org.springframework.beans.factory.annotation.Value; diff --git a/Microservices/orchestration-service/src/main/java/app/sportahub/orchestrationservice/service/consumer/UserServiceConsumerImpl.java b/Microservices/orchestration-service/src/main/java/app/sportahub/orchestrationservice/service/consumer/UserServiceConsumerImpl.java index 3d35e450..47315bd3 100644 --- a/Microservices/orchestration-service/src/main/java/app/sportahub/orchestrationservice/service/consumer/UserServiceConsumerImpl.java +++ b/Microservices/orchestration-service/src/main/java/app/sportahub/orchestrationservice/service/consumer/UserServiceConsumerImpl.java @@ -4,11 +4,11 @@ import app.sportahub.kafka.events.SportaKafkaEvents; import app.sportahub.kafka.events.forgotpassword.ForgotPasswordRequestedEvent; import app.sportahub.kafka.events.forgotpassword.ForgotPasswordSendEmailEvent; -import app.sportahub.kafkevents.user.UserEvent; -import app.sportahub.kafkevents.user.UserFetchEvent; -import app.sportahub.kafkevents.user.UserFetchedEvent; -import app.sportahub.kafkevents.user.UserRequestEvent; -import app.sportahub.kafkevents.user.UserResponseEvent; +import app.sportahub.kafka.events.user.UserEvent; +import app.sportahub.kafka.events.user.UserFetchEvent; +import app.sportahub.kafka.events.user.UserFetchedEvent; +import app.sportahub.kafka.events.user.UserRequestEvent; +import app.sportahub.kafka.events.user.UserResponseEvent; import app.sportahub.kafka.events.joinsporteventevent.*; import app.sportahub.orchestrationservice.service.producer.EmailServiceProducer; import lombok.RequiredArgsConstructor; @@ -19,7 +19,6 @@ import org.apache.kafka.common.errors.TimeoutException; import org.apache.kafka.common.header.internals.RecordHeader; import org.springframework.kafka.annotation.KafkaListener; -import org.springframework.kafka.annotation.RetryableTopic; import org.springframework.kafka.core.KafkaTemplate; import org.springframework.kafka.requestreply.ReplyingKafkaTemplate; import org.springframework.kafka.requestreply.RequestReplyFuture; @@ -27,7 +26,6 @@ import org.springframework.kafka.support.SendResult; import org.springframework.messaging.handler.annotation.Header; import org.springframework.messaging.handler.annotation.Payload; -import org.springframework.retry.annotation.Backoff; import org.springframework.stereotype.Service; import java.time.Instant; diff --git a/Microservices/user-service/src/main/java/app/sportahub/userservice/service/kafka/consumer/OrchestrationServiceConsumerImpl.java b/Microservices/user-service/src/main/java/app/sportahub/userservice/service/kafka/consumer/OrchestrationServiceConsumerImpl.java index 040cdb67..45db594e 100644 --- a/Microservices/user-service/src/main/java/app/sportahub/userservice/service/kafka/consumer/OrchestrationServiceConsumerImpl.java +++ b/Microservices/user-service/src/main/java/app/sportahub/userservice/service/kafka/consumer/OrchestrationServiceConsumerImpl.java @@ -15,10 +15,10 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import app.sportahub.kafkevents.BaseEvent; -import app.sportahub.kafkevents.user.UserEvent; -import app.sportahub.kafkevents.user.UserFetchEvent; -import app.sportahub.kafkevents.user.UserFetchedEvent; +import app.sportahub.kafka.events.BaseEvent; +import app.sportahub.kafka.events.user.UserEvent; +import app.sportahub.kafka.events.user.UserFetchEvent; +import app.sportahub.kafka.events.user.UserFetchedEvent; import app.sportahub.userservice.model.user.User; import app.sportahub.userservice.repository.user.UserRepository; import lombok.AllArgsConstructor; diff --git a/libs/kafka-events/build.gradle b/libs/kafka-events/build.gradle index d0955090..dff47bd8 100644 --- a/libs/kafka-events/build.gradle +++ b/libs/kafka-events/build.gradle @@ -4,7 +4,7 @@ plugins { } group = 'app.sportahub' -version = '1.0.8' +version = '1.0.9' publishing { repositories { From 8922353807a280d102380cd91c66f9b426c2c6b3 Mon Sep 17 00:00:00 2001 From: patrickmac3 Date: Thu, 10 Apr 2025 21:33:19 -0400 Subject: [PATCH 9/9] GH-424: [fix] removing .gradle directory --- .gradle/buildOutputCleanup/cache.properties | 2 -- .gradle/vcs-1/gc.properties | 0 2 files changed, 2 deletions(-) delete mode 100644 .gradle/buildOutputCleanup/cache.properties delete mode 100644 .gradle/vcs-1/gc.properties diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties deleted file mode 100644 index 4df428e8..00000000 --- a/.gradle/buildOutputCleanup/cache.properties +++ /dev/null @@ -1,2 +0,0 @@ -#Thu Apr 10 14:53:51 EDT 2025 -gradle.version=8.12 diff --git a/.gradle/vcs-1/gc.properties b/.gradle/vcs-1/gc.properties deleted file mode 100644 index e69de29b..00000000