Compare commits
12 Commits
2b0f816633
...
main
Author | SHA1 | Date | |
---|---|---|---|
1e42f24e3a
|
|||
740e1a0279
|
|||
13be17fa8f
|
|||
21199307c7
|
|||
e07f48f39d | |||
53dcde6bd9 | |||
eca6f50730 | |||
4d99a59947 | |||
f2eee1752d
|
|||
9cc7cede69 | |||
9540a71307 | |||
55bbb79510 |
3
.env.example
Normal file
3
.env.example
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
KODIK_TOKEN=YOUR_KODIK_TOKEN
|
||||||
|
EUREKA_SCHEMA=http
|
||||||
|
EUREKA_HOST=anyame-vue-bff:8080
|
@ -2,9 +2,9 @@
|
|||||||
FROM maven:3.9.6-eclipse-temurin-21 AS builder
|
FROM maven:3.9.6-eclipse-temurin-21 AS builder
|
||||||
WORKDIR /workspace
|
WORKDIR /workspace
|
||||||
COPY pom.xml .
|
COPY pom.xml .
|
||||||
RUN mvn dependency:go-offline -B
|
RUN --mount=type=cache,target=/root/.m2 mvn dependency:go-offline -B
|
||||||
COPY src ./src
|
COPY src ./src
|
||||||
RUN mvn clean package -DskipTests
|
RUN --mount=type=cache,target=/root/.m2 mvn clean package -DskipTests
|
||||||
|
|
||||||
# Create optimized runtime
|
# Create optimized runtime
|
||||||
FROM eclipse-temurin:21 AS app-build
|
FROM eclipse-temurin:21 AS app-build
|
||||||
|
14
compose.yml
14
compose.yml
@ -1,11 +1,15 @@
|
|||||||
services:
|
services:
|
||||||
search:
|
kodik-search:
|
||||||
image: anyame-search:latest
|
image: anyame-kodik-search:latest
|
||||||
ports:
|
ports:
|
||||||
- 8080:8080
|
- 8080:8080
|
||||||
env_file: .env
|
env_file: .env
|
||||||
networks:
|
networks:
|
||||||
- anyame
|
- anyame-shared
|
||||||
|
- elk-network
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
anyame:
|
anyame-shared:
|
||||||
driver: bridge
|
external: true
|
||||||
|
elk-network:
|
||||||
|
external: true
|
||||||
|
18
pom.xml
18
pom.xml
@ -6,13 +6,13 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-parent</artifactId>
|
<artifactId>spring-boot-starter-parent</artifactId>
|
||||||
<version>3.5.0</version>
|
<version>3.5.5</version>
|
||||||
<relativePath /> <!-- lookup parent from repository -->
|
<relativePath /> <!-- lookup parent from repository -->
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>com.backend.search.kodik.service</groupId>
|
<groupId>com.backend.search.kodik.service</groupId>
|
||||||
<artifactId>anyame-backend</artifactId>
|
<artifactId>anyame-kodik-search-backend</artifactId>
|
||||||
<version>0.0.1-SNAPSHOT</version>
|
<version>0.0.1-SNAPSHOT</version>
|
||||||
<name>anyame-backend</name>
|
<name>anyame-kodik-search-backend</name>
|
||||||
<description>Kodik search service for anyame</description>
|
<description>Kodik search service for anyame</description>
|
||||||
<url />
|
<url />
|
||||||
<licenses>
|
<licenses>
|
||||||
@ -33,6 +33,8 @@
|
|||||||
<retrofit.version>3.0.0</retrofit.version>
|
<retrofit.version>3.0.0</retrofit.version>
|
||||||
<spring-dotenv.version>4.0.0</spring-dotenv.version>
|
<spring-dotenv.version>4.0.0</spring-dotenv.version>
|
||||||
<springdoc-openapi-starter.version>2.8.9</springdoc-openapi-starter.version>
|
<springdoc-openapi-starter.version>2.8.9</springdoc-openapi-starter.version>
|
||||||
|
<spring-eureka-client.version>4.3.0</spring-eureka-client.version>
|
||||||
|
<logstash-logback-encoder.version>8.1</logstash-logback-encoder.version>
|
||||||
</properties>
|
</properties>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
@ -60,6 +62,16 @@
|
|||||||
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
|
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
|
||||||
<version>${springdoc-openapi-starter.version}</version>
|
<version>${springdoc-openapi-starter.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework.cloud</groupId>
|
||||||
|
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
|
||||||
|
<version>${spring-eureka-client.version}</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>net.logstash.logback</groupId>
|
||||||
|
<artifactId>logstash-logback-encoder</artifactId>
|
||||||
|
<version>${logstash-logback-encoder.version}</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
@ -13,6 +13,7 @@ import org.springframework.web.server.ResponseStatusException;
|
|||||||
import com.backend.search.kodik.service.anyame_backend.api.KodikAPI;
|
import com.backend.search.kodik.service.anyame_backend.api.KodikAPI;
|
||||||
import com.backend.search.kodik.service.anyame_backend.api.model.KodikResponse;
|
import com.backend.search.kodik.service.anyame_backend.api.model.KodikResponse;
|
||||||
import com.backend.search.kodik.service.anyame_backend.component.KodikAPITokenProvider;
|
import com.backend.search.kodik.service.anyame_backend.component.KodikAPITokenProvider;
|
||||||
|
import com.backend.search.kodik.service.anyame_backend.service.KodikSearchFilterService;
|
||||||
|
|
||||||
import retrofit2.Response;
|
import retrofit2.Response;
|
||||||
|
|
||||||
@ -21,10 +22,13 @@ public class SearchController {
|
|||||||
Logger log = LoggerFactory.getLogger(SearchController.class);
|
Logger log = LoggerFactory.getLogger(SearchController.class);
|
||||||
private final KodikAPI kodikAPI;
|
private final KodikAPI kodikAPI;
|
||||||
private final KodikAPITokenProvider tokenProvider;
|
private final KodikAPITokenProvider tokenProvider;
|
||||||
|
private final KodikSearchFilterService searchFilterService;
|
||||||
|
|
||||||
public SearchController(KodikAPI kodikAPI, KodikAPITokenProvider tokenProvider) {
|
public SearchController(KodikAPI kodikAPI, KodikAPITokenProvider tokenProvider,
|
||||||
|
KodikSearchFilterService searchFilterService) {
|
||||||
this.kodikAPI = kodikAPI;
|
this.kodikAPI = kodikAPI;
|
||||||
this.tokenProvider = tokenProvider;
|
this.tokenProvider = tokenProvider;
|
||||||
|
this.searchFilterService = searchFilterService;
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/search")
|
@GetMapping("/search")
|
||||||
@ -36,8 +40,7 @@ public class SearchController {
|
|||||||
response.message());
|
response.message());
|
||||||
throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "bad response, code: " + response.code());
|
throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "bad response, code: " + response.code());
|
||||||
}
|
}
|
||||||
log.info("search result {}", response.body());
|
return searchFilterService.filter(response.body());
|
||||||
return response.body();
|
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
log.warn("i/o error", e);
|
log.warn("i/o error", e);
|
||||||
throw new ResponseStatusException(HttpStatus.SERVICE_UNAVAILABLE, "i/o error");
|
throw new ResponseStatusException(HttpStatus.SERVICE_UNAVAILABLE, "i/o error");
|
||||||
|
@ -0,0 +1,44 @@
|
|||||||
|
package com.backend.search.kodik.service.anyame_backend.service;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import com.backend.search.kodik.service.anyame_backend.api.model.KodikResponse;
|
||||||
|
import com.backend.search.kodik.service.anyame_backend.api.model.KodikResponse.Result;
|
||||||
|
|
||||||
|
@Service
|
||||||
|
public class KodikSearchFilterService {
|
||||||
|
Logger log = LoggerFactory.getLogger(KodikSearchFilterService.class);
|
||||||
|
private static final List<String> ALLOWED_TYPES = Arrays.asList("anime-serial", "anime");
|
||||||
|
|
||||||
|
public KodikResponse filter(KodikResponse body) {
|
||||||
|
Set<String> seenIds = new HashSet<>();
|
||||||
|
List<Result> filteredResults = body.results.stream()
|
||||||
|
.filter(result -> ALLOWED_TYPES.contains(result.type))
|
||||||
|
.filter(result -> {
|
||||||
|
String identifier = identifier(result);
|
||||||
|
boolean updated = seenIds.add(identifier);
|
||||||
|
return updated;
|
||||||
|
})
|
||||||
|
.toList();
|
||||||
|
|
||||||
|
body.results = filteredResults;
|
||||||
|
return body;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String identifier(Result result) {
|
||||||
|
List<String> identifiers = Arrays.asList(result.kinopoiskId,
|
||||||
|
result.imdbId,
|
||||||
|
result.shikimoriId,
|
||||||
|
result.worldartLink);
|
||||||
|
return identifiers.stream().filter(identifier -> identifier != null && !identifier.isBlank()).findFirst()
|
||||||
|
.orElse(result.id) + Integer.toString(result.lastSeason);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -1,3 +1,3 @@
|
|||||||
spring.application.name=anyame-backend
|
spring.application.name=anyame-kodik-search-backend
|
||||||
server.error.include-message=always
|
|
||||||
kodik.token=${KODIK_TOKEN}
|
kodik.token=${KODIK_TOKEN}
|
||||||
|
eureka.client.serviceUrl.defaultZone: ${EUREKA_SCHEMA}://${EUREKA_HOST}/eureka/
|
||||||
|
11
src/main/resources/logback.xml
Normal file
11
src/main/resources/logback.xml
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
<configuration>
|
||||||
|
<appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
|
||||||
|
<destination>logstash:5044</destination>
|
||||||
|
<encoder class="net.logstash.logback.encoder.LogstashEncoder" />
|
||||||
|
</appender>
|
||||||
|
|
||||||
|
<root level="INFO">
|
||||||
|
<appender-ref ref="LOGSTASH" />
|
||||||
|
</root>
|
||||||
|
</configuration>
|
||||||
|
|
Reference in New Issue
Block a user