diff --git a/src/main/java/ru/oa2/lti/application/infrastructure/repository/HistoryRepository.java b/src/main/java/ru/oa2/lti/application/infrastructure/repository/HistoryRepository.java deleted file mode 100644 index ae7edeb..0000000 --- a/src/main/java/ru/oa2/lti/application/infrastructure/repository/HistoryRepository.java +++ /dev/null @@ -1,21 +0,0 @@ -package ru.oa2.lti.application.infrastructure.repository; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; -import ru.oa2.lti.infrastructure.adapter.persistence.jpa.entity.HistoryEntity; - -import java.util.List; -import java.util.UUID; - -/** - * @deprecated Используйте {@link ru.oa2.lti.infrastructure.adapter.persistence.jpa.repository.HistoryJpaRepository} - * Этот интерфейс оставлен для обратной совместимости и будет удален в следующей версии. - */ -@Deprecated -@Repository -public interface HistoryRepository extends JpaRepository { - - List findByContentUuidOrderByCreatedDesc(UUID contentUuid); - - List findByDeploymentIdOrderByCreatedDesc(UUID deploymentId); -} diff --git a/src/main/java/ru/oa2/lti/application/infrastructure/repository/LMSContentRepository.java b/src/main/java/ru/oa2/lti/application/infrastructure/repository/LMSContentRepository.java deleted file mode 100644 index 24c46fe..0000000 --- a/src/main/java/ru/oa2/lti/application/infrastructure/repository/LMSContentRepository.java +++ /dev/null @@ -1,19 +0,0 @@ -package ru.oa2.lti.application.infrastructure.repository; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; -import ru.oa2.lti.infrastructure.adapter.persistence.jpa.entity.LMSContentEntity; - -import java.util.Optional; -import java.util.UUID; - -/** - * @deprecated Используйте {@link ru.oa2.lti.infrastructure.adapter.persistence.jpa.repository.LMSContentJpaRepository} - * Этот интерфейс оставлен для обратной совместимости и будет удален в следующей версии. - */ -@Deprecated -@Repository -public interface LMSContentRepository extends JpaRepository { - - Optional getLMSContentByContentUuid(UUID contextId); -} diff --git a/src/main/java/ru/oa2/lti/application/infrastructure/repository/entities/History.java b/src/main/java/ru/oa2/lti/application/infrastructure/repository/entities/History.java deleted file mode 100644 index 44ab5d0..0000000 --- a/src/main/java/ru/oa2/lti/application/infrastructure/repository/entities/History.java +++ /dev/null @@ -1,36 +0,0 @@ -package ru.oa2.lti.application.infrastructure.repository.entities; - -import jakarta.persistence.*; -import lombok.Getter; -import lombok.Setter; - -import java.time.LocalDateTime; -import java.util.UUID; - -/** - * @deprecated Используйте {@link ru.oa2.lti.infrastructure.adapter.persistence.jpa.entity.HistoryEntity} - * Этот класс оставлен для обратной совместимости и будет удален в следующей версии. - */ -@Deprecated -@Getter -@Setter -@Entity -@Table(name = "history") -public class History { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - long id; - - @Column(name = "deployment_id", nullable = false) - UUID deploymentId; - - @Column(name = "content_uuid", nullable = false) - UUID contentUuid; - - @Column(name = "created", nullable = false) - LocalDateTime created; - - @Column(name = "message", nullable = false, length = 2048) - String message; -} diff --git a/src/main/java/ru/oa2/lti/application/infrastructure/repository/entities/LMSContent.java b/src/main/java/ru/oa2/lti/application/infrastructure/repository/entities/LMSContent.java deleted file mode 100644 index 358d3be..0000000 --- a/src/main/java/ru/oa2/lti/application/infrastructure/repository/entities/LMSContent.java +++ /dev/null @@ -1,39 +0,0 @@ -package ru.oa2.lti.application.infrastructure.repository.entities; - -import jakarta.persistence.*; -import lombok.Getter; -import lombok.Setter; - -import java.time.LocalDateTime; -import java.util.UUID; - -/** - * @deprecated Используйте {@link ru.oa2.lti.infrastructure.adapter.persistence.jpa.entity.LMSContentEntity} - * Этот класс оставлен для обратной совместимости и будет удален в следующей версии. - */ -@Deprecated -@Getter -@Setter -@Entity -@Table(name = "lms_content", -indexes = { - @Index(name = "idx_content_uuid", columnList = "content_uuid") -}) -public class LMSContent { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - long id; - - @Column(name = "deployment_id", nullable = false) - UUID deploymentId; - - @Column(name = "content_uuid", nullable = false) - UUID contentUuid; - - @Column(name = "created", nullable = false) - LocalDateTime created; - - @Column(name = "task_id", nullable = false) - Long taskId; -} diff --git a/src/main/java/ru/oa2/lti/application/infrastructure/repository/entities/Task.java b/src/main/java/ru/oa2/lti/application/infrastructure/repository/entities/Task.java deleted file mode 100644 index 3db8145..0000000 --- a/src/main/java/ru/oa2/lti/application/infrastructure/repository/entities/Task.java +++ /dev/null @@ -1,36 +0,0 @@ -package ru.oa2.lti.application.infrastructure.repository.entities; - -import jakarta.persistence.*; -import lombok.Getter; -import lombok.Setter; - -/** - * @deprecated Используйте {@link ru.oa2.lti.infrastructure.adapter.persistence.jpa.entity.TaskEntity} - * Этот класс оставлен для обратной совместимости и будет удален в следующей версии. - */ -@Deprecated -@Getter -@Setter -@Entity -@Table(name = "task") -public class Task { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - long id; - - @Column(name = "name", nullable = false, length = 250) - String name; - - @Column(name = "description", nullable = false, columnDefinition = "text") - String description; - - @Column(name = "init_script", columnDefinition = "text") - String initScript; - - @Column(name = "verification_script", columnDefinition = "text") - String verificationScript; - - @Column(name = "delete_script", columnDefinition = "text") - String deleteScript; -} diff --git a/src/main/java/ru/oa2/lti/application/service/history/HistoryServiceImpl.java b/src/main/java/ru/oa2/lti/application/service/history/HistoryServiceImpl.java index f57d706..f0ea55d 100644 --- a/src/main/java/ru/oa2/lti/application/service/history/HistoryServiceImpl.java +++ b/src/main/java/ru/oa2/lti/application/service/history/HistoryServiceImpl.java @@ -4,7 +4,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import ru.oa2.lti.application.infrastructure.repository.HistoryRepository; +import ru.oa2.lti.infrastructure.adapter.persistence.jpa.repository.HistoryJpaRepository; import ru.oa2.lti.infrastructure.adapter.persistence.jpa.entity.HistoryEntity; import java.time.LocalDateTime; @@ -14,9 +14,9 @@ import java.util.UUID; @Service public class HistoryServiceImpl implements HistoryService { - private final HistoryRepository historyRepository; + private final HistoryJpaRepository historyRepository; - public HistoryServiceImpl(HistoryRepository historyRepository) { + public HistoryServiceImpl(HistoryJpaRepository historyRepository) { this.historyRepository = historyRepository; }