Skip to content

Commit

Permalink
make favourites return normally data
Browse files Browse the repository at this point in the history
  • Loading branch information
Fagorym committed Nov 8, 2023
1 parent 2db2857 commit 9351c5c
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 7 deletions.
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
package ru.nsu.fit.directors.userservice.controller;

import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import ru.nsu.fit.directors.userservice.model.Company;
import ru.nsu.fit.directors.userservice.dto.CompanyDto;
import ru.nsu.fit.directors.userservice.service.FavouritesService;

import java.util.List;
Expand All @@ -19,7 +18,7 @@ public class FavouritesController {
private final FavouritesService favouritesService;

@GetMapping
public List<Company> getFavourites() {
public List<CompanyDto> getFavourites() {
return favouritesService.getFavourites();
}

Expand Down
12 changes: 12 additions & 0 deletions src/main/java/ru/nsu/fit/directors/userservice/dto/CompanyDto.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package ru.nsu.fit.directors.userservice.dto;

public record CompanyDto(
Float rating,
String address,
String image,
Boolean hasMap,
Boolean hasCardPayment,
String name,
Long id
) {
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.stereotype.Component;
import ru.nsu.fit.directors.userservice.api.EstablishmentApi;
import ru.nsu.fit.directors.userservice.dto.CompanyDto;
import ru.nsu.fit.directors.userservice.model.Company;

import java.util.List;
Expand All @@ -21,7 +22,7 @@ public Company getCompanyById(Long establishmentId) {
);
}

public List<Company> getCompaniesByIds(List<Long> ids) {
public List<CompanyDto> getCompaniesByIds(List<Long> ids) {
return establishmentApi.syncListGetWithParams(
uriBuilder -> uriBuilder.path("/internal/establishment").queryParam("ids", ids).build(),
new ParameterizedTypeReference<>() {}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ru.nsu.fit.directors.userservice.service;

import ru.nsu.fit.directors.userservice.model.Company;
import ru.nsu.fit.directors.userservice.dto.CompanyDto;

import javax.annotation.ParametersAreNonnullByDefault;
import java.util.List;
Expand All @@ -11,5 +11,5 @@ public interface FavouritesService {

void deleteFromFavourites(Long establishmentId);

List<Company> getFavourites();
List<CompanyDto> getFavourites();
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import jakarta.transaction.Transactional;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;
import ru.nsu.fit.directors.userservice.dto.CompanyDto;
import ru.nsu.fit.directors.userservice.model.Company;
import ru.nsu.fit.directors.userservice.model.User;
import ru.nsu.fit.directors.userservice.repository.CompanyRepository;
Expand Down Expand Up @@ -41,7 +42,7 @@ public void deleteFromFavourites(Long establishmentId) {

@Override
@Transactional
public List<Company> getFavourites() {
public List<CompanyDto> getFavourites() {
User loggedUser = securityService.getLoggedInUser();
return companyService.getCompaniesByIds(loggedUser.getFavourites().stream().map(Company::getId).toList());
}
Expand Down

0 comments on commit 9351c5c

Please sign in to comment.