Main svc

docker-compose.yml

@@ -1,44 +1,64 @@
 services:
   stats-server:
     build: ./statistic/server
-    image: statistic-server
     container_name: statistic-server
     ports:
       - "9090:9090"
     depends_on:
       - stats-db
     environment:
-      - SPRING_DATASOURCE_URL=jdbc:postgresql://stats-db:5432/statistic
+      - SPRING_DATASOURCE_URL=jdbc:postgresql://stats-db:5431/statistic
       - SPRING_DATASOURCE_USERNAME=dbuser
       - SPRING_DATASOURCE_PASSWORD=12345
 
   stats-db:
     image: postgres:16.1
     container_name: postgres-stats-db
+    expose:
+      - "5431"
     ports:
-      - "5432:5432"
-    volumes:
-      - ./volumes/postgres:/var/lib/postgresql/data/
+      - "5431:5431"
     environment:
       - POSTGRES_DB=statistic
       - POSTGRES_USER=dbuser
       - POSTGRES_PASSWORD=12345
+      - PGPORT=5431
+    healthcheck:
+      test: pg_isready -q -d $$POSTGRES_DB -U $$POSTGRES_USER
+      timeout: 5s
+      interval: 5s
+      retries: 10
+
+  ewm-db:
+    image: postgres:16.1
+    container_name: postgres-explore-db
+    expose:
+      - "5432"
+    ports:
+      - "5432:5432"
+    depends_on:
+      - stats-server
+    environment:
+      - POSTGRES_DB=explore
+      - POSTGRES_USER=dbuser
+      - POSTGRES_PASSWORD=12345
     healthcheck:
       test: pg_isready -q -d $$POSTGRES_DB -U $$POSTGRES_USER
       timeout: 5s
       interval: 5s
       retries: 10
 
   ewm-service:
-    build: ./statistic/client
-    image: statistic-client
-    container_name: statistic-client
+    build: ./explore
+    image: explore
+    container_name: explore
     ports:
       - "8080:8080"
     depends_on:
-      - stats-server
+      ewm-db:
+        condition: service_healthy
     environment:
       - STATISTIC_SERVER_URL=http://stats-server:9090
-
-#  ewm-db:
-#    image: postgres:16.1
+      - SPRING_DATASOURCE_URL=jdbc:postgresql://ewm-db:5432/explore
+      - SPRING_DATASOURCE_USERNAME=dbuser
+      - SPRING_DATASOURCE_PASSWORD=12345

explore/Dockerfile

@@ -0,0 +1,11 @@
+FROM amazoncorretto:21-alpine as builder
+WORKDIR application
+COPY target/*.jar app.jar
+RUN java -Djarmode=layertools -jar app.jar extract
+
+FROM amazoncorretto:21-alpine
+COPY --from=builder /application/dependencies/ ./
+COPY --from=builder /application/spring-boot-loader/ ./
+COPY --from=builder /application/snapshot-dependencies/ ./
+COPY --from=builder /application/application ./
+ENTRYPOINT ["java", "org.springframework.boot.loader.launch.JarLauncher"]

explore/pom.xml

@@ -22,14 +22,50 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
         <dependency>
             <groupId>ru.practicum</groupId>
             <artifactId>dto</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.11.0</version>
+        </dependency>
     </dependencies>
 
     <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                        </exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 
 </project>

explore/src/main/java/ru/practicum/explore/ExploreWithMeApp.java

@@ -0,0 +1,11 @@
+package ru.practicum.explore;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class ExploreWithMeApp {
+    public static void main(String[] args) {
+        SpringApplication.run(ExploreWithMeApp.class, args);
+    }
+}

explore/src/main/java/ru/practicum/explore/api/admin/controller/AdminCategoryController.java

@@ -0,0 +1,36 @@
+package ru.practicum.explore.api.admin.controller;
+
+import jakarta.transaction.Transactional;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import ru.practicum.dto.category.Category;
+import ru.practicum.explore.api.admin.service.AdminCategoryService;
+
+import static org.springframework.http.HttpStatus.CREATED;
+import static org.springframework.http.HttpStatus.NO_CONTENT;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/admin/categories")
+public class AdminCategoryController {
+    private final AdminCategoryService service;
+
+    @PostMapping
+    @ResponseStatus(CREATED)
+    public Category create(@Valid @RequestBody final Category data) {
+        return service.save(data);
+    }
+
+    @ResponseStatus(NO_CONTENT)
+    @DeleteMapping("/{catId}")
+    public void delete(@PathVariable long catId) {
+        service.delete(catId);
+    }
+
+    @PatchMapping("/{catId}")
+    @Transactional
+    public Category patch(@PathVariable long catId, @Valid @RequestBody final Category data) {
+        return service.patch(catId, data);
+    }
+}

explore/src/main/java/ru/practicum/explore/api/admin/controller/AdminCompilationController.java

@@ -0,0 +1,37 @@
+package ru.practicum.explore.api.admin.controller;
+
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import ru.practicum.dto.compilation.CompilationDto;
+import ru.practicum.dto.compilation.NewCompilationDto;
+import ru.practicum.dto.compilation.UpdateCompilationRequest;
+import ru.practicum.explore.api.admin.service.AdminCompilationService;
+
+import static org.springframework.http.HttpStatus.CREATED;
+import static org.springframework.http.HttpStatus.NO_CONTENT;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/admin/compilations")
+public class AdminCompilationController {
+    private final AdminCompilationService adminCompilationService;
+
+    @PatchMapping("/{compId}")
+    public CompilationDto update(@PathVariable long compId,
+                                 @Valid @RequestBody final UpdateCompilationRequest data) {
+        return adminCompilationService.update(compId, data);
+    }
+
+    @PostMapping
+    @ResponseStatus(CREATED)
+    public CompilationDto create(@Valid @RequestBody final NewCompilationDto data) {
+        return adminCompilationService.create(data);
+    }
+
+    @ResponseStatus(NO_CONTENT)
+    @DeleteMapping("/{compId}")
+    public void delete(@PathVariable long compId) {
+        adminCompilationService.delete(compId);
+    }
+}

explore/src/main/java/ru/practicum/explore/api/admin/controller/AdminEventController.java

@@ -0,0 +1,41 @@
+package ru.practicum.explore.api.admin.controller;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.transaction.Transactional;
+import lombok.RequiredArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.*;
+import ru.practicum.dto.event.EventFullDto;
+import ru.practicum.dto.event.UpdateEventAdminRequest;
+import ru.practicum.explore.api.admin.service.AdminEventService;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/admin/events")
+public class AdminEventController {
+    private final AdminEventService service;
+
+    @Transactional
+    @GetMapping
+    public List<EventFullDto> findAll(HttpServletRequest request,
+                                      @RequestParam(required = false) List<Long> users,
+                                      @RequestParam(required = false) List<String> states,
+                                      @RequestParam(required = false) List<Long> categories,
+                                      @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+                                      LocalDateTime rangeStart,
+                                      @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+                                      LocalDateTime rangeEnd,
+                                      @RequestParam(defaultValue = "0") Integer from,
+                                      @RequestParam(defaultValue = "10") Integer size) {
+        return service.findAll(request, users, states, categories, rangeStart, rangeEnd, from, size);
+    }
+
+    @PatchMapping("/{eventId}")
+    public EventFullDto patch(@PathVariable long eventId,
+                              @RequestBody final UpdateEventAdminRequest data) {
+        return service.updateEvent(eventId, data);
+    }
+}

explore/src/main/java/ru/practicum/explore/api/admin/controller/AdminUserController.java

@@ -0,0 +1,38 @@
+package ru.practicum.explore.api.admin.controller;
+
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import ru.practicum.dto.user.User;
+import ru.practicum.explore.api.admin.service.AdminUserService;
+
+import java.util.List;
+
+import static org.springframework.http.HttpStatus.CREATED;
+import static org.springframework.http.HttpStatus.NO_CONTENT;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/admin/users")
+public class AdminUserController {
+    private final AdminUserService adminUserService;
+
+    @GetMapping
+    public List<User> get(@RequestParam(required = false) List<Long> ids,
+                          @RequestParam(defaultValue = "0") Integer from,
+                          @RequestParam(defaultValue = "10") Integer size) {
+        return adminUserService.getAll(ids, from, size);
+    }
+
+    @PostMapping
+    @ResponseStatus(CREATED)
+    public User create(@Valid @RequestBody final User user) {
+        return adminUserService.save(user);
+    }
+
+    @ResponseStatus(NO_CONTENT)
+    @DeleteMapping("/{userId}")
+    public void delete(@PathVariable long userId) {
+        adminUserService.delete(userId);
+    }
+}

explore/src/main/java/ru/practicum/explore/api/admin/service/AdminCategoryService.java

@@ -0,0 +1,34 @@
+package ru.practicum.explore.api.admin.service;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import ru.practicum.dto.category.Category;
+import ru.practicum.explore.exception.NotFoundException;
+import ru.practicum.explore.storage.CategoryRepository;
+
+@Service
+@RequiredArgsConstructor
+public class AdminCategoryService {
+    private final CategoryRepository repository;
+
+    public Category save(Category data) {
+        return repository.save(data);
+    }
+
+    public void delete(long id) {
+        repository.deleteById(id);
+    }
+
+    public Category patch(long id, Category data) {
+        Category category = findById(id);
+        category.setName(data.getName());
+
+        return repository.save(category);
+    }
+
+    public Category findById(long id) {
+        return repository
+                .findById(id)
+                .orElseThrow(() -> new NotFoundException(id));
+    }
+}