Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,11 @@
<artifactId>description-ml-api</artifactId>
<version>0.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
<version>1.3.1</version>
</dependency>
</dependencies>

<!-- Нужен для пуша jar в репозиторий libs-snapshot-local в jfrog artifactory -->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package com.wine.to.up.apigateway.service.controller;

import com.netflix.zuul.context.RequestContext;
import com.wine.to.up.apigateway.service.dto.ServiceStatusDTO;
import com.wine.to.up.apigateway.service.dto.WinePositionWithFavorites;
import com.wine.to.up.apigateway.service.dto.WinePositionWithRecommendations;
import com.wine.to.up.apigateway.service.jwt.JwtTokenProvider;
import com.wine.to.up.apigateway.service.service.FavoritePositionService;
import com.wine.to.up.apigateway.service.status.CallServices;
import com.wine.to.up.catalog.service.api.dto.WinePositionTrueResponse;
import com.wine.to.up.catalog.service.api.feign.FavoriteWinePositionsClient;
import com.wine.to.up.catalog.service.api.feign.WinePositionClient;
Expand All @@ -15,6 +17,8 @@
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

Expand Down Expand Up @@ -43,6 +47,8 @@ public class ApiGatewayController {

private final WineRecommendationServiceClient wineRecommendationServiceClient;

private final CallServices callServices;


@ApiOperation(value = "Get favourites wine positions",
nickname = "getFavouritesPositions",
Expand Down Expand Up @@ -97,6 +103,11 @@ public List<WinePositionWithFavorites> getWinePositions(@RequestParam(required =
return favoritePositionService.convertWinePositions(positions, ids);
}

@GetMapping("/statuses")
public ResponseEntity<List<ServiceStatusDTO>> servicesStatuses() {
return new ResponseEntity<>(callServices.checkServices(), HttpStatus.OK);
}

@GetMapping("/position/true/byId/{id}")
public WinePositionWithFavorites getWineById(@Valid @PathVariable(name = "id") String winePositionId) {
log.info("Got request for positions by id");
Expand Down Expand Up @@ -163,11 +174,11 @@ private Set<String> getFavoriteIds(String accessToken) {

private List<WinePositionTrueResponse> getWinePositionTrueResponses(String page, String amount, List<String> sortByPair, String filterBy) {
Map<String, List<String>> query = new HashMap<>();
List<String> amountList = new ArrayList<>();
List<String> amountList = new ArrayList<>();
amountList.add(amount);
List<String> pageList = new ArrayList<>();
List<String> pageList = new ArrayList<>();
pageList.add(page);
List<String> filterByList = new ArrayList<>();
List<String> filterByList = new ArrayList<>();
filterByList.add(filterBy);
query.put("sortByPair", sortByPair);
query.put("amount", amountList);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package com.wine.to.up.apigateway.service.dto;

import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

@AllArgsConstructor
@NoArgsConstructor
@Data
public class ServiceStatusDTO {
private String serviceName;
private Boolean isActive;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
package com.wine.to.up.apigateway.service.status;

import com.wine.to.up.apigateway.service.dto.ServiceStatusDTO;
import org.apache.commons.validator.UrlValidator;
import org.springframework.stereotype.Component;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

@Component
public class CallServices {
private static final ArrayList<String> services = (ArrayList<String>) Arrays.asList(
"http://proxy-service:8080",
"http://catalog-service:8080",
"http://user-service:8080",
"http://ml-description-based-recommendation-service:5000",
"http://ml-team-2-service:80",
"http://ml3-recommendation-service:8000",
"http://segandrec-service:5000",
"http://notification-service:8080"
);
private static final String extractServiceNameRegExp = "http:\\/\\/([-\\w]+):[0-9]+";

private String extractServiceName(String service) {
Pattern pattern = Pattern.compile(extractServiceNameRegExp);
Matcher matcher = pattern.matcher(service);
return matcher.group(1);
}

private Boolean getStatus(String service) {
UrlValidator urlValidator = new UrlValidator();
return urlValidator.isValid(service);
}

public List<ServiceStatusDTO> checkServices() {
List<ServiceStatusDTO> serviceStatusDTOS = new ArrayList<>();

for(String service : services) {
ServiceStatusDTO serviceStatusDTO = new ServiceStatusDTO();

serviceStatusDTO.setServiceName(extractServiceName(service));
serviceStatusDTO.setIsActive(getStatus(service));
serviceStatusDTOS.add(serviceStatusDTO);
}

return serviceStatusDTOS;
}
}