cleanup

src/main/kotlin/com/example/autobank/controller/AdminController.kt

@@ -1,6 +1,6 @@
 package com.example.autobank.controller
 
-import com.example.autobank.data.Economicrequest
+import com.example.autobank.data.models.Economicrequest
 import com.example.autobank.data.user.OnlineUser
 import com.example.autobank.service.AdminService
 import com.example.autobank.service.EconomicRequestReviewService

src/main/kotlin/com/example/autobank/controller/AdminReceiptController.kt

@@ -8,13 +8,12 @@ import org.springframework.web.bind.annotation.RestController;
 import com.example.autobank.service.ReceiptAdminService;
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.web.bind.annotation.PathVariable
-import com.example.autobank.data.receipt.ReceiptInfo
 import com.example.autobank.service.AuthenticationService
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
 import com.example.autobank.data.ReceiptReviewRequestBody
 import com.example.autobank.data.receipt.ReceiptListResponseBody
-import com.example.autobank.data.receipt.ReceiptReview
+import com.example.autobank.data.models.ReceiptReview
 import com.example.autobank.service.ReceiptReviewService
 import org.springframework.data.repository.query.Param
 

src/main/kotlin/com/example/autobank/controller/CommitteeController.kt

@@ -1,14 +1,8 @@
 package com.example.autobank.controller
 
-import com.example.autobank.data.Committee
-import com.example.autobank.data.Economicrequest
-import com.example.autobank.data.user.OnlineUser
+import com.example.autobank.data.models.Committee
 import com.example.autobank.data.user.UserCommitteeResponseBody
-import com.example.autobank.repository.CommitteeRepository
-import com.example.autobank.service.AdminService
 import com.example.autobank.service.CommitteeService
-import com.example.autobank.service.EconomicRequestReviewService
-import com.example.autobank.service.EconomicrequestService
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.*

src/main/kotlin/com/example/autobank/controller/EconomicrequestController.kt

@@ -1,6 +1,6 @@
 package com.example.autobank.controller
 
-import com.example.autobank.data.Economicrequest
+import com.example.autobank.data.models.Economicrequest
 import com.example.autobank.service.AuthenticationService
 import com.example.autobank.service.EconomicrequestService
 import org.springframework.beans.factory.annotation.Autowired

src/main/kotlin/com/example/autobank/controller/ReceiptController.kt

@@ -1,5 +1,6 @@
 package com.example.autobank.controller
 
+import com.example.autobank.data.models.ReceiptInfo
 import com.example.autobank.data.receipt.*
 import com.example.autobank.service.ImageService
 import com.example.autobank.service.ReceiptService

src/main/kotlin/com/example/autobank/data/receipt/Attachment.kt → src/main/kotlin/com/example/autobank/data/models/Attachment.kt

@@ -1,4 +1,4 @@
-package com.example.autobank.data.receipt
+package com.example.autobank.data.models
 
 import jakarta.persistence.*
 import org.jetbrains.annotations.NotNull

src/main/kotlin/com/example/autobank/data/receipt/Card.kt → src/main/kotlin/com/example/autobank/data/models/Card.kt

@@ -1,4 +1,4 @@
-package com.example.autobank.data.receipt
+package com.example.autobank.data.models
 
 import jakarta.persistence.*
 import org.jetbrains.annotations.NotNull

src/main/kotlin/com/example/autobank/data/Committee.kt → src/main/kotlin/com/example/autobank/data/models/Committee.kt

@@ -1,4 +1,4 @@
-package com.example.autobank.data
+package com.example.autobank.data.models
 
 import jakarta.persistence.*
 

src/main/kotlin/com/example/autobank/data/EconomicRequestReview.kt → src/main/kotlin/com/example/autobank/data/models/EconomicRequestReview.kt

@@ -1,4 +1,4 @@
-package com.example.autobank.data
+package com.example.autobank.data.models
 
 import jakarta.persistence.*
 import java.time.LocalDateTime

src/main/kotlin/com/example/autobank/data/Economicrequest.kt → src/main/kotlin/com/example/autobank/data/models/Economicrequest.kt

@@ -1,4 +1,4 @@
-package com.example.autobank.data
+package com.example.autobank.data.models
 
 import jakarta.persistence.*
 import org.hibernate.annotations.CreationTimestamp

src/main/kotlin/com/example/autobank/data/receipt/Payment.kt → src/main/kotlin/com/example/autobank/data/models/Payment.kt

@@ -1,4 +1,4 @@
-package com.example.autobank.data.receipt
+package com.example.autobank.data.models
 
 import jakarta.persistence.*
 import org.jetbrains.annotations.NotNull

src/main/kotlin/com/example/autobank/data/receipt/Receipt.kt → src/main/kotlin/com/example/autobank/data/models/Receipt.kt

@@ -1,4 +1,4 @@
-package com.example.autobank.data.receipt
+package com.example.autobank.data.models
 
 
 import jakarta.persistence.*

src/main/kotlin/com/example/autobank/data/receipt/ReceiptInfo.kt → src/main/kotlin/com/example/autobank/data/models/ReceiptInfo.kt

@@ -1,4 +1,4 @@
-package com.example.autobank.data.receipt
+package com.example.autobank.data.models
 
 import jakarta.persistence.Column
 import jakarta.persistence.Entity

src/main/kotlin/com/example/autobank/data/receipt/ReceiptReview.kt → src/main/kotlin/com/example/autobank/data/models/ReceiptReview.kt

@@ -1,4 +1,4 @@
-package com.example.autobank.data.receipt
+package com.example.autobank.data.models
 
 import jakarta.persistence.*
 import org.hibernate.annotations.CreationTimestamp

src/main/kotlin/com/example/autobank/data/receipt/CompleteReceipt.kt

@@ -1,10 +1,5 @@
 package com.example.autobank.data.receipt
 
-
-import jakarta.persistence.Column
-import jakarta.persistence.Entity
-import jakarta.persistence.Id
-import jakarta.persistence.Table
 import java.math.BigDecimal
 import java.time.LocalDateTime
 

src/main/kotlin/com/example/autobank/data/receipt/ReceiptListResponseBody.kt

@@ -1,5 +1,7 @@
 package com.example.autobank.data.receipt
 
+import com.example.autobank.data.models.ReceiptInfo
+
 class ReceiptListResponseBody(
     val receipts: Array<ReceiptInfo>,
     val total: Long,

src/main/kotlin/com/example/autobank/data/receipt/ReceiptRequestBody.kt

@@ -1,7 +1,6 @@
 package com.example.autobank.data.receipt
 
-import com.example.autobank.data.receipt.Receipt
-import jakarta.persistence.Entity
+import com.example.autobank.data.models.Receipt
 
 
 class ReceiptRequestBody {

src/main/kotlin/com/example/autobank/data/receipt/ReceiptResponseBody.kt

@@ -1,7 +1,6 @@
 package com.example.autobank.data.receipt
 
-import com.example.autobank.data.receipt.Receipt
-import jakarta.persistence.Entity
+import com.example.autobank.data.models.Receipt
 
 
 class ReceiptResponseBody {

src/main/kotlin/com/example/autobank/repository/CommitteeRepository.kt

@@ -1,7 +1,6 @@
 package com.example.autobank.repository;
 
-import com.example.autobank.data.Committee
-import com.example.autobank.data.Economicrequest
+import com.example.autobank.data.models.Committee
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.stereotype.Repository
 

src/main/kotlin/com/example/autobank/repository/EconomicRequestReviewRepository.kt

@@ -1,6 +1,6 @@
 package com.example.autobank.repository
 
-import com.example.autobank.data.EconomicRequestReview
+import com.example.autobank.data.models.EconomicRequestReview
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.data.jpa.repository.Modifying
 import org.springframework.data.jpa.repository.Query

src/main/kotlin/com/example/autobank/repository/EconomicrequestRepository.kt

@@ -1,6 +1,6 @@
 package com.example.autobank.repository;
 
-import com.example.autobank.data.Economicrequest
+import com.example.autobank.data.models.Economicrequest
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.stereotype.Repository
 

src/main/kotlin/com/example/autobank/repository/receipt/AttachmentRepository.kt

@@ -1,6 +1,6 @@
 package com.example.autobank.repository.receipt
 
-import com.example.autobank.data.receipt.Attachment
+import com.example.autobank.data.models.Attachment
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.stereotype.Repository
 

src/main/kotlin/com/example/autobank/repository/receipt/CardRepository.kt

@@ -1,6 +1,6 @@
 package com.example.autobank.repository.receipt
 
-import com.example.autobank.data.receipt.Card
+import com.example.autobank.data.models.Card
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.stereotype.Repository
 

src/main/kotlin/com/example/autobank/repository/receipt/PaymentRepository.kt

@@ -1,7 +1,6 @@
 package com.example.autobank.repository.receipt
 
-import com.example.autobank.data.receipt.Card
-import com.example.autobank.data.receipt.Payment
+import com.example.autobank.data.models.Payment
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.stereotype.Repository
 

src/main/kotlin/com/example/autobank/repository/receipt/ReceiptInfoViewRepository.kt

@@ -1,6 +1,6 @@
 package com.example.autobank.repository.receipt
 
-import com.example.autobank.data.receipt.ReceiptInfo
+import com.example.autobank.data.models.ReceiptInfo
 import org.springframework.data.domain.Page
 import org.springframework.data.domain.Pageable
 import org.springframework.data.jpa.repository.JpaRepository

src/main/kotlin/com/example/autobank/repository/receipt/ReceiptRepository.kt

@@ -1,6 +1,6 @@
 package com.example.autobank.repository.receipt
 
-import com.example.autobank.data.receipt.Receipt
+import com.example.autobank.data.models.Receipt
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.stereotype.Repository
 

src/main/kotlin/com/example/autobank/repository/receipt/ReceiptReviewRepository.kt

@@ -1,6 +1,6 @@
 package com.example.autobank.repository.receipt
 
-import com.example.autobank.data.receipt.ReceiptReview
+import com.example.autobank.data.models.ReceiptReview
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.stereotype.Repository
 import org.springframework.data.jpa.repository.Modifying

src/main/kotlin/com/example/autobank/repository/receipt/specification/ReceiptInfoViewSpecification.kt

@@ -1,6 +1,6 @@
 package com.example.autobank.repository.receipt.specification
 
-import com.example.autobank.data.receipt.ReceiptInfo
+import com.example.autobank.data.models.ReceiptInfo
 import org.springframework.data.jpa.domain.Specification
 import jakarta.persistence.criteria.Predicate
 

src/main/kotlin/com/example/autobank/service/AttachmentService.kt

@@ -1,6 +1,6 @@
 package com.example.autobank.service
 
-import com.example.autobank.data.receipt.Attachment
+import com.example.autobank.data.models.Attachment
 import com.example.autobank.repository.receipt.AttachmentRepository
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service

src/main/kotlin/com/example/autobank/service/CommitteeService.kt

@@ -1,6 +1,6 @@
 package com.example.autobank.service;
 
-import com.example.autobank.data.Committee
+import com.example.autobank.data.models.Committee
 import com.example.autobank.data.user.UserCommitteeResponseBody
 import com.example.autobank.repository.CommitteeRepository
 import org.springframework.beans.factory.annotation.Autowired

src/main/kotlin/com/example/autobank/service/EconomicRequestReviewService.kt

@@ -1,7 +1,7 @@
 package com.example.autobank.service
 
-import com.example.autobank.data.EconomicRequestReview
-import com.example.autobank.data.Economicrequest
+import com.example.autobank.data.models.EconomicRequestReview
+import com.example.autobank.data.models.Economicrequest
 import com.example.autobank.data.user.OnlineUser
 import com.example.autobank.repository.EconomicRequestReviewRepository
 import org.springframework.beans.factory.annotation.Autowired

src/main/kotlin/com/example/autobank/service/EconomicrequestService.kt

@@ -1,6 +1,6 @@
 package com.example.autobank.service
 
-import com.example.autobank.data.Economicrequest
+import com.example.autobank.data.models.Economicrequest
 import com.example.autobank.repository.EconomicrequestRepository
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service

src/main/kotlin/com/example/autobank/service/PaymentCardService.kt

@@ -4,8 +4,8 @@ import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service
 import com.example.autobank.repository.receipt.CardRepository
 import com.example.autobank.repository.receipt.PaymentRepository
-import com.example.autobank.data.receipt.Card
-import com.example.autobank.data.receipt.Payment
+import com.example.autobank.data.models.Card
+import com.example.autobank.data.models.Payment
 
 @Service
 class PaymentCardService {

src/main/kotlin/com/example/autobank/service/ReceiptAdminService.kt

@@ -5,7 +5,7 @@ import com.example.autobank.repository.receipt.ReceiptRepository
 import org.springframework.beans.factory.annotation.Autowired
 import com.example.autobank.repository.receipt.ReceiptInfoViewRepository
 import com.example.autobank.data.receipt.*
-import com.example.autobank.data.ReceiptReviewRequestBody
+import com.example.autobank.data.models.ReceiptInfo
 import com.example.autobank.repository.receipt.specification.ReceiptInfoSpecification
 import org.springframework.data.domain.PageRequest
 import org.springframework.data.domain.Sort
@@ -14,9 +14,6 @@ import org.springframework.data.domain.Sort
 @Service
 class ReceiptAdminService {
 
-    @Autowired
-    lateinit var receiptRepository: ReceiptRepository
-
     @Autowired
     lateinit var receiptInfoViewRepository: ReceiptInfoViewRepository
 
@@ -47,7 +44,6 @@ class ReceiptAdminService {
 
     fun getReceipt(id: Int): CompleteReceipt? {
         val receipt = receiptInfoViewRepository.findByReceiptId(id)
-
         return receiptService.getCompleteReceipt(receipt)
 
     }

src/main/kotlin/com/example/autobank/service/ReceiptReviewService.kt

@@ -1,8 +1,7 @@
 package com.example.autobank.service
 
 import com.example.autobank.data.ReceiptReviewRequestBody
-import com.example.autobank.data.receipt.ReceiptRequestBody
-import com.example.autobank.data.receipt.ReceiptReview
+import com.example.autobank.data.models.ReceiptReview
 import com.example.autobank.repository.receipt.ReceiptReviewRepository
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service

src/main/kotlin/com/example/autobank/service/ReceiptService.kt

@@ -1,5 +1,9 @@
 package com.example.autobank.service
 
+import com.example.autobank.data.models.Attachment
+import com.example.autobank.data.models.Card
+import com.example.autobank.data.models.Payment
+import com.example.autobank.data.models.ReceiptInfo
 import com.example.autobank.data.receipt.*
 import com.example.autobank.repository.receipt.CardRepository
 import com.example.autobank.repository.receipt.PaymentRepository
@@ -9,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
 
 @Service