Skip to content

feat: implement recommendation system (collector, aggregator, analyzer) #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mult1k33 merged 4 commits into from
Feb 17, 2026
Merged

feat: implement recommendation system (collector, aggregator, analyzer) #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3e342bc
feat: implement recommendation system (collector, aggregator, analyzer)
Mult1k33 Feb 12, 2026
ffa96b0
fix: protobuf version conflict
Mult1k33 Feb 12, 2026
2a3f561
fix: configure protobuf plugin for multi-platform build
Mult1k33 Feb 13, 2026
905e372
fix: reorder fields and fix double comparison in SimilarityCalculator
Mult1k33 Feb 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions .run/Deployment compose-local.run.xml
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions .run/MainApplication (local).run.xml
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions .run/MainApplication.run.xml
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions .run/StatApplication (local).run.xml
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions .run/StatApplication.run.xml
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions core/comment-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,6 @@
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>ru.yandex.practicum</groupId>
<artifactId>stats-dto</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
Expand Down Expand Up @@ -95,7 +89,6 @@
<dependency>
<groupId>org.springframework.retry</groupId>
<artifactId>spring-retry</artifactId>
<version>2.0.5</version>
</dependency>

<dependency>
Expand Down
7 changes: 0 additions & 7 deletions core/event-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,6 @@
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>ru.yandex.practicum</groupId>
<artifactId>stats-dto</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
Expand Down Expand Up @@ -95,7 +89,6 @@
<dependency>
<groupId>org.springframework.retry</groupId>
<artifactId>spring-retry</artifactId>
<version>2.0.5</version>
</dependency>

<dependency>
Expand Down
27 changes: 25 additions & 2 deletions core/event-service/src/main/java/ru/yandex/practicum/controller/PublicEventController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,15 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.domain.PageRequest;
import org.springframework.http.HttpStatus;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import ru.practicum.ewm.stats.proto.RecommendedEventProto;
import ru.yandex.practicum.dto.event.*;
import ru.yandex.practicum.service.EventService;

import java.util.List;
import java.util.stream.Stream;

@Slf4j
@Validated
Expand All @@ -34,8 +37,28 @@ public List<EventShortDto> getEventsPublic(@ModelAttribute @Valid SearchEventPub

@GetMapping("/{id}")
public EventFullDto getEventByIdPublic(@PathVariable("id") @Positive Long eventId,
HttpServletRequest httpRequest) {
HttpServletRequest httpRequest,
@RequestHeader("X-EWM-USER-ID") Long userId) {
log.debug("Controller: getEventByIdPublic eventId={}", eventId);
return eventService.getEventByIdPublic(eventId, httpRequest.getRemoteAddr());
return eventService.getEventByIdPublic(eventId, httpRequest.getRemoteAddr(), userId);
}

@GetMapping("/recommendations")
public Stream<RecommendedEventProto> getRecommendations(
@RequestHeader("X-EWM-USER-ID") Long userId,
@RequestParam(defaultValue = "10") int maxResults) {

log.debug("Controller: getRecommendations userId={}, maxResults={}", userId, maxResults);
return eventService.getRecommendationsForUser(userId, maxResults);
}

@PutMapping("/{eventId}/like")
@ResponseStatus(HttpStatus.OK)
public void likeEvent(
@PathVariable Long eventId,
@RequestHeader("X-EWM-USER-ID") Long userId) {

log.debug("Controller: likeEvent eventId={}, userId={}", eventId, userId);
eventService.likeEvent(userId, eventId);
}
}
6 changes: 3 additions & 3 deletions core/event-service/src/main/java/ru/yandex/practicum/mapper/EventMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public interface EventMapper {
@Mapping(target = "createdOn", ignore = true)
@Mapping(target = "publishedOn", ignore = true)
@Mapping(target = "confirmedRequests", ignore = true)
@Mapping(target = "views", ignore = true)
@Mapping(target = "rating", ignore = true)
Event toEntity(NewEventDto dto, Long initiatorId, Category category);

@Mapping(target = "initiator", ignore = true)
Expand All @@ -32,7 +32,7 @@ public interface EventMapper {
@Mapping(target = "publishedOn", ignore = true)
@Mapping(target = "state", ignore = true)
@Mapping(target = "category", ignore = true)
@Mapping(target = "views", ignore = true)
@Mapping(target = "rating", ignore = true)
@Mapping(target = "confirmedRequests", ignore = true)
@BeanMapping(nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)
void updateEventFromUserRequest(UpdateEventUserRequest request, @MappingTarget Event event, Category category);
Expand All @@ -43,7 +43,7 @@ public interface EventMapper {
@Mapping(target = "createdOn", ignore = true)
@Mapping(target = "publishedOn", ignore = true)
@Mapping(target = "state", ignore = true)
@Mapping(target = "views", ignore = true)
@Mapping(target = "rating", ignore = true)
@Mapping(target = "confirmedRequests", ignore = true)
@BeanMapping(nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)
void updateEventFromAdminRequest(UpdateEventAdminRequest request, @MappingTarget Event event, Category category);
Expand Down
5 changes: 3 additions & 2 deletions core/event-service/src/main/java/ru/yandex/practicum/model/Event.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public class Event {
private Location location;

@Column(nullable = false)
@Builder.Default
private Boolean paid = false;

@Column(name = "participant_limit", nullable = false)
Expand All @@ -71,9 +72,9 @@ public class Event {
@Builder.Default
private Integer confirmedRequests = 0;

@Column(name = "views", nullable = false)
@Column(name = "rating", nullable = false)
@Builder.Default
private Long views = 0L;
private Double rating = 0.0;

public void pending() {
this.state = EventState.PENDING;
Expand Down
8 changes: 7 additions & 1 deletion core/event-service/src/main/java/ru/yandex/practicum/service/EventService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package ru.yandex.practicum.service;

import org.springframework.data.domain.Pageable;
import ru.practicum.ewm.stats.proto.RecommendedEventProto;
import ru.yandex.practicum.dto.event.*;
import ru.yandex.practicum.model.Event;

import java.util.List;
import java.util.stream.Stream;

public interface EventService {
List<EventShortDto> getEvents(Long userId, Pageable pageable);
Expand All @@ -23,5 +25,9 @@ public interface EventService {

List<EventShortDto> getEventsPublic(SearchEventPublicRequest requestParams, Pageable pageable, String ip);

EventFullDto getEventByIdPublic(Long eventId, String ip);
EventFullDto getEventByIdPublic(Long eventId, String ip, Long userId);

Stream<RecommendedEventProto> getRecommendationsForUser(Long userId, int maxResults);

void likeEvent(Long userId, Long eventId);
}
Loading