14 changed files with 30 additions and 2135 deletions
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@ -5,20 +5,8 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" id="67d3f0b7-2fd3-4b40-a135-0347e30e6207" name="Changes" comment="add log file">
-      <change afterPath="$PROJECT_DIR$/minio/src/main/java/com/spring/minio/config/KafkaConsumerConfig.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/minio/src/main/java/com/spring/minio/consumer/Consumer.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/minio/src/main/java/com/spring/minio/properties/KafkaProperties.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/report/src/main/java/com/spring/report/config/KafkaProducerConfig.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/report/src/main/java/com/spring/report/kafka/Producer.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docker-compose.yml" beforeDir="false" afterPath="$PROJECT_DIR$/docker-compose.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/minio/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/minio/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/minio/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/minio/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/minio/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/minio/src/main/resources/application.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/report/logs/application.log" beforeDir="false" afterPath="$PROJECT_DIR$/report/logs/application.log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/report/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/report/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/report/src/main/java/com/spring/report/controller/VisitorController.java" beforeDir="false" afterPath="$PROJECT_DIR$/report/src/main/java/com/spring/report/controller/VisitorController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/report/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/report/src/main/resources/application.yml" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -48,15 +36,14 @@
    "ASKED_ADD_EXTERNAL_FILES": "true",
    "Docker.docker-compose.yml: Compose Deployment.executor": "Run",
    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "git-widget-placeholder": "lw5",
+    "git-widget-placeholder": "main",
    "kotlin-language-version-configured": "true",
-    "last_opened_file_path": "D:/java/DemoTaskMediasoft(2)",
+    "last_opened_file_path": "D:/java/dcaa-mcs/report/src/main/resources",
    "node.js.detected.package.eslint": "true",
    "node.js.detected.package.tslint": "true",
    "node.js.selected.package.eslint": "(autodetect)",
    "node.js.selected.package.tslint": "(autodetect)",
    "nodejs_package_manager_path": "npm",
-    "settings.editor.selected.configurable": "bigdataide_conn_settings",
    "vue.rearranger.settings.migration": "true"
  }
 }]]></component>
@ -108,7 +95,6 @@
      <workItem from="1729199229123" duration="2034000" />
      <workItem from="1729271426421" duration="377000" />
      <workItem from="1729706571244" duration="12931000" />
-      <workItem from="1729789297391" duration="5967000" />
    </task>
    <task id="LOCAL-00001" summary="add minio">
      <option name="closed" value="true" />
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -86,39 +86,10 @@ services:
      backend:
        aliases:
          - "myminio"
-  zookeeper:
-    container_name: zookeeper
-    image: confluentinc/cp-zookeeper:latest
-    depends_on:
-      - myminio
-    environment:
-      ZOOKEEPER_CLIENT_PORT: 2181
-      ZOOKEEPER_TICK_TIME: 2000
-    ports:
-      - '2181:2181'
-    networks:
-      backend:
-        aliases:
-          - "zookeeper"
-  kafka:
-    container_name: kafka
-    image: confluentinc/cp-kafka:latest
-    depends_on:
-      - zookeeper
-    ports:
-      - '9092:9092'
-    environment:
-      KAFKA_BROKER_ID: 1
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092,PLAINTEXT_HOST://localhost:29092
-      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
-      KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
-      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
-    networks:
-      backend:
-        aliases:
-          - "kafka"

 networks:
  backend:
-    driver: bridge
+    driver: bridge
+
+volumes:
+  minio-storage:
--- a/minio/.idea/workspace.xml
+++ b/minio/.idea/workspace.xml
@ -5,20 +5,8 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" id="4c468ddb-7fbe-40b8-bf97-16a0c944e8c6" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/spring/minio/config/KafkaConsumerConfig.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/spring/minio/consumer/Consumer.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/spring/minio/properties/KafkaProperties.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/../report/src/main/java/com/spring/report/config/KafkaProducerConfig.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/../report/src/main/java/com/spring/report/kafka/Producer.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../docker-compose.yml" beforeDir="false" afterPath="$PROJECT_DIR$/../docker-compose.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../report/logs/application.log" beforeDir="false" afterPath="$PROJECT_DIR$/../report/logs/application.log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../report/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../report/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../report/src/main/java/com/spring/report/controller/VisitorController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../report/src/main/java/com/spring/report/controller/VisitorController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../report/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/../report/src/main/resources/application.yml" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -28,18 +16,18 @@
  <component name="FileTemplateManagerImpl">
    <option name="RECENT_TEMPLATES">
      <list>
-        <option value="Dockerfile" />
        <option value="Class" />
+        <option value="Dockerfile" />
      </list>
    </option>
  </component>
  <component name="Git.Settings">
    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
  </component>
-  <component name="KubernetesApiPersistence">{}</component>
-  <component name="KubernetesApiProvider">{
-  &quot;isMigrated&quot;: true
-}</component>
+  <component name="KubernetesApiPersistence"><![CDATA[{}]]></component>
+  <component name="KubernetesApiProvider"><![CDATA[{
+  "isMigrated": true
+}]]></component>
  <component name="MavenImportPreferences">
    <option name="generalSettings">
      <MavenGeneralSettings>
@ -73,7 +61,7 @@
    "RunOnceActivity.ShowReadmeOnStart": "true",
    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
    "Spring Boot.MinioApplication.executor": "Run",
-    "git-widget-placeholder": "lw5",
+    "git-widget-placeholder": "main",
    "kotlin-language-version-configured": "true",
    "last_opened_file_path": "D:/учеба/диплом/protege",
    "node.js.detected.package.eslint": "true",
@ -106,9 +94,7 @@
      </method>
    </configuration>
    <configuration default="true" type="docker-deploy" factoryName="docker-compose.yml" temporary="true">
-      <deployment type="docker-compose.yml">
-        <settings />
-      </deployment>
+      <deployment type="docker-compose.yml" />
      <method v="2" />
    </configuration>
    <configuration name="docker-compose.yml.minio: Compose Deployment" type="docker-deploy" factoryName="docker-compose.yml" temporary="true" server-name="Docker">
@ -155,7 +141,6 @@
      <workItem from="1729271678576" duration="138000" />
      <workItem from="1729432602672" duration="627000" />
      <workItem from="1729705852820" duration="15757000" />
-      <workItem from="1729795093249" duration="1693000" />
    </task>
    <servers />
  </component>
--- a/minio/pom.xml
+++ b/minio/pom.xml
@ -60,10 +60,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-logging</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.kafka</groupId>
-			<artifactId>spring-kafka</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
--- a/minio/src/main/java/com/spring/minio/config/KafkaConsumerConfig.java
+++ b/minio/src/main/java/com/spring/minio/config/KafkaConsumerConfig.java
@ -1,43 +0,0 @@
-package com.spring.minio.config;
-
-import com.spring.minio.properties.KafkaProperties;
-import lombok.RequiredArgsConstructor;
-import org.apache.kafka.clients.consumer.ConsumerConfig;
-import org.apache.kafka.common.serialization.ByteArrayDeserializer;
-import org.apache.kafka.common.serialization.StringDeserializer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.kafka.annotation.EnableKafka;
-import org.springframework.kafka.config.ConcurrentKafkaListenerContainerFactory;
-import org.springframework.kafka.core.ConsumerFactory;
-import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
-
-import java.util.HashMap;
-import java.util.Map;
-
-@EnableKafka
-@Configuration
-@RequiredArgsConstructor
-public class KafkaConsumerConfig {
-    private final KafkaProperties kafkaProperties;
-
-    private ConsumerFactory<String, byte[]> consumerFactory() {
-        Map<String, Object> props = new HashMap<>();
-        props.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, kafkaProperties.getBootstrapAddress());
-        props.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
-        props.put(ConsumerConfig.GROUP_ID_CONFIG, kafkaProperties.getGroupId());
-        props.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class);
-        props.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, ByteArrayDeserializer.class);
-        props.put(ConsumerConfig.MAX_PARTITION_FETCH_BYTES_CONFIG, "20971520");
-        props.put(ConsumerConfig.FETCH_MAX_BYTES_CONFIG, "20971520");
-        return new DefaultKafkaConsumerFactory<>(props);
-    }
-
-    @Bean
-    public ConcurrentKafkaListenerContainerFactory<String, byte[]> kafkaListenerContainerFactory() {
-        ConcurrentKafkaListenerContainerFactory<String, byte[]> factory =
-                new ConcurrentKafkaListenerContainerFactory<>();
-        factory.setConsumerFactory(consumerFactory());
-        return factory;
-    }
-}
--- a/minio/src/main/java/com/spring/minio/consumer/Consumer.java
+++ b/minio/src/main/java/com/spring/minio/consumer/Consumer.java
@ -1,30 +0,0 @@
-package com.spring.minio.consumer;
-
-import com.spring.minio.config.MinioAdapter;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.kafka.annotation.KafkaListener;
-import org.springframework.stereotype.Service;
-
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class Consumer {
-    private final MinioAdapter minioAdapter;
-
-    /**
-     * Слушатель Kafka, который принимает сообщения из заданного топика и обрабатывает их.
-     *
-     * @param message Сообщение, полученное из Kafka.
-     */
-    @KafkaListener(topics = "test_topic", containerFactory = "kafkaListenerContainerFactory")
-    public void listenGroupTopic(byte[] message) {
-        log.info("Received message");
-        try {
-            minioAdapter.uploadFile("user1", "visitors_report.csv", message);
-
-        } catch (Exception e) {
-            log.error("Exception: ", e);
-        }
-    }
-}
--- a/minio/src/main/java/com/spring/minio/properties/KafkaProperties.java
+++ b/minio/src/main/java/com/spring/minio/properties/KafkaProperties.java
@ -1,22 +0,0 @@
-package com.spring.minio.properties;
-
-import lombok.Getter;
-import lombok.Setter;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@ConfigurationProperties(prefix = "app.kafka")
-@Getter
-@Setter
-public class KafkaProperties {
-    /**
-     * Адреса серверов Kafka, к которым будет подключаться потребитель.
-     */
-    private String bootstrapAddress;
-
-    /**
-     * Идентификатор группы потребителей.
-     */
-    private String groupId;
-}
--- a/minio/src/main/resources/application.yml
+++ b/minio/src/main/resources/application.yml
@ -4,9 +4,4 @@ minio:
  access:
    name: role_for_spring
    secret: 123456789
-  url: "http://minio:9000"
-
-app:
-  kafka:
-    bootstrapAddress: kafka:9092
-    groupId: group1
+  url: "http://minio:9000"
--- a/report/logs/application.log
+++ b/report/logs/application.log
--- a/report/pom.xml
+++ b/report/pom.xml
@ -62,10 +62,6 @@
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-logging</artifactId>
        </dependency>
-        <dependency>
-            <groupId>org.springframework.kafka</groupId>
-            <artifactId>spring-kafka</artifactId>
-        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-test</artifactId>
--- a/report/src/main/java/com/spring/report/config/KafkaProducerConfig.java
+++ b/report/src/main/java/com/spring/report/config/KafkaProducerConfig.java
@ -1,51 +0,0 @@
-package com.spring.report.config;
-
-import org.apache.kafka.clients.admin.AdminClientConfig;
-import org.apache.kafka.clients.admin.NewTopic;
-import org.apache.kafka.clients.producer.ProducerConfig;
-import org.apache.kafka.common.serialization.ByteArraySerializer;
-import org.apache.kafka.common.serialization.StringSerializer;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.kafka.core.DefaultKafkaProducerFactory;
-import org.springframework.kafka.core.KafkaAdmin;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.kafka.core.ProducerFactory;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import static com.spring.report.kafka.Producer.TEST_TOPIC;
-
-@Configuration
-public class KafkaProducerConfig {
-    @Value("${kafka.bootstrapAddress}")
-    private String SERVER;
-
-    private ProducerFactory<String, byte[]> producerFactory() {
-        Map<String, Object> configProps = new HashMap<>();
-        configProps.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, SERVER);
-        configProps.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class);
-        configProps.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, ByteArraySerializer.class);
-        configProps.put(ProducerConfig.MAX_REQUEST_SIZE_CONFIG, "20971520");
-        return new DefaultKafkaProducerFactory<>(configProps);
-    }
-
-    @Bean
-    public KafkaTemplate<String, byte[]> kafkaTemplate() {
-        return new KafkaTemplate<>(producerFactory());
-    }
-
-    @Bean
-    public KafkaAdmin kafkaAdmin() {
-        Map<String, Object> configs = new HashMap<>();
-        configs.put(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, SERVER);
-        return new KafkaAdmin(configs);
-    }
-
-    @Bean
-    public NewTopic testTopic() {
-        return new NewTopic(TEST_TOPIC, 1, (short) 1);
-    }
-}
--- a/report/src/main/java/com/spring/report/controller/VisitorController.java
+++ b/report/src/main/java/com/spring/report/controller/VisitorController.java
@ -2,7 +2,6 @@ package com.spring.report.controller;

 import com.opencsv.CSVWriter;
 import com.spring.report.entity.Visitor;
-import com.spring.report.kafka.Producer;
 import com.spring.report.repository.VisitorRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@ -23,7 +22,6 @@ import org.springframework.web.client.RestTemplate;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.nio.file.Files;
 import java.util.List;

@RestController
@ -33,7 +31,7 @@ import java.util.List;
 public class VisitorController {
    private final VisitorRepository visitorRepository;
    public static final String CORRELATION_ID = "correlation-id";
-    private final Producer producer;
+    private final RestTemplate restTemplate;

    @GetMapping
    public ResponseEntity<List<Visitor>> report(@RequestHeader(CORRELATION_ID) String correlationId) {
@ -86,10 +84,23 @@ public class VisitorController {
    }

    private void uploadFileToMinio(File file, String corId) {
+        String url = "http://myminio:8081/upload";
+
        try {
-            producer.sendEvent(Producer.TEST_TOPIC, Files.readAllBytes(file.toPath()));
+            HttpHeaders headers = setHeaders(corId);
+            headers.setContentType(MediaType.MULTIPART_FORM_DATA);
+
+            MultiValueMap<String, Object> body = new LinkedMultiValueMap<>();
+            body.add("file", new FileSystemResource(file));
+
+            HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(body, headers);
+            ResponseEntity<String> response = restTemplate.postForEntity(url, requestEntity, String.class);
+
+            if (response.getStatusCode() != HttpStatus.OK) {
+                log.error("Failed to upload file: {}", response.getStatusCode());
+            }
        } catch (Exception e) {
-            log.error("Error uploading file to Kafka", e);
+            log.error("Error uploading file to MinIO", e);
        }
    }
 }
--- a/report/src/main/java/com/spring/report/kafka/Producer.java
+++ b/report/src/main/java/com/spring/report/kafka/Producer.java
@ -1,33 +0,0 @@
-package com.spring.report.kafka;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.kafka.support.SendResult;
-import org.springframework.stereotype.Service;
-import org.springframework.util.Assert;
-
-import java.util.concurrent.CompletableFuture;
-
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class Producer {
-    private final KafkaTemplate<String, byte[]> kafkaTemplateByteArray;
-    public static final String TEST_TOPIC = "test_topic";
-
-    public void sendEvent(final String topic, final byte[] data) {
-        Assert.hasText(topic, "topic must not be blank");
-        Assert.notNull(data, "data not be null");
-
-        CompletableFuture<SendResult<String, byte[]>> future = kafkaTemplateByteArray.send(topic, data);
-
-        future.whenComplete((result, ex) -> {
-            if (ex == null) {
-                log.info("Kafka send complete");
-            } else {
-                log.error("Kafka fail send", ex);
-            }
-        });
-    }
-}
--- a/report/src/main/resources/application.yml
+++ b/report/src/main/resources/application.yml
@ -12,6 +12,3 @@ spring:
      hibernate:
        format_sql: true
        dialect: org.hibernate.dialect.PostgreSQLDialect
-
-kafka:
-  bootstrapAddress: kafka:9092