Этап 3. Добавляем рекомендательный сервис

core/aggregation-api/pom.xml

@@ -14,12 +14,6 @@
     <packaging>jar</packaging>
 
     <dependencies>
-        <dependency>
-            <groupId>ru.practicum</groupId>
-            <artifactId>stat-dto</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-        </dependency>
-
         <dependency>
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>

core/aggregation-api/src/main/java/ru/practicum/aggregation/dto/event/output/EventFullDto.java

@@ -26,8 +26,7 @@
  * <code>boolean requestModeration</code><br/>
  * <code>EventState state</code><br/>
  * <code>String title</code><br/>
- * <code>Long views</code><br/>
- * <code>long rate</code>
+ * <code>double rating</code>
  */
 @Builder
 public record EventFullDto(
@@ -68,8 +67,6 @@ public record EventFullDto(
 		@NotBlank
 		String title,
 
-		Long views,
-
-		long rate
+		double rating
 ) {
 }

core/aggregation-api/src/main/java/ru/practicum/aggregation/dto/event/output/EventShortDto.java

@@ -16,8 +16,7 @@
  * {@link UserShortDto} initiator<br/>
  * <code>boolean</code> paid<br/>
  * {@link String} title<br/>
- * <code>long</code> views<br/>
- * <code>long</code> rate
+ * <code>double</code> rateing
  */
 @Builder
 public record EventShortDto(
@@ -29,7 +28,6 @@ public record EventShortDto(
 		UserShortDto initiator,
 		boolean paid,
 		String title,
-		long views,
-		long rate
+		double rating
 ) {
 }

core/event-service/pom.xml

@@ -16,12 +16,12 @@
     <dependencies>
         <dependency>
             <groupId>ru.practicum</groupId>
-            <artifactId>stat-dto</artifactId>
+            <artifactId>aggregation-api</artifactId>
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>ru.practicum</groupId>
-            <artifactId>aggregation-api</artifactId>
+            <artifactId>stats-client</artifactId>
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
 

core/event-service/src/main/java/ru/practicum/ewm/events/EventServiceApp.java

@@ -7,23 +7,22 @@
 import org.springframework.context.annotation.ComponentScan;
 import ru.practicum.aggregation.client.event.EventClient;
 import ru.practicum.aggregation.client.request.RequestClient;
-import ru.practicum.aggregation.client.stats.StatsClient;
 import ru.practicum.aggregation.client.user.UserClient;
 import ru.practicum.aggregation.config.JacksonConfiguration;
 
 @SpringBootApplication
 @EnableFeignClients(clients = {
 		UserClient.class,
 		EventClient.class,
-		RequestClient.class,
-		StatsClient.class
+		RequestClient.class
 })
 @ComponentScan(value = {
 		"ru.practicum.ewm.events",
 		"ru.practicum.aggregation.config",
 		"ru.practicum.aggregation.client",
 		"ru.practicum.aggregation.error",
-		"ru.practicum.aggregation.repository"
+		"ru.practicum.aggregation.repository",
+		"ru.practicum.stats.client.grpc"
 })
 @ConfigurationPropertiesScan(basePackageClasses = JacksonConfiguration.class)
 public class EventServiceApp {

core/event-service/src/main/java/ru/practicum/ewm/events/controller/free/FreeEventController.java

@@ -11,7 +11,6 @@
 import ru.practicum.aggregation.dto.event.output.EventFullDto;
 import ru.practicum.aggregation.dto.event.output.EventShortDto;
 import ru.practicum.aggregation.model.data.FreeGetData;
-import ru.practicum.aggregation.repository.StatsFeignRepository;
 import ru.practicum.ewm.events.service.event.EventService;
 
 import java.time.LocalDateTime;
@@ -25,7 +24,6 @@
 public class FreeEventController {
 
 	EventService eventService;
-	StatsFeignRepository statsFeignRepository;
 
 	/**
 	 * Обратите внимание:<br/>
@@ -90,10 +88,7 @@ public List<EventShortDto> getFreeEvents(
 				Получение событий с возможностью фильтрации
 				{} {}""", request.getMethod(), request.getRequestURI());
 
-		var result = eventService.getFreeEvents(freeGetData, request);
-		statsFeignRepository.sendHitRequest(request);
-
-		return result;
+		return eventService.getFreeEvents(freeGetData, request);
 	}
 
 	@GetMapping(value = "/{eventId}")
@@ -105,10 +100,7 @@ public EventFullDto getFreeEventById(@PathVariable Long eventId,
 				Получение подробной информации об опубликованном событии по его идентификатору.
 				{} {}""", request.getMethod(), request.getRequestURI());
 
-		var result = eventService.getFreeEventById(eventId, request);
-		statsFeignRepository.sendHitRequest(request);
-
-		return result;
+		return eventService.getFreeEventById(eventId, request);
 	}
 
 }