diff --git a/docker-compose.yml b/docker-compose.yml index be96142..1e26a3e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,14 +1,46 @@ +version: '3.1' + services: stats-server: + build: stats/stats-server + container_name: stat-server ports: - "9090:9090" + environment: + - SPRING_DATASOURCE_URL=jdbc:postgresql://stats-db:5432/ewm-stats + - SPRING_DATASOURCE_USERNAME=stat + - SPRING_DATASOURCE_PASSWORD=stat + depends_on: + - stats-db stats-db: image: postgres:16.1 + container_name: postgres-ewm-stats-db + ports: + - "6542:5432" + environment: + - POSTGRES_PASSWORD=stat + - POSTGRES_USER=stat + - POSTGRES_DB=ewm-stats ewm-service: + build: main-service ports: - "8080:8080" + environment: + - CLIENT_URL=http://stats-server:9090 + - SPRING_DATASOURCE_URL=jdbc:postgresql://ewm-db:5432/ewm-main + - SPRING_DATASOURCE_USERNAME=main + - SPRING_DATASOURCE_PASSWORD=main + depends_on: + - ewm-db ewm-db: image: postgres:16.1 + container_name: postgres-ewm-main-service-db + ports: + - "7542:5432" + environment: + - POSTGRES_PASSWORD=main + - POSTGRES_USER=main + - POSTGRES_DB=ewm-main \ No newline at end of file diff --git a/main-service/Dockerfile b/main-service/Dockerfile new file mode 100644 index 0000000..0ff1817 --- /dev/null +++ b/main-service/Dockerfile @@ -0,0 +1,5 @@ +FROM eclipse-temurin:21-jre-jammy +VOLUME /tmp +ARG JAR_FILE=target/*.jar +COPY ${JAR_FILE} app.jar +ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} -jar /app.jar"] \ No newline at end of file diff --git a/main-service/pom.xml b/main-service/pom.xml new file mode 100644 index 0000000..dea6df8 --- /dev/null +++ b/main-service/pom.xml @@ -0,0 +1,87 @@ + + + 4.0.0 + + ru.practicum + explore-with-me + 0.0.1-SNAPSHOT + + + main-service + + + 21 + 21 + UTF-8 + + + + + org.zalando + logbook-spring-boot-starter + 3.7.2 + + + org.springframework.boot + spring-boot-starter-data-jpa + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-actuator + + + + org.postgresql + postgresql + runtime + + + + com.h2database + h2 + runtime + + + + org.springframework.boot + spring-boot-configuration-processor + true + + + + org.projectlombok + lombok + true + + + + org.springframework.boot + spring-boot-starter-test + test + + + ru.practicum + stats-dto + 0.0.1-SNAPSHOT + compile + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + \ No newline at end of file diff --git a/main-service/src/main/java/ewm/MainServiceApplication.java b/main-service/src/main/java/ewm/MainServiceApplication.java new file mode 100644 index 0000000..fce1434 --- /dev/null +++ b/main-service/src/main/java/ewm/MainServiceApplication.java @@ -0,0 +1,11 @@ +package ewm; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class MainServiceApplication { + public static void main(String[] args) { + SpringApplication.run(MainServiceApplication.class, args); + } +} diff --git a/pom.xml b/pom.xml index b15acb2..6a4fa1e 100644 --- a/pom.xml +++ b/pom.xml @@ -11,8 +11,12 @@ Explore With Me + + main-service + stats + - ru.practicum + ru.practicum explore-with-me 0.0.1-SNAPSHOT pom diff --git a/stats/pom.xml b/stats/pom.xml new file mode 100644 index 0000000..7785b9b --- /dev/null +++ b/stats/pom.xml @@ -0,0 +1,31 @@ + + + 4.0.0 + + ru.practicum + explore-with-me + 0.0.1-SNAPSHOT + + + + Explore With Me Stats + + stats + 0.0.1-SNAPSHOT + pom + + + stats-client + stats-dto + stats-server + + + + 21 + 21 + UTF-8 + + + \ No newline at end of file diff --git a/stats/stats-client/pom.xml b/stats/stats-client/pom.xml new file mode 100644 index 0000000..c65653f --- /dev/null +++ b/stats/stats-client/pom.xml @@ -0,0 +1,83 @@ + + + 4.0.0 + + ru.practicum + explore-with-me + 0.0.1-SNAPSHOT + ../../pom.xml + + + stats-client + + + + org.zalando + logbook-spring-boot-starter + 3.7.2 + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-validation + + + + org.springframework.boot + spring-boot-starter-actuator + + + + org.hibernate.validator + hibernate-validator + + + + org.apache.httpcomponents.client5 + httpclient5 + + + + org.springframework.boot + spring-boot-configuration-processor + true + + + + org.projectlombok + lombok + true + + + + org.springframework.boot + spring-boot-starter-test + test + + + ru.practicum + stats-dto + 0.0.1-SNAPSHOT + compile + + + ru.practicum + stats-server + 0.0.1-SNAPSHOT + compile + + + + + 22 + 22 + UTF-8 + + + \ No newline at end of file diff --git a/stats/stats-client/src/main/java/client/StatsClient.java b/stats/stats-client/src/main/java/client/StatsClient.java new file mode 100644 index 0000000..79a3337 --- /dev/null +++ b/stats/stats-client/src/main/java/client/StatsClient.java @@ -0,0 +1,67 @@ +package client; + +import dto.CreateDto; +import org.apache.hc.client5.http.classic.HttpClient; +import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpMethod; +import org.springframework.http.ResponseEntity; +import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; +import org.springframework.stereotype.Service; +import org.springframework.web.client.HttpStatusCodeException; +import org.springframework.web.client.RestTemplate; + +import java.time.LocalDateTime; +import java.util.List; + + +@Service +public class StatsClient { + @Value("${client.url}") + private String serverUrl; + private final RestTemplate rest; + + public StatsClient() { + this.rest = new RestTemplate(); + HttpClient httpClient = HttpClientBuilder.create().build(); + HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory(httpClient); + rest.setRequestFactory(requestFactory); + } + + public ResponseEntity save(CreateDto createDto) { + ResponseEntity response; + try { + response = rest.postForEntity(serverUrl + "/createDto", createDto, Object.class); + } catch (HttpStatusCodeException e) { + return ResponseEntity.status(e.getStatusCode()).body(e.getResponseBodyAsByteArray()); + } + ResponseEntity.BodyBuilder responseBuilder = ResponseEntity.status(response.getStatusCode()); + if (response.hasBody()) { + return responseBuilder.body(response.getBody()); + } + return responseBuilder.build(); + } + + public ResponseEntity getStats(LocalDateTime start, LocalDateTime end, List uris, Boolean unique) { + StringBuilder url = new StringBuilder(serverUrl + "/stats?"); + for (String uri : uris) { + url.append("&uris=").append(uri); + } + url.append("&unique=").append(unique); + url.append("&start=").append(start); + url.append("&end=").append(end); + + ResponseEntity response; + try { + response = rest.exchange(url.toString(), HttpMethod.GET, null, Object.class); + } catch (HttpStatusCodeException e) { + return ResponseEntity.status(e.getStatusCode()).body(e.getResponseBodyAsByteArray()); + } + ResponseEntity.BodyBuilder responseBuilder = ResponseEntity.status(response.getStatusCode()); + if (response.hasBody()) { + return responseBuilder.body(response.getBody()); + } + return responseBuilder.build(); + } +} + diff --git a/stats/stats-client/src/main/resources/application.properties b/stats/stats-client/src/main/resources/application.properties new file mode 100644 index 0000000..e8eb8a9 --- /dev/null +++ b/stats/stats-client/src/main/resources/application.properties @@ -0,0 +1 @@ +client.url=http://localhost:9090 \ No newline at end of file diff --git a/stats/stats-dto/pom.xml b/stats/stats-dto/pom.xml new file mode 100644 index 0000000..26d9ae0 --- /dev/null +++ b/stats/stats-dto/pom.xml @@ -0,0 +1,57 @@ + + + 4.0.0 + + ru.practicum + explore-with-me + 0.0.1-SNAPSHOT + ../../pom.xml + + + stats-dto + + + 22 + 22 + UTF-8 + + + + + org.zalando + logbook-spring-boot-starter + 3.7.2 + + + + org.springframework.boot + spring-boot-starter-validation + + + + org.springframework.boot + spring-boot-starter-actuator + + + + org.springframework.boot + spring-boot-configuration-processor + true + + + + org.projectlombok + lombok + true + + + + org.springframework.boot + spring-boot-starter-test + test + + + + \ No newline at end of file diff --git a/stats/stats-dto/src/main/java/dto/CreateDto.java b/stats/stats-dto/src/main/java/dto/CreateDto.java new file mode 100644 index 0000000..e2f6159 --- /dev/null +++ b/stats/stats-dto/src/main/java/dto/CreateDto.java @@ -0,0 +1,30 @@ +package dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Past; +import lombok.*; + +import java.time.LocalDateTime; + +@Builder +@Setter +@Getter +@NoArgsConstructor +@AllArgsConstructor +public class CreateDto { + @NotNull + private String app; + + @NotNull + private String uri; + + @NotNull + private String ip; + + @NotNull + @Past + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime timestamp; + +} diff --git a/stats/stats-dto/src/main/java/dto/ViewStatsDto.java b/stats/stats-dto/src/main/java/dto/ViewStatsDto.java new file mode 100644 index 0000000..23044f8 --- /dev/null +++ b/stats/stats-dto/src/main/java/dto/ViewStatsDto.java @@ -0,0 +1,19 @@ +package dto; + +import lombok.Getter; +import lombok.Setter; + + +@Getter +@Setter +public class ViewStatsDto { + private String app; + private String uri; + private Long hits; + + public ViewStatsDto(String app, String uri, Long hits) { + this.app = app; + this.uri = uri; + this.hits = hits; + } +} diff --git a/stats/stats-server/Dockerfile b/stats/stats-server/Dockerfile new file mode 100644 index 0000000..0ff1817 --- /dev/null +++ b/stats/stats-server/Dockerfile @@ -0,0 +1,5 @@ +FROM eclipse-temurin:21-jre-jammy +VOLUME /tmp +ARG JAR_FILE=target/*.jar +COPY ${JAR_FILE} app.jar +ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} -jar /app.jar"] \ No newline at end of file diff --git a/stats/stats-server/pom.xml b/stats/stats-server/pom.xml new file mode 100644 index 0000000..af87956 --- /dev/null +++ b/stats/stats-server/pom.xml @@ -0,0 +1,88 @@ + + + 4.0.0 + + ru.practicum + explore-with-me + 0.0.1-SNAPSHOT + ../../pom.xml + + + stats-server + + + 21 + 21 + UTF-8 + + + + + org.zalando + logbook-spring-boot-starter + 3.7.2 + + + org.springframework.boot + spring-boot-starter-data-jpa + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-actuator + + + + org.postgresql + postgresql + runtime + + + + com.h2database + h2 + runtime + + + + org.springframework.boot + spring-boot-configuration-processor + true + + + + org.projectlombok + lombok + true + + + + org.springframework.boot + spring-boot-starter-test + test + + + ru.practicum + stats-dto + 0.0.1-SNAPSHOT + compile + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + \ No newline at end of file diff --git a/stats/stats-server/src/main/java/ewm/StatApplication.java b/stats/stats-server/src/main/java/ewm/StatApplication.java new file mode 100644 index 0000000..30d81c5 --- /dev/null +++ b/stats/stats-server/src/main/java/ewm/StatApplication.java @@ -0,0 +1,12 @@ +package ewm; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class StatApplication { + public static void main(String[] args) { + SpringApplication.run(StatApplication.class, args); + } + +} diff --git a/stats/stats-server/src/main/java/ewm/exception/BadRequestException.java b/stats/stats-server/src/main/java/ewm/exception/BadRequestException.java new file mode 100644 index 0000000..4bf52b6 --- /dev/null +++ b/stats/stats-server/src/main/java/ewm/exception/BadRequestException.java @@ -0,0 +1,7 @@ +package ewm.exception; + +public class BadRequestException extends RuntimeException { + public BadRequestException(String message) { + super(message); + } +} diff --git a/stats/stats-server/src/main/java/ewm/exception/ConflictException.java b/stats/stats-server/src/main/java/ewm/exception/ConflictException.java new file mode 100644 index 0000000..6bcc2f4 --- /dev/null +++ b/stats/stats-server/src/main/java/ewm/exception/ConflictException.java @@ -0,0 +1,8 @@ +package ewm.exception; + +public class ConflictException extends RuntimeException { + public ConflictException(String message) { + super(message); + } +} + diff --git a/stats/stats-server/src/main/java/ewm/exception/ErrorHandler.java b/stats/stats-server/src/main/java/ewm/exception/ErrorHandler.java new file mode 100644 index 0000000..3154594 --- /dev/null +++ b/stats/stats-server/src/main/java/ewm/exception/ErrorHandler.java @@ -0,0 +1,39 @@ +package ewm.exception; + +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.RestControllerAdvice; + + +@RestControllerAdvice +public class ErrorHandler { + + @ExceptionHandler + @ResponseStatus(HttpStatus.NOT_FOUND) + public ErrorResponse handleNotFoundException(final NotFoundException e) { + return new ErrorResponse("Error", e.getMessage()); + } + + @ExceptionHandler + @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR) + public ErrorResponse handleInternalServerErrorException(final InternalServerErrorException e) { + return new ErrorResponse("Error", e.getMessage()); + } + + @ExceptionHandler + @ResponseStatus(HttpStatus.CONFLICT) + public ErrorResponse handleConflictException(final ConflictException e) { + return new ErrorResponse("Error", e.getMessage()); + } + + @ExceptionHandler + @ResponseStatus(HttpStatus.BAD_REQUEST) + public ErrorResponse handleBadRequestException(final BadRequestException e) { + return new ErrorResponse("Error", e.getMessage()); + } + +} + + + diff --git a/stats/stats-server/src/main/java/ewm/exception/ErrorResponse.java b/stats/stats-server/src/main/java/ewm/exception/ErrorResponse.java new file mode 100644 index 0000000..2fdf34c --- /dev/null +++ b/stats/stats-server/src/main/java/ewm/exception/ErrorResponse.java @@ -0,0 +1,19 @@ +package ewm.exception; + +public class ErrorResponse { + private final String error; + private final String description; + + public ErrorResponse(String error, String description) { + this.error = error; + this.description = description; + } + + public String getError() { + return error; + } + + public String getDescription() { + return description; + } +} \ No newline at end of file diff --git a/stats/stats-server/src/main/java/ewm/exception/InternalServerErrorException.java b/stats/stats-server/src/main/java/ewm/exception/InternalServerErrorException.java new file mode 100644 index 0000000..3164b3a --- /dev/null +++ b/stats/stats-server/src/main/java/ewm/exception/InternalServerErrorException.java @@ -0,0 +1,7 @@ +package ewm.exception; + +public class InternalServerErrorException extends RuntimeException { + public InternalServerErrorException(String message) { + super(message); + } +} diff --git a/stats/stats-server/src/main/java/ewm/exception/NotFoundException.java b/stats/stats-server/src/main/java/ewm/exception/NotFoundException.java new file mode 100644 index 0000000..41ec5e7 --- /dev/null +++ b/stats/stats-server/src/main/java/ewm/exception/NotFoundException.java @@ -0,0 +1,8 @@ +package ewm.exception; + +public class NotFoundException extends RuntimeException { + public NotFoundException(String message) { + super(message); + } +} + diff --git a/stats/stats-server/src/main/java/ewm/stat/EndpointHit.java b/stats/stats-server/src/main/java/ewm/stat/EndpointHit.java new file mode 100644 index 0000000..d273330 --- /dev/null +++ b/stats/stats-server/src/main/java/ewm/stat/EndpointHit.java @@ -0,0 +1,34 @@ +package ewm.stat; + +import com.fasterxml.jackson.annotation.JsonFormat; +import jakarta.persistence.*; +import lombok.*; + +import java.time.LocalDateTime; + +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Getter +@Setter +@Entity +@Table(name = "endpoint_hits") +public class EndpointHit { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long id; + + @Column(nullable = false) + private String app; + + @Column(nullable = false) + private String uri; + + @Column(nullable = false) + private String ip; + + @Column(nullable = false) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime timestamp; + +} diff --git a/stats/stats-server/src/main/java/ewm/stat/EndpointHitController.java b/stats/stats-server/src/main/java/ewm/stat/EndpointHitController.java new file mode 100644 index 0000000..c0d0752 --- /dev/null +++ b/stats/stats-server/src/main/java/ewm/stat/EndpointHitController.java @@ -0,0 +1,36 @@ +package ewm.stat; + +import dto.CreateDto; +import dto.ViewStatsDto; +import ewm.stat.service.EndpointHitService; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.time.LocalDateTime; +import java.util.List; + +@RestController +@RequiredArgsConstructor +@RequestMapping +@Validated +public class EndpointHitController { + private final EndpointHitService service; + + @ResponseStatus(HttpStatus.CREATED) + @PostMapping("/hit") + public void create(@RequestBody @Valid CreateDto createDto) { + service.create(createDto); + } + + @GetMapping("/stats") + public List getStats(@RequestParam LocalDateTime start, @RequestParam LocalDateTime end, + @RequestParam(required = false) List uris, + @RequestParam(defaultValue = "false") boolean unique) { + return service.getStats(start, end, uris, unique); + + } + +} diff --git a/stats/stats-server/src/main/java/ewm/stat/EndpointHitMapper.java b/stats/stats-server/src/main/java/ewm/stat/EndpointHitMapper.java new file mode 100644 index 0000000..fe03da4 --- /dev/null +++ b/stats/stats-server/src/main/java/ewm/stat/EndpointHitMapper.java @@ -0,0 +1,19 @@ +package ewm.stat; + +import dto.CreateDto; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +@RequiredArgsConstructor +@Component +public class EndpointHitMapper { + + public EndpointHit dtoToModel(CreateDto dto) { + return EndpointHit.builder() + .app(dto.getApp()) + .uri(dto.getUri()) + .ip(dto.getIp()) + .timestamp(dto.getTimestamp()) + .build(); + } +} diff --git a/stats/stats-server/src/main/java/ewm/stat/EndpointHitRepository.java b/stats/stats-server/src/main/java/ewm/stat/EndpointHitRepository.java new file mode 100644 index 0000000..5075d2b --- /dev/null +++ b/stats/stats-server/src/main/java/ewm/stat/EndpointHitRepository.java @@ -0,0 +1,36 @@ +package ewm.stat; + +import dto.ViewStatsDto; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.time.LocalDateTime; +import java.util.List; + +public interface EndpointHitRepository extends JpaRepository { + + @Query("SELECT new dto.ViewStatsDto(e.app, e.uri, COUNT(e.ip) as hits) " + + "FROM EndpointHit e " + + "WHERE e.timestamp BETWEEN :start AND :end " + + "AND (:uris IS NULL OR e.uri IN :uris) " + + "GROUP BY e.app, e.uri " + + "ORDER BY COUNT(e.ip) DESC") + List getStats( + @Param("start") LocalDateTime start, + @Param("end") LocalDateTime end, + @Param("uris") List uris); + + @Query("SELECT new dto.ViewStatsDto(e.app, e.uri, COUNT(DISTINCT e.ip) as hits) " + + "FROM EndpointHit e " + + "WHERE e.timestamp BETWEEN :start AND :end " + + "AND (:uris IS NULL OR e.uri IN :uris) " + + "GROUP BY e.app, e.uri " + + "ORDER BY COUNT(DISTINCT e.ip) DESC") + List getUniqueStats( + @Param("start") LocalDateTime start, + @Param("end") LocalDateTime end, + @Param("uris") List uris); + + +} diff --git a/stats/stats-server/src/main/java/ewm/stat/service/EndpointHitService.java b/stats/stats-server/src/main/java/ewm/stat/service/EndpointHitService.java new file mode 100644 index 0000000..8ea6ec3 --- /dev/null +++ b/stats/stats-server/src/main/java/ewm/stat/service/EndpointHitService.java @@ -0,0 +1,14 @@ +package ewm.stat.service; + +import dto.CreateDto; +import dto.ViewStatsDto; + +import java.time.LocalDateTime; +import java.util.List; + +public interface EndpointHitService { + + void create(CreateDto createDto); + + List getStats(LocalDateTime start, LocalDateTime end, List uris, boolean unique); +} diff --git a/stats/stats-server/src/main/java/ewm/stat/service/EndpointHitServiceImpl.java b/stats/stats-server/src/main/java/ewm/stat/service/EndpointHitServiceImpl.java new file mode 100644 index 0000000..5059a7f --- /dev/null +++ b/stats/stats-server/src/main/java/ewm/stat/service/EndpointHitServiceImpl.java @@ -0,0 +1,38 @@ +package ewm.stat.service; + +import dto.CreateDto; +import dto.ViewStatsDto; +import ewm.stat.EndpointHit; +import ewm.stat.EndpointHitMapper; +import ewm.stat.EndpointHitRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.List; + +@Transactional +@Service +@RequiredArgsConstructor +public class EndpointHitServiceImpl implements EndpointHitService { + private final EndpointHitRepository repository; + private final EndpointHitMapper mapper; + + @Override + public void create(CreateDto createDto) { + EndpointHit endpointHit = mapper.dtoToModel(createDto); + repository.save(endpointHit); + } + + @Override + public List getStats(LocalDateTime start, LocalDateTime end, List uris, boolean unique) { + if (unique) { + return repository.getUniqueStats(start, end, uris); + } else { + return repository.getStats(start, end, uris); + } + } + + +} diff --git a/stats/stats-server/src/main/resources/application.properties b/stats/stats-server/src/main/resources/application.properties new file mode 100644 index 0000000..a46de82 --- /dev/null +++ b/stats/stats-server/src/main/resources/application.properties @@ -0,0 +1,22 @@ + +server.port=9090 +spring.output.ansi.enabled=ALWAYS +spring.jpa.hibernate.ddl-auto=none +spring.jpa.properties.hibernate.format_sql=true +spring.sql.init.mode=always + +spring.mvc.format.date-time=yyyy-MM-dd HH:mm:ss + +logging.level.org.zalando.logbook= TRACE + +logging.level.org.springframework.orm.jpa=INFO +logging.level.org.springframework.transaction=INFO +logging.level.org.springframework.transaction.interceptor=TRACE +logging.level.org.springframework.orm.jpa.JpaTransactionManager=DEBUG + + +spring.datasource.driverClassName=org.postgresql.Driver +spring.datasource.url=jdbc:postgresql://localhost:6542/ewm-stats +spring.datasource.username=stat +spring.datasource.password=stat +spring.jpa.properties.hibernate.default_schema=public diff --git a/stats/stats-server/src/main/resources/schema.sql b/stats/stats-server/src/main/resources/schema.sql new file mode 100644 index 0000000..cb63d1d --- /dev/null +++ b/stats/stats-server/src/main/resources/schema.sql @@ -0,0 +1,8 @@ + +CREATE TABLE IF NOT EXISTS endpoint_hits ( + id INTEGER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, + app VARCHAR(200) NOT NULL, + uri VARCHAR(200) NOT NULL, + ip VARCHAR(200) NOT NULL, + timestamp TIMESTAMP WITHOUT TIME ZONE NOT NULL +); diff --git a/stats/stats-server/src/test/resources/application.properties b/stats/stats-server/src/test/resources/application.properties new file mode 100644 index 0000000..b649eba --- /dev/null +++ b/stats/stats-server/src/test/resources/application.properties @@ -0,0 +1,10 @@ +spring.output.ansi.enabled=ALWAYS + +spring.jpa.defer-datasource-initialization=true + +spring.config.activate.on-profile=test +spring.datasource.driverClassName=org.h2.Driver +spring.datasource.url=jdbc:h2:mem:stats +spring.datasource.username=stats +spring.datasource.password=stats +