diff --git a/backend/.gitignore b/.gitignore similarity index 100% rename from backend/.gitignore rename to .gitignore diff --git a/backend/pom.xml b/pom.xml similarity index 100% rename from backend/pom.xml rename to pom.xml diff --git a/backend/src/main/java/com/petshop/backend/BackendApplication.java b/src/main/java/com/petshop/backend/BackendApplication.java similarity index 100% rename from backend/src/main/java/com/petshop/backend/BackendApplication.java rename to src/main/java/com/petshop/backend/BackendApplication.java diff --git a/backend/src/main/java/com/petshop/backend/controller/AdoptionController.java b/src/main/java/com/petshop/backend/controller/AdoptionController.java similarity index 96% rename from backend/src/main/java/com/petshop/backend/controller/AdoptionController.java rename to src/main/java/com/petshop/backend/controller/AdoptionController.java index 0efe8741..81be9fd7 100644 --- a/backend/src/main/java/com/petshop/backend/controller/AdoptionController.java +++ b/src/main/java/com/petshop/backend/controller/AdoptionController.java @@ -5,7 +5,6 @@ import com.petshop.backend.dto.adoption.AdoptionResponse; import com.petshop.backend.dto.common.BulkDeleteRequest; import com.petshop.backend.service.AdoptionService; import jakarta.validation.Valid; -import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -14,7 +13,7 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/api/v1/adoptions") -@RequiredArgsConstructor + public class AdoptionController { private final AdoptionService adoptionService; diff --git a/backend/src/main/java/com/petshop/backend/controller/AppointmentController.java b/src/main/java/com/petshop/backend/controller/AppointmentController.java similarity index 97% rename from backend/src/main/java/com/petshop/backend/controller/AppointmentController.java rename to src/main/java/com/petshop/backend/controller/AppointmentController.java index 843aafe1..12ba8aa4 100644 --- a/backend/src/main/java/com/petshop/backend/controller/AppointmentController.java +++ b/src/main/java/com/petshop/backend/controller/AppointmentController.java @@ -5,7 +5,6 @@ import com.petshop.backend.dto.appointment.AppointmentResponse; import com.petshop.backend.dto.common.BulkDeleteRequest; import com.petshop.backend.service.AppointmentService; import jakarta.validation.Valid; -import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -14,7 +13,7 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/api/v1/appointments") -@RequiredArgsConstructor + public class AppointmentController { private final AppointmentService appointmentService; diff --git a/backend/src/main/java/com/petshop/backend/controller/AuthController.java b/src/main/java/com/petshop/backend/controller/AuthController.java similarity index 98% rename from backend/src/main/java/com/petshop/backend/controller/AuthController.java rename to src/main/java/com/petshop/backend/controller/AuthController.java index 4d0dea61..cab4ef52 100644 --- a/backend/src/main/java/com/petshop/backend/controller/AuthController.java +++ b/src/main/java/com/petshop/backend/controller/AuthController.java @@ -7,7 +7,6 @@ import com.petshop.backend.entity.User; import com.petshop.backend.repository.UserRepository; import com.petshop.backend.security.JwtUtil; import jakarta.validation.Valid; -import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.authentication.AuthenticationManager; @@ -24,7 +23,7 @@ import java.util.Map; @RestController @RequestMapping("/api/v1/auth") -@RequiredArgsConstructor + public class AuthController { private final AuthenticationManager authenticationManager; diff --git a/backend/src/main/java/com/petshop/backend/controller/CategoryController.java b/src/main/java/com/petshop/backend/controller/CategoryController.java similarity index 97% rename from backend/src/main/java/com/petshop/backend/controller/CategoryController.java rename to src/main/java/com/petshop/backend/controller/CategoryController.java index 7c6ab6be..510f729d 100644 --- a/backend/src/main/java/com/petshop/backend/controller/CategoryController.java +++ b/src/main/java/com/petshop/backend/controller/CategoryController.java @@ -5,7 +5,6 @@ import com.petshop.backend.dto.category.CategoryResponse; import com.petshop.backend.dto.common.BulkDeleteRequest; import com.petshop.backend.service.CategoryService; import jakarta.validation.Valid; -import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -14,7 +13,7 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/api/v1/categories") -@RequiredArgsConstructor + public class CategoryController { private final CategoryService categoryService; diff --git a/backend/src/main/java/com/petshop/backend/controller/CustomerController.java b/src/main/java/com/petshop/backend/controller/CustomerController.java similarity index 96% rename from backend/src/main/java/com/petshop/backend/controller/CustomerController.java rename to src/main/java/com/petshop/backend/controller/CustomerController.java index 393d043f..96ac564f 100644 --- a/backend/src/main/java/com/petshop/backend/controller/CustomerController.java +++ b/src/main/java/com/petshop/backend/controller/CustomerController.java @@ -5,7 +5,6 @@ import com.petshop.backend.dto.customer.CustomerRequest; import com.petshop.backend.dto.customer.CustomerResponse; import com.petshop.backend.service.CustomerService; import jakarta.validation.Valid; -import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -14,7 +13,7 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/api/v1/customers") -@RequiredArgsConstructor + public class CustomerController { private final CustomerService customerService; diff --git a/backend/src/main/java/com/petshop/backend/controller/DropdownController.java b/src/main/java/com/petshop/backend/controller/DropdownController.java similarity index 98% rename from backend/src/main/java/com/petshop/backend/controller/DropdownController.java rename to src/main/java/com/petshop/backend/controller/DropdownController.java index 73ba3cba..48cc4b5e 100644 --- a/backend/src/main/java/com/petshop/backend/controller/DropdownController.java +++ b/src/main/java/com/petshop/backend/controller/DropdownController.java @@ -2,7 +2,6 @@ package com.petshop.backend.controller; import com.petshop.backend.dto.common.DropdownOption; import com.petshop.backend.repository.*; -import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; @@ -14,7 +13,7 @@ import java.util.stream.Collectors; @RestController @RequestMapping("/api/v1/dropdowns") -@RequiredArgsConstructor + public class DropdownController { private final PetRepository petRepository; diff --git a/backend/src/main/java/com/petshop/backend/controller/InventoryController.java b/src/main/java/com/petshop/backend/controller/InventoryController.java similarity index 97% rename from backend/src/main/java/com/petshop/backend/controller/InventoryController.java rename to src/main/java/com/petshop/backend/controller/InventoryController.java index 61ac8df2..f4c6742a 100644 --- a/backend/src/main/java/com/petshop/backend/controller/InventoryController.java +++ b/src/main/java/com/petshop/backend/controller/InventoryController.java @@ -5,7 +5,6 @@ import com.petshop.backend.dto.inventory.InventoryRequest; import com.petshop.backend.dto.inventory.InventoryResponse; import com.petshop.backend.service.InventoryService; import jakarta.validation.Valid; -import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -15,7 +14,7 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/api/v1/inventory") -@RequiredArgsConstructor + @PreAuthorize("hasRole('ADMIN')") public class InventoryController { diff --git a/backend/src/main/java/com/petshop/backend/controller/PetController.java b/src/main/java/com/petshop/backend/controller/PetController.java similarity index 96% rename from backend/src/main/java/com/petshop/backend/controller/PetController.java rename to src/main/java/com/petshop/backend/controller/PetController.java index f5c45015..1d70bf87 100644 --- a/backend/src/main/java/com/petshop/backend/controller/PetController.java +++ b/src/main/java/com/petshop/backend/controller/PetController.java @@ -5,7 +5,6 @@ import com.petshop.backend.dto.pet.PetRequest; import com.petshop.backend.dto.pet.PetResponse; import com.petshop.backend.service.PetService; import jakarta.validation.Valid; -import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -14,7 +13,7 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/api/v1/pets") -@RequiredArgsConstructor + public class PetController { private final PetService petService; diff --git a/backend/src/main/java/com/petshop/backend/controller/ProductController.java b/src/main/java/com/petshop/backend/controller/ProductController.java similarity index 96% rename from backend/src/main/java/com/petshop/backend/controller/ProductController.java rename to src/main/java/com/petshop/backend/controller/ProductController.java index 7cec17a8..98d0fe10 100644 --- a/backend/src/main/java/com/petshop/backend/controller/ProductController.java +++ b/src/main/java/com/petshop/backend/controller/ProductController.java @@ -5,7 +5,6 @@ import com.petshop.backend.dto.product.ProductRequest; import com.petshop.backend.dto.product.ProductResponse; import com.petshop.backend.service.ProductService; import jakarta.validation.Valid; -import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -14,7 +13,7 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/api/v1/products") -@RequiredArgsConstructor + public class ProductController { private final ProductService productService; diff --git a/backend/src/main/java/com/petshop/backend/controller/ProductSupplierController.java b/src/main/java/com/petshop/backend/controller/ProductSupplierController.java similarity index 97% rename from backend/src/main/java/com/petshop/backend/controller/ProductSupplierController.java rename to src/main/java/com/petshop/backend/controller/ProductSupplierController.java index 20965a3d..18c31c79 100644 --- a/backend/src/main/java/com/petshop/backend/controller/ProductSupplierController.java +++ b/src/main/java/com/petshop/backend/controller/ProductSupplierController.java @@ -5,7 +5,6 @@ import com.petshop.backend.dto.productsupplier.ProductSupplierRequest; import com.petshop.backend.dto.productsupplier.ProductSupplierResponse; import com.petshop.backend.service.ProductSupplierService; import jakarta.validation.Valid; -import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -15,7 +14,7 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/api/v1/product-suppliers") -@RequiredArgsConstructor + @PreAuthorize("hasRole('ADMIN')") public class ProductSupplierController { diff --git a/backend/src/main/java/com/petshop/backend/controller/PurchaseOrderController.java b/src/main/java/com/petshop/backend/controller/PurchaseOrderController.java similarity index 94% rename from backend/src/main/java/com/petshop/backend/controller/PurchaseOrderController.java rename to src/main/java/com/petshop/backend/controller/PurchaseOrderController.java index fb0a8077..4496b750 100644 --- a/backend/src/main/java/com/petshop/backend/controller/PurchaseOrderController.java +++ b/src/main/java/com/petshop/backend/controller/PurchaseOrderController.java @@ -2,7 +2,6 @@ package com.petshop.backend.controller; import com.petshop.backend.dto.purchaseorder.PurchaseOrderResponse; import com.petshop.backend.service.PurchaseOrderService; -import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.http.ResponseEntity; @@ -11,7 +10,7 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/api/v1/purchase-orders") -@RequiredArgsConstructor + @PreAuthorize("hasRole('ADMIN')") public class PurchaseOrderController { diff --git a/backend/src/main/java/com/petshop/backend/controller/RefundController.java b/src/main/java/com/petshop/backend/controller/RefundController.java similarity index 92% rename from backend/src/main/java/com/petshop/backend/controller/RefundController.java rename to src/main/java/com/petshop/backend/controller/RefundController.java index ef527069..2410f0b5 100644 --- a/backend/src/main/java/com/petshop/backend/controller/RefundController.java +++ b/src/main/java/com/petshop/backend/controller/RefundController.java @@ -4,14 +4,13 @@ import com.petshop.backend.dto.refund.RefundRequest; import com.petshop.backend.dto.refund.RefundResponse; import com.petshop.backend.service.RefundService; import jakarta.validation.Valid; -import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/api/v1/sales") -@RequiredArgsConstructor + public class RefundController { private final RefundService refundService; diff --git a/backend/src/main/java/com/petshop/backend/controller/SaleController.java b/src/main/java/com/petshop/backend/controller/SaleController.java similarity index 94% rename from backend/src/main/java/com/petshop/backend/controller/SaleController.java rename to src/main/java/com/petshop/backend/controller/SaleController.java index 6b77ba43..71599551 100644 --- a/backend/src/main/java/com/petshop/backend/controller/SaleController.java +++ b/src/main/java/com/petshop/backend/controller/SaleController.java @@ -4,7 +4,6 @@ import com.petshop.backend.dto.sale.SaleRequest; import com.petshop.backend.dto.sale.SaleResponse; import com.petshop.backend.service.SaleService; import jakarta.validation.Valid; -import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -13,7 +12,7 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/api/v1/sales") -@RequiredArgsConstructor + public class SaleController { private final SaleService saleService; diff --git a/backend/src/main/java/com/petshop/backend/controller/ServiceController.java b/src/main/java/com/petshop/backend/controller/ServiceController.java similarity index 96% rename from backend/src/main/java/com/petshop/backend/controller/ServiceController.java rename to src/main/java/com/petshop/backend/controller/ServiceController.java index e1c5415b..979028c9 100644 --- a/backend/src/main/java/com/petshop/backend/controller/ServiceController.java +++ b/src/main/java/com/petshop/backend/controller/ServiceController.java @@ -5,7 +5,6 @@ import com.petshop.backend.dto.service.ServiceRequest; import com.petshop.backend.dto.service.ServiceResponse; import com.petshop.backend.service.ServiceService; import jakarta.validation.Valid; -import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -14,7 +13,7 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/api/v1/services") -@RequiredArgsConstructor + public class ServiceController { private final ServiceService serviceService; diff --git a/backend/src/main/java/com/petshop/backend/controller/SupplierController.java b/src/main/java/com/petshop/backend/controller/SupplierController.java similarity index 97% rename from backend/src/main/java/com/petshop/backend/controller/SupplierController.java rename to src/main/java/com/petshop/backend/controller/SupplierController.java index ebd4e68d..fd9c4622 100644 --- a/backend/src/main/java/com/petshop/backend/controller/SupplierController.java +++ b/src/main/java/com/petshop/backend/controller/SupplierController.java @@ -5,7 +5,6 @@ import com.petshop.backend.dto.supplier.SupplierRequest; import com.petshop.backend.dto.supplier.SupplierResponse; import com.petshop.backend.service.SupplierService; import jakarta.validation.Valid; -import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -15,7 +14,7 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/api/v1/suppliers") -@RequiredArgsConstructor + @PreAuthorize("hasRole('ADMIN')") public class SupplierController { diff --git a/backend/src/main/java/com/petshop/backend/controller/UserController.java b/src/main/java/com/petshop/backend/controller/UserController.java similarity index 96% rename from backend/src/main/java/com/petshop/backend/controller/UserController.java rename to src/main/java/com/petshop/backend/controller/UserController.java index c316dbe0..d6719f2b 100644 --- a/backend/src/main/java/com/petshop/backend/controller/UserController.java +++ b/src/main/java/com/petshop/backend/controller/UserController.java @@ -5,7 +5,6 @@ import com.petshop.backend.dto.user.UserRequest; import com.petshop.backend.dto.user.UserResponse; import com.petshop.backend.service.UserService; import jakarta.validation.Valid; -import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -15,7 +14,7 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/api/v1/users") -@RequiredArgsConstructor + @PreAuthorize("hasRole('ADMIN')") public class UserController { diff --git a/backend/src/main/java/com/petshop/backend/dto/adoption/AdoptionRequest.java b/src/main/java/com/petshop/backend/dto/adoption/AdoptionRequest.java similarity index 96% rename from backend/src/main/java/com/petshop/backend/dto/adoption/AdoptionRequest.java rename to src/main/java/com/petshop/backend/dto/adoption/AdoptionRequest.java index 96113d13..690ba25b 100644 --- a/backend/src/main/java/com/petshop/backend/dto/adoption/AdoptionRequest.java +++ b/src/main/java/com/petshop/backend/dto/adoption/AdoptionRequest.java @@ -2,12 +2,11 @@ package com.petshop.backend.dto.adoption; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Positive; -import lombok.Data; import java.math.BigDecimal; import java.time.LocalDate; -@Data + public class AdoptionRequest { @NotNull(message = "Pet ID is required") private Long petId; diff --git a/backend/src/main/java/com/petshop/backend/dto/adoption/AdoptionResponse.java b/src/main/java/com/petshop/backend/dto/adoption/AdoptionResponse.java similarity index 78% rename from backend/src/main/java/com/petshop/backend/dto/adoption/AdoptionResponse.java rename to src/main/java/com/petshop/backend/dto/adoption/AdoptionResponse.java index 1cf334f7..796a82ff 100644 --- a/backend/src/main/java/com/petshop/backend/dto/adoption/AdoptionResponse.java +++ b/src/main/java/com/petshop/backend/dto/adoption/AdoptionResponse.java @@ -1,16 +1,13 @@ package com.petshop.backend.dto.adoption; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; -@Data -@NoArgsConstructor -@AllArgsConstructor + + + public class AdoptionResponse { private Long id; private Long petId; diff --git a/backend/src/main/java/com/petshop/backend/dto/analytics/DashboardResponse.java b/src/main/java/com/petshop/backend/dto/analytics/DashboardResponse.java similarity index 73% rename from backend/src/main/java/com/petshop/backend/dto/analytics/DashboardResponse.java rename to src/main/java/com/petshop/backend/dto/analytics/DashboardResponse.java index d17967a0..b7d420f8 100644 --- a/backend/src/main/java/com/petshop/backend/dto/analytics/DashboardResponse.java +++ b/src/main/java/com/petshop/backend/dto/analytics/DashboardResponse.java @@ -1,16 +1,13 @@ package com.petshop.backend.dto.analytics; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; import java.math.BigDecimal; import java.util.List; import java.util.Map; -@Data -@NoArgsConstructor -@AllArgsConstructor + + + public class DashboardResponse { private SalesSummary salesSummary; private InventorySummary inventorySummary; @@ -18,9 +15,9 @@ public class DashboardResponse { private List dailySales; } -@Data -@NoArgsConstructor -@AllArgsConstructor + + + class SalesSummary { private BigDecimal totalRevenue; private Long totalSales; @@ -28,18 +25,18 @@ class SalesSummary { private Long totalRefundCount; } -@Data -@NoArgsConstructor -@AllArgsConstructor + + + class InventorySummary { private Long totalProducts; private Long lowStockProducts; private Long outOfStockProducts; } -@Data -@NoArgsConstructor -@AllArgsConstructor + + + class TopProduct { private Long productId; private String productName; @@ -47,9 +44,9 @@ class TopProduct { private BigDecimal revenue; } -@Data -@NoArgsConstructor -@AllArgsConstructor + + + class DailySales { private String date; private BigDecimal revenue; diff --git a/backend/src/main/java/com/petshop/backend/dto/appointment/AppointmentRequest.java b/src/main/java/com/petshop/backend/dto/appointment/AppointmentRequest.java similarity index 97% rename from backend/src/main/java/com/petshop/backend/dto/appointment/AppointmentRequest.java rename to src/main/java/com/petshop/backend/dto/appointment/AppointmentRequest.java index 202ba5ae..2e51532e 100644 --- a/backend/src/main/java/com/petshop/backend/dto/appointment/AppointmentRequest.java +++ b/src/main/java/com/petshop/backend/dto/appointment/AppointmentRequest.java @@ -3,13 +3,12 @@ package com.petshop.backend.dto.appointment; import com.petshop.backend.entity.Appointment; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; -import lombok.Data; import java.time.LocalDate; import java.time.LocalTime; import java.util.List; -@Data + public class AppointmentRequest { @NotNull(message = "Customer ID is required") private Long customerId; diff --git a/backend/src/main/java/com/petshop/backend/dto/appointment/AppointmentResponse.java b/src/main/java/com/petshop/backend/dto/appointment/AppointmentResponse.java similarity index 82% rename from backend/src/main/java/com/petshop/backend/dto/appointment/AppointmentResponse.java rename to src/main/java/com/petshop/backend/dto/appointment/AppointmentResponse.java index fb528f29..d2b54f66 100644 --- a/backend/src/main/java/com/petshop/backend/dto/appointment/AppointmentResponse.java +++ b/src/main/java/com/petshop/backend/dto/appointment/AppointmentResponse.java @@ -1,17 +1,14 @@ package com.petshop.backend.dto.appointment; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; import java.util.List; -@Data -@NoArgsConstructor -@AllArgsConstructor + + + public class AppointmentResponse { private Long id; private Long customerId; diff --git a/backend/src/main/java/com/petshop/backend/dto/auth/LoginRequest.java b/src/main/java/com/petshop/backend/dto/auth/LoginRequest.java similarity index 91% rename from backend/src/main/java/com/petshop/backend/dto/auth/LoginRequest.java rename to src/main/java/com/petshop/backend/dto/auth/LoginRequest.java index c80971c3..3adfd91a 100644 --- a/backend/src/main/java/com/petshop/backend/dto/auth/LoginRequest.java +++ b/src/main/java/com/petshop/backend/dto/auth/LoginRequest.java @@ -1,9 +1,8 @@ package com.petshop.backend.dto.auth; import jakarta.validation.constraints.NotBlank; -import lombok.Data; -@Data + public class LoginRequest { @NotBlank(message = "Username is required") private String username; diff --git a/backend/src/main/java/com/petshop/backend/dto/auth/LoginResponse.java b/src/main/java/com/petshop/backend/dto/auth/LoginResponse.java similarity index 69% rename from backend/src/main/java/com/petshop/backend/dto/auth/LoginResponse.java rename to src/main/java/com/petshop/backend/dto/auth/LoginResponse.java index d65b69f0..67574120 100644 --- a/backend/src/main/java/com/petshop/backend/dto/auth/LoginResponse.java +++ b/src/main/java/com/petshop/backend/dto/auth/LoginResponse.java @@ -1,10 +1,8 @@ package com.petshop.backend.dto.auth; -import lombok.AllArgsConstructor; -import lombok.Data; -@Data -@AllArgsConstructor + + public class LoginResponse { private String token; private String username; diff --git a/backend/src/main/java/com/petshop/backend/dto/auth/UserInfoResponse.java b/src/main/java/com/petshop/backend/dto/auth/UserInfoResponse.java similarity index 71% rename from backend/src/main/java/com/petshop/backend/dto/auth/UserInfoResponse.java rename to src/main/java/com/petshop/backend/dto/auth/UserInfoResponse.java index b96a01b1..9e863cb4 100644 --- a/backend/src/main/java/com/petshop/backend/dto/auth/UserInfoResponse.java +++ b/src/main/java/com/petshop/backend/dto/auth/UserInfoResponse.java @@ -1,10 +1,8 @@ package com.petshop.backend.dto.auth; -import lombok.AllArgsConstructor; -import lombok.Data; -@Data -@AllArgsConstructor + + public class UserInfoResponse { private Long id; private String username; diff --git a/backend/src/main/java/com/petshop/backend/dto/category/CategoryRequest.java b/src/main/java/com/petshop/backend/dto/category/CategoryRequest.java similarity index 90% rename from backend/src/main/java/com/petshop/backend/dto/category/CategoryRequest.java rename to src/main/java/com/petshop/backend/dto/category/CategoryRequest.java index 55794933..19b7d4b4 100644 --- a/backend/src/main/java/com/petshop/backend/dto/category/CategoryRequest.java +++ b/src/main/java/com/petshop/backend/dto/category/CategoryRequest.java @@ -1,9 +1,8 @@ package com.petshop.backend.dto.category; import jakarta.validation.constraints.NotBlank; -import lombok.Data; -@Data + public class CategoryRequest { @NotBlank(message = "Category name is required") private String categoryName; diff --git a/backend/src/main/java/com/petshop/backend/dto/category/CategoryResponse.java b/src/main/java/com/petshop/backend/dto/category/CategoryResponse.java similarity index 67% rename from backend/src/main/java/com/petshop/backend/dto/category/CategoryResponse.java rename to src/main/java/com/petshop/backend/dto/category/CategoryResponse.java index 0f4939a0..758be129 100644 --- a/backend/src/main/java/com/petshop/backend/dto/category/CategoryResponse.java +++ b/src/main/java/com/petshop/backend/dto/category/CategoryResponse.java @@ -1,14 +1,11 @@ package com.petshop.backend.dto.category; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; import java.time.LocalDateTime; -@Data -@NoArgsConstructor -@AllArgsConstructor + + + public class CategoryResponse { private Long id; private String categoryName; diff --git a/backend/src/main/java/com/petshop/backend/dto/common/BulkDeleteRequest.java b/src/main/java/com/petshop/backend/dto/common/BulkDeleteRequest.java similarity index 89% rename from backend/src/main/java/com/petshop/backend/dto/common/BulkDeleteRequest.java rename to src/main/java/com/petshop/backend/dto/common/BulkDeleteRequest.java index 343ecb5e..99391913 100644 --- a/backend/src/main/java/com/petshop/backend/dto/common/BulkDeleteRequest.java +++ b/src/main/java/com/petshop/backend/dto/common/BulkDeleteRequest.java @@ -1,11 +1,10 @@ package com.petshop.backend.dto.common; import jakarta.validation.constraints.NotEmpty; -import lombok.Data; import java.util.List; -@Data + public class BulkDeleteRequest { @NotEmpty(message = "IDs list cannot be empty") private List ids; diff --git a/backend/src/main/java/com/petshop/backend/dto/common/DropdownOption.java b/src/main/java/com/petshop/backend/dto/common/DropdownOption.java similarity index 60% rename from backend/src/main/java/com/petshop/backend/dto/common/DropdownOption.java rename to src/main/java/com/petshop/backend/dto/common/DropdownOption.java index 8fac390c..494fa5a7 100644 --- a/backend/src/main/java/com/petshop/backend/dto/common/DropdownOption.java +++ b/src/main/java/com/petshop/backend/dto/common/DropdownOption.java @@ -1,10 +1,8 @@ package com.petshop.backend.dto.common; -import lombok.AllArgsConstructor; -import lombok.Data; -@Data -@AllArgsConstructor + + public class DropdownOption { private Long id; private String label; diff --git a/backend/src/main/java/com/petshop/backend/dto/customer/CustomerRequest.java b/src/main/java/com/petshop/backend/dto/customer/CustomerRequest.java similarity index 93% rename from backend/src/main/java/com/petshop/backend/dto/customer/CustomerRequest.java rename to src/main/java/com/petshop/backend/dto/customer/CustomerRequest.java index 0319f3ea..5f068b32 100644 --- a/backend/src/main/java/com/petshop/backend/dto/customer/CustomerRequest.java +++ b/src/main/java/com/petshop/backend/dto/customer/CustomerRequest.java @@ -2,9 +2,8 @@ package com.petshop.backend.dto.customer; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; -import lombok.Data; -@Data + public class CustomerRequest { @NotBlank(message = "Customer name is required") private String customerName; diff --git a/backend/src/main/java/com/petshop/backend/dto/customer/CustomerResponse.java b/src/main/java/com/petshop/backend/dto/customer/CustomerResponse.java similarity index 72% rename from backend/src/main/java/com/petshop/backend/dto/customer/CustomerResponse.java rename to src/main/java/com/petshop/backend/dto/customer/CustomerResponse.java index 32c68421..6f929bae 100644 --- a/backend/src/main/java/com/petshop/backend/dto/customer/CustomerResponse.java +++ b/src/main/java/com/petshop/backend/dto/customer/CustomerResponse.java @@ -1,14 +1,11 @@ package com.petshop.backend.dto.customer; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; import java.time.LocalDateTime; -@Data -@NoArgsConstructor -@AllArgsConstructor + + + public class CustomerResponse { private Long id; private String customerName; diff --git a/backend/src/main/java/com/petshop/backend/dto/inventory/InventoryRequest.java b/src/main/java/com/petshop/backend/dto/inventory/InventoryRequest.java similarity index 95% rename from backend/src/main/java/com/petshop/backend/dto/inventory/InventoryRequest.java rename to src/main/java/com/petshop/backend/dto/inventory/InventoryRequest.java index 8e91e494..fb4ff6b9 100644 --- a/backend/src/main/java/com/petshop/backend/dto/inventory/InventoryRequest.java +++ b/src/main/java/com/petshop/backend/dto/inventory/InventoryRequest.java @@ -2,9 +2,8 @@ package com.petshop.backend.dto.inventory; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.PositiveOrZero; -import lombok.Data; -@Data + public class InventoryRequest { @NotNull(message = "Product ID is required") private Long productId; diff --git a/backend/src/main/java/com/petshop/backend/dto/inventory/InventoryResponse.java b/src/main/java/com/petshop/backend/dto/inventory/InventoryResponse.java similarity index 77% rename from backend/src/main/java/com/petshop/backend/dto/inventory/InventoryResponse.java rename to src/main/java/com/petshop/backend/dto/inventory/InventoryResponse.java index 4b5e30d7..feff7600 100644 --- a/backend/src/main/java/com/petshop/backend/dto/inventory/InventoryResponse.java +++ b/src/main/java/com/petshop/backend/dto/inventory/InventoryResponse.java @@ -1,14 +1,11 @@ package com.petshop.backend.dto.inventory; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; import java.time.LocalDateTime; -@Data -@NoArgsConstructor -@AllArgsConstructor + + + public class InventoryResponse { private Long id; private Long productId; diff --git a/backend/src/main/java/com/petshop/backend/dto/pet/PetRequest.java b/src/main/java/com/petshop/backend/dto/pet/PetRequest.java similarity index 96% rename from backend/src/main/java/com/petshop/backend/dto/pet/PetRequest.java rename to src/main/java/com/petshop/backend/dto/pet/PetRequest.java index e5014dd7..202dc6e7 100644 --- a/backend/src/main/java/com/petshop/backend/dto/pet/PetRequest.java +++ b/src/main/java/com/petshop/backend/dto/pet/PetRequest.java @@ -4,11 +4,10 @@ import com.petshop.backend.entity.Pet; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Positive; -import lombok.Data; import java.math.BigDecimal; -@Data + public class PetRequest { @NotBlank(message = "Pet name is required") private String petName; diff --git a/backend/src/main/java/com/petshop/backend/dto/pet/PetResponse.java b/src/main/java/com/petshop/backend/dto/pet/PetResponse.java similarity index 75% rename from backend/src/main/java/com/petshop/backend/dto/pet/PetResponse.java rename to src/main/java/com/petshop/backend/dto/pet/PetResponse.java index 93d64d56..9409b0ad 100644 --- a/backend/src/main/java/com/petshop/backend/dto/pet/PetResponse.java +++ b/src/main/java/com/petshop/backend/dto/pet/PetResponse.java @@ -1,15 +1,12 @@ package com.petshop.backend.dto.pet; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; import java.math.BigDecimal; import java.time.LocalDateTime; -@Data -@NoArgsConstructor -@AllArgsConstructor + + + public class PetResponse { private Long id; private String petName; diff --git a/backend/src/main/java/com/petshop/backend/dto/product/ProductRequest.java b/src/main/java/com/petshop/backend/dto/product/ProductRequest.java similarity index 96% rename from backend/src/main/java/com/petshop/backend/dto/product/ProductRequest.java rename to src/main/java/com/petshop/backend/dto/product/ProductRequest.java index 2ffe720d..c784513d 100644 --- a/backend/src/main/java/com/petshop/backend/dto/product/ProductRequest.java +++ b/src/main/java/com/petshop/backend/dto/product/ProductRequest.java @@ -3,11 +3,10 @@ package com.petshop.backend.dto.product; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Positive; -import lombok.Data; import java.math.BigDecimal; -@Data + public class ProductRequest { @NotBlank(message = "Product name is required") private String productName; diff --git a/backend/src/main/java/com/petshop/backend/dto/product/ProductResponse.java b/src/main/java/com/petshop/backend/dto/product/ProductResponse.java similarity index 76% rename from backend/src/main/java/com/petshop/backend/dto/product/ProductResponse.java rename to src/main/java/com/petshop/backend/dto/product/ProductResponse.java index bc4eaebd..ec6b3ae9 100644 --- a/backend/src/main/java/com/petshop/backend/dto/product/ProductResponse.java +++ b/src/main/java/com/petshop/backend/dto/product/ProductResponse.java @@ -1,15 +1,12 @@ package com.petshop.backend.dto.product; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; import java.math.BigDecimal; import java.time.LocalDateTime; -@Data -@NoArgsConstructor -@AllArgsConstructor + + + public class ProductResponse { private Long id; private String productName; diff --git a/backend/src/main/java/com/petshop/backend/dto/productsupplier/BulkDeleteProductSupplierRequest.java b/src/main/java/com/petshop/backend/dto/productsupplier/BulkDeleteProductSupplierRequest.java similarity index 91% rename from backend/src/main/java/com/petshop/backend/dto/productsupplier/BulkDeleteProductSupplierRequest.java rename to src/main/java/com/petshop/backend/dto/productsupplier/BulkDeleteProductSupplierRequest.java index dfa95bb5..97704bd8 100644 --- a/backend/src/main/java/com/petshop/backend/dto/productsupplier/BulkDeleteProductSupplierRequest.java +++ b/src/main/java/com/petshop/backend/dto/productsupplier/BulkDeleteProductSupplierRequest.java @@ -1,11 +1,10 @@ package com.petshop.backend.dto.productsupplier; import jakarta.validation.constraints.NotEmpty; -import lombok.Data; import java.util.List; -@Data + public class BulkDeleteProductSupplierRequest { @NotEmpty(message = "Keys list cannot be empty") private List keys; diff --git a/backend/src/main/java/com/petshop/backend/dto/productsupplier/ProductSupplierKey.java b/src/main/java/com/petshop/backend/dto/productsupplier/ProductSupplierKey.java similarity index 89% rename from backend/src/main/java/com/petshop/backend/dto/productsupplier/ProductSupplierKey.java rename to src/main/java/com/petshop/backend/dto/productsupplier/ProductSupplierKey.java index 3826b39c..ca1c0c96 100644 --- a/backend/src/main/java/com/petshop/backend/dto/productsupplier/ProductSupplierKey.java +++ b/src/main/java/com/petshop/backend/dto/productsupplier/ProductSupplierKey.java @@ -1,11 +1,10 @@ package com.petshop.backend.dto.productsupplier; import jakarta.validation.constraints.NotEmpty; -import lombok.Data; import java.util.List; -@Data + public class ProductSupplierKey { private Long productId; private Long supplierId; diff --git a/backend/src/main/java/com/petshop/backend/dto/productsupplier/ProductSupplierRequest.java b/src/main/java/com/petshop/backend/dto/productsupplier/ProductSupplierRequest.java similarity index 96% rename from backend/src/main/java/com/petshop/backend/dto/productsupplier/ProductSupplierRequest.java rename to src/main/java/com/petshop/backend/dto/productsupplier/ProductSupplierRequest.java index 68263597..7e0ef87a 100644 --- a/backend/src/main/java/com/petshop/backend/dto/productsupplier/ProductSupplierRequest.java +++ b/src/main/java/com/petshop/backend/dto/productsupplier/ProductSupplierRequest.java @@ -3,11 +3,10 @@ package com.petshop.backend.dto.productsupplier; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Positive; import jakarta.validation.constraints.PositiveOrZero; -import lombok.Data; import java.math.BigDecimal; -@Data + public class ProductSupplierRequest { @NotNull(message = "Product ID is required") private Long productId; diff --git a/backend/src/main/java/com/petshop/backend/dto/productsupplier/ProductSupplierResponse.java b/src/main/java/com/petshop/backend/dto/productsupplier/ProductSupplierResponse.java similarity index 77% rename from backend/src/main/java/com/petshop/backend/dto/productsupplier/ProductSupplierResponse.java rename to src/main/java/com/petshop/backend/dto/productsupplier/ProductSupplierResponse.java index 371fd34b..49535076 100644 --- a/backend/src/main/java/com/petshop/backend/dto/productsupplier/ProductSupplierResponse.java +++ b/src/main/java/com/petshop/backend/dto/productsupplier/ProductSupplierResponse.java @@ -1,15 +1,12 @@ package com.petshop.backend.dto.productsupplier; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; import java.math.BigDecimal; import java.time.LocalDateTime; -@Data -@NoArgsConstructor -@AllArgsConstructor + + + public class ProductSupplierResponse { private Long productId; private String productName; diff --git a/backend/src/main/java/com/petshop/backend/dto/purchaseorder/PurchaseOrderResponse.java b/src/main/java/com/petshop/backend/dto/purchaseorder/PurchaseOrderResponse.java similarity index 81% rename from backend/src/main/java/com/petshop/backend/dto/purchaseorder/PurchaseOrderResponse.java rename to src/main/java/com/petshop/backend/dto/purchaseorder/PurchaseOrderResponse.java index a7e68041..d6f214c2 100644 --- a/backend/src/main/java/com/petshop/backend/dto/purchaseorder/PurchaseOrderResponse.java +++ b/src/main/java/com/petshop/backend/dto/purchaseorder/PurchaseOrderResponse.java @@ -1,17 +1,14 @@ package com.petshop.backend.dto.purchaseorder; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.List; -@Data -@NoArgsConstructor -@AllArgsConstructor + + + public class PurchaseOrderResponse { private Long id; private Long supplierId; @@ -25,9 +22,9 @@ public class PurchaseOrderResponse { private LocalDateTime createdAt; private LocalDateTime updatedAt; - @Data - @NoArgsConstructor - @AllArgsConstructor + + + public static class PurchaseOrderItemResponse { private Long id; private Long productId; diff --git a/backend/src/main/java/com/petshop/backend/dto/refund/RefundItemRequest.java b/src/main/java/com/petshop/backend/dto/refund/RefundItemRequest.java similarity index 93% rename from backend/src/main/java/com/petshop/backend/dto/refund/RefundItemRequest.java rename to src/main/java/com/petshop/backend/dto/refund/RefundItemRequest.java index f972407c..96ed87f8 100644 --- a/backend/src/main/java/com/petshop/backend/dto/refund/RefundItemRequest.java +++ b/src/main/java/com/petshop/backend/dto/refund/RefundItemRequest.java @@ -2,9 +2,8 @@ package com.petshop.backend.dto.refund; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Positive; -import lombok.Data; -@Data + public class RefundItemRequest { @NotNull(message = "Sale item ID is required") private Long saleItemId; diff --git a/backend/src/main/java/com/petshop/backend/dto/refund/RefundRequest.java b/src/main/java/com/petshop/backend/dto/refund/RefundRequest.java similarity index 94% rename from backend/src/main/java/com/petshop/backend/dto/refund/RefundRequest.java rename to src/main/java/com/petshop/backend/dto/refund/RefundRequest.java index 1abf9c23..677c3439 100644 --- a/backend/src/main/java/com/petshop/backend/dto/refund/RefundRequest.java +++ b/src/main/java/com/petshop/backend/dto/refund/RefundRequest.java @@ -4,11 +4,10 @@ import jakarta.validation.Valid; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Positive; -import lombok.Data; import java.util.List; -@Data + public class RefundRequest { @NotEmpty(message = "At least one item is required") @Valid diff --git a/backend/src/main/java/com/petshop/backend/dto/refund/RefundResponse.java b/src/main/java/com/petshop/backend/dto/refund/RefundResponse.java similarity index 79% rename from backend/src/main/java/com/petshop/backend/dto/refund/RefundResponse.java rename to src/main/java/com/petshop/backend/dto/refund/RefundResponse.java index 4ef1caa4..2f031b65 100644 --- a/backend/src/main/java/com/petshop/backend/dto/refund/RefundResponse.java +++ b/src/main/java/com/petshop/backend/dto/refund/RefundResponse.java @@ -1,16 +1,13 @@ package com.petshop.backend.dto.refund; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; -@Data -@NoArgsConstructor -@AllArgsConstructor + + + public class RefundResponse { private Long id; private Long saleId; @@ -22,9 +19,9 @@ public class RefundResponse { private List items; private LocalDateTime createdAt; - @Data - @NoArgsConstructor - @AllArgsConstructor + + + public static class RefundItemResponse { private Long id; private Long saleItemId; diff --git a/backend/src/main/java/com/petshop/backend/dto/sale/SaleItemRequest.java b/src/main/java/com/petshop/backend/dto/sale/SaleItemRequest.java similarity index 93% rename from backend/src/main/java/com/petshop/backend/dto/sale/SaleItemRequest.java rename to src/main/java/com/petshop/backend/dto/sale/SaleItemRequest.java index 60d5596e..0722fc77 100644 --- a/backend/src/main/java/com/petshop/backend/dto/sale/SaleItemRequest.java +++ b/src/main/java/com/petshop/backend/dto/sale/SaleItemRequest.java @@ -2,9 +2,8 @@ package com.petshop.backend.dto.sale; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Positive; -import lombok.Data; -@Data + public class SaleItemRequest { @NotNull(message = "Product ID is required") private Long productId; diff --git a/backend/src/main/java/com/petshop/backend/dto/sale/SaleRequest.java b/src/main/java/com/petshop/backend/dto/sale/SaleRequest.java similarity index 95% rename from backend/src/main/java/com/petshop/backend/dto/sale/SaleRequest.java rename to src/main/java/com/petshop/backend/dto/sale/SaleRequest.java index 220aaa39..26b22952 100644 --- a/backend/src/main/java/com/petshop/backend/dto/sale/SaleRequest.java +++ b/src/main/java/com/petshop/backend/dto/sale/SaleRequest.java @@ -4,12 +4,11 @@ import jakarta.validation.Valid; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Positive; -import lombok.Data; import java.math.BigDecimal; import java.util.List; -@Data + public class SaleRequest { private Long customerId; diff --git a/backend/src/main/java/com/petshop/backend/dto/sale/SaleResponse.java b/src/main/java/com/petshop/backend/dto/sale/SaleResponse.java similarity index 82% rename from backend/src/main/java/com/petshop/backend/dto/sale/SaleResponse.java rename to src/main/java/com/petshop/backend/dto/sale/SaleResponse.java index e05063ef..d1cf1c45 100644 --- a/backend/src/main/java/com/petshop/backend/dto/sale/SaleResponse.java +++ b/src/main/java/com/petshop/backend/dto/sale/SaleResponse.java @@ -1,16 +1,13 @@ package com.petshop.backend.dto.sale; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; -@Data -@NoArgsConstructor -@AllArgsConstructor + + + public class SaleResponse { private Long id; private LocalDateTime saleDate; @@ -28,9 +25,9 @@ public class SaleResponse { private List items; private LocalDateTime createdAt; - @Data - @NoArgsConstructor - @AllArgsConstructor + + + public static class SaleItemResponse { private Long id; private Long productId; diff --git a/backend/src/main/java/com/petshop/backend/dto/service/ServiceRequest.java b/src/main/java/com/petshop/backend/dto/service/ServiceRequest.java similarity index 96% rename from backend/src/main/java/com/petshop/backend/dto/service/ServiceRequest.java rename to src/main/java/com/petshop/backend/dto/service/ServiceRequest.java index 419b82ab..b5c6bbce 100644 --- a/backend/src/main/java/com/petshop/backend/dto/service/ServiceRequest.java +++ b/src/main/java/com/petshop/backend/dto/service/ServiceRequest.java @@ -3,11 +3,10 @@ package com.petshop.backend.dto.service; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Positive; -import lombok.Data; import java.math.BigDecimal; -@Data + public class ServiceRequest { @NotBlank(message = "Service name is required") private String serviceName; diff --git a/backend/src/main/java/com/petshop/backend/dto/service/ServiceResponse.java b/src/main/java/com/petshop/backend/dto/service/ServiceResponse.java similarity index 75% rename from backend/src/main/java/com/petshop/backend/dto/service/ServiceResponse.java rename to src/main/java/com/petshop/backend/dto/service/ServiceResponse.java index 5f786c03..992d8fdc 100644 --- a/backend/src/main/java/com/petshop/backend/dto/service/ServiceResponse.java +++ b/src/main/java/com/petshop/backend/dto/service/ServiceResponse.java @@ -1,15 +1,12 @@ package com.petshop.backend.dto.service; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; import java.math.BigDecimal; import java.time.LocalDateTime; -@Data -@NoArgsConstructor -@AllArgsConstructor + + + public class ServiceResponse { private Long id; private String serviceName; diff --git a/backend/src/main/java/com/petshop/backend/dto/supplier/SupplierRequest.java b/src/main/java/com/petshop/backend/dto/supplier/SupplierRequest.java similarity index 94% rename from backend/src/main/java/com/petshop/backend/dto/supplier/SupplierRequest.java rename to src/main/java/com/petshop/backend/dto/supplier/SupplierRequest.java index 18d0c27a..36081cf2 100644 --- a/backend/src/main/java/com/petshop/backend/dto/supplier/SupplierRequest.java +++ b/src/main/java/com/petshop/backend/dto/supplier/SupplierRequest.java @@ -2,9 +2,8 @@ package com.petshop.backend.dto.supplier; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; -import lombok.Data; -@Data + public class SupplierRequest { @NotBlank(message = "Supplier name is required") private String supplierName; diff --git a/backend/src/main/java/com/petshop/backend/dto/supplier/SupplierResponse.java b/src/main/java/com/petshop/backend/dto/supplier/SupplierResponse.java similarity index 75% rename from backend/src/main/java/com/petshop/backend/dto/supplier/SupplierResponse.java rename to src/main/java/com/petshop/backend/dto/supplier/SupplierResponse.java index 71b07142..8af255d1 100644 --- a/backend/src/main/java/com/petshop/backend/dto/supplier/SupplierResponse.java +++ b/src/main/java/com/petshop/backend/dto/supplier/SupplierResponse.java @@ -1,14 +1,11 @@ package com.petshop.backend.dto.supplier; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; import java.time.LocalDateTime; -@Data -@NoArgsConstructor -@AllArgsConstructor + + + public class SupplierResponse { private Long id; private String supplierName; diff --git a/backend/src/main/java/com/petshop/backend/dto/user/UserRequest.java b/src/main/java/com/petshop/backend/dto/user/UserRequest.java similarity index 96% rename from backend/src/main/java/com/petshop/backend/dto/user/UserRequest.java rename to src/main/java/com/petshop/backend/dto/user/UserRequest.java index 5018a580..ca68354b 100644 --- a/backend/src/main/java/com/petshop/backend/dto/user/UserRequest.java +++ b/src/main/java/com/petshop/backend/dto/user/UserRequest.java @@ -5,9 +5,8 @@ import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; -import lombok.Data; -@Data + public class UserRequest { @NotBlank(message = "Username is required") @Size(min = 3, max = 50, message = "Username must be between 3 and 50 characters") diff --git a/backend/src/main/java/com/petshop/backend/dto/user/UserResponse.java b/src/main/java/com/petshop/backend/dto/user/UserResponse.java similarity index 71% rename from backend/src/main/java/com/petshop/backend/dto/user/UserResponse.java rename to src/main/java/com/petshop/backend/dto/user/UserResponse.java index 7d929049..0fac71c9 100644 --- a/backend/src/main/java/com/petshop/backend/dto/user/UserResponse.java +++ b/src/main/java/com/petshop/backend/dto/user/UserResponse.java @@ -1,14 +1,11 @@ package com.petshop.backend.dto.user; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; import java.time.LocalDateTime; -@Data -@NoArgsConstructor -@AllArgsConstructor + + + public class UserResponse { private Long id; private String username; diff --git a/backend/src/main/java/com/petshop/backend/entity/Adoption.java b/src/main/java/com/petshop/backend/entity/Adoption.java similarity index 89% rename from backend/src/main/java/com/petshop/backend/entity/Adoption.java rename to src/main/java/com/petshop/backend/entity/Adoption.java index f7842f82..51366e27 100644 --- a/backend/src/main/java/com/petshop/backend/entity/Adoption.java +++ b/src/main/java/com/petshop/backend/entity/Adoption.java @@ -1,9 +1,6 @@ package com.petshop.backend.entity; import jakarta.persistence.*; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.annotations.UpdateTimestamp; @@ -13,9 +10,9 @@ import java.time.LocalDateTime; @Entity @Table(name = "adoptions") -@Data -@NoArgsConstructor -@AllArgsConstructor + + + public class Adoption { @Id diff --git a/backend/src/main/java/com/petshop/backend/entity/Appointment.java b/src/main/java/com/petshop/backend/entity/Appointment.java similarity index 92% rename from backend/src/main/java/com/petshop/backend/entity/Appointment.java rename to src/main/java/com/petshop/backend/entity/Appointment.java index b1810b48..60b6d1c0 100644 --- a/backend/src/main/java/com/petshop/backend/entity/Appointment.java +++ b/src/main/java/com/petshop/backend/entity/Appointment.java @@ -1,9 +1,6 @@ package com.petshop.backend.entity; import jakarta.persistence.*; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.annotations.UpdateTimestamp; @@ -15,9 +12,9 @@ import java.util.Set; @Entity @Table(name = "appointments") -@Data -@NoArgsConstructor -@AllArgsConstructor + + + public class Appointment { @Id diff --git a/backend/src/main/java/com/petshop/backend/entity/Category.java b/src/main/java/com/petshop/backend/entity/Category.java similarity index 85% rename from backend/src/main/java/com/petshop/backend/entity/Category.java rename to src/main/java/com/petshop/backend/entity/Category.java index e21289a4..7380c6d3 100644 --- a/backend/src/main/java/com/petshop/backend/entity/Category.java +++ b/src/main/java/com/petshop/backend/entity/Category.java @@ -1,9 +1,6 @@ package com.petshop.backend.entity; import jakarta.persistence.*; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.annotations.UpdateTimestamp; @@ -11,9 +8,9 @@ import java.time.LocalDateTime; @Entity @Table(name = "categories") -@Data -@NoArgsConstructor -@AllArgsConstructor + + + public class Category { @Id diff --git a/backend/src/main/java/com/petshop/backend/entity/Customer.java b/src/main/java/com/petshop/backend/entity/Customer.java similarity index 87% rename from backend/src/main/java/com/petshop/backend/entity/Customer.java rename to src/main/java/com/petshop/backend/entity/Customer.java index ab10b792..496cd705 100644 --- a/backend/src/main/java/com/petshop/backend/entity/Customer.java +++ b/src/main/java/com/petshop/backend/entity/Customer.java @@ -1,9 +1,6 @@ package com.petshop.backend.entity; import jakarta.persistence.*; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.annotations.UpdateTimestamp; @@ -11,9 +8,9 @@ import java.time.LocalDateTime; @Entity @Table(name = "customers") -@Data -@NoArgsConstructor -@AllArgsConstructor + + + public class Customer { @Id diff --git a/backend/src/main/java/com/petshop/backend/entity/Inventory.java b/src/main/java/com/petshop/backend/entity/Inventory.java similarity index 89% rename from backend/src/main/java/com/petshop/backend/entity/Inventory.java rename to src/main/java/com/petshop/backend/entity/Inventory.java index 66c56b9b..bdcd42ef 100644 --- a/backend/src/main/java/com/petshop/backend/entity/Inventory.java +++ b/src/main/java/com/petshop/backend/entity/Inventory.java @@ -1,9 +1,6 @@ package com.petshop.backend.entity; import jakarta.persistence.*; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.annotations.UpdateTimestamp; @@ -13,9 +10,9 @@ import java.time.LocalDateTime; @Table(name = "inventory", uniqueConstraints = { @UniqueConstraint(name = "unique_product_store", columnNames = {"product_id", "store_id"}) }) -@Data -@NoArgsConstructor -@AllArgsConstructor + + + public class Inventory { @Id diff --git a/backend/src/main/java/com/petshop/backend/entity/Pet.java b/src/main/java/com/petshop/backend/entity/Pet.java similarity index 90% rename from backend/src/main/java/com/petshop/backend/entity/Pet.java rename to src/main/java/com/petshop/backend/entity/Pet.java index de7bf5ab..8e0587ba 100644 --- a/backend/src/main/java/com/petshop/backend/entity/Pet.java +++ b/src/main/java/com/petshop/backend/entity/Pet.java @@ -1,9 +1,6 @@ package com.petshop.backend.entity; import jakarta.persistence.*; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.annotations.UpdateTimestamp; @@ -12,9 +9,9 @@ import java.time.LocalDateTime; @Entity @Table(name = "pets") -@Data -@NoArgsConstructor -@AllArgsConstructor + + + public class Pet { @Id diff --git a/backend/src/main/java/com/petshop/backend/entity/Product.java b/src/main/java/com/petshop/backend/entity/Product.java similarity index 89% rename from backend/src/main/java/com/petshop/backend/entity/Product.java rename to src/main/java/com/petshop/backend/entity/Product.java index 8ccc72a1..49ebf645 100644 --- a/backend/src/main/java/com/petshop/backend/entity/Product.java +++ b/src/main/java/com/petshop/backend/entity/Product.java @@ -1,9 +1,6 @@ package com.petshop.backend.entity; import jakarta.persistence.*; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.annotations.UpdateTimestamp; @@ -12,9 +9,9 @@ import java.time.LocalDateTime; @Entity @Table(name = "products") -@Data -@NoArgsConstructor -@AllArgsConstructor + + + public class Product { @Id diff --git a/backend/src/main/java/com/petshop/backend/entity/ProductSupplier.java b/src/main/java/com/petshop/backend/entity/ProductSupplier.java similarity index 86% rename from backend/src/main/java/com/petshop/backend/entity/ProductSupplier.java rename to src/main/java/com/petshop/backend/entity/ProductSupplier.java index 9a1f56c8..bb157386 100644 --- a/backend/src/main/java/com/petshop/backend/entity/ProductSupplier.java +++ b/src/main/java/com/petshop/backend/entity/ProductSupplier.java @@ -1,9 +1,6 @@ package com.petshop.backend.entity; import jakarta.persistence.*; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.annotations.UpdateTimestamp; @@ -13,9 +10,9 @@ import java.time.LocalDateTime; @Entity @Table(name = "product_suppliers") -@Data -@NoArgsConstructor -@AllArgsConstructor + + + @IdClass(ProductSupplier.ProductSupplierId.class) public class ProductSupplier { @@ -46,9 +43,9 @@ public class ProductSupplier { @Column(name = "updated_at") private LocalDateTime updatedAt; - @Data - @NoArgsConstructor - @AllArgsConstructor + + + public static class ProductSupplierId implements Serializable { private Long product; private Long supplier; diff --git a/backend/src/main/java/com/petshop/backend/entity/PurchaseOrder.java b/src/main/java/com/petshop/backend/entity/PurchaseOrder.java similarity index 91% rename from backend/src/main/java/com/petshop/backend/entity/PurchaseOrder.java rename to src/main/java/com/petshop/backend/entity/PurchaseOrder.java index cbeede55..3112a1aa 100644 --- a/backend/src/main/java/com/petshop/backend/entity/PurchaseOrder.java +++ b/src/main/java/com/petshop/backend/entity/PurchaseOrder.java @@ -1,9 +1,6 @@ package com.petshop.backend.entity; import jakarta.persistence.*; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.annotations.UpdateTimestamp; @@ -15,9 +12,9 @@ import java.util.List; @Entity @Table(name = "purchase_orders") -@Data -@NoArgsConstructor -@AllArgsConstructor + + + public class PurchaseOrder { @Id diff --git a/backend/src/main/java/com/petshop/backend/entity/PurchaseOrderItem.java b/src/main/java/com/petshop/backend/entity/PurchaseOrderItem.java similarity index 84% rename from backend/src/main/java/com/petshop/backend/entity/PurchaseOrderItem.java rename to src/main/java/com/petshop/backend/entity/PurchaseOrderItem.java index 4aee2b49..f6485616 100644 --- a/backend/src/main/java/com/petshop/backend/entity/PurchaseOrderItem.java +++ b/src/main/java/com/petshop/backend/entity/PurchaseOrderItem.java @@ -1,17 +1,14 @@ package com.petshop.backend.entity; import jakarta.persistence.*; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; import java.math.BigDecimal; @Entity @Table(name = "purchase_order_items") -@Data -@NoArgsConstructor -@AllArgsConstructor + + + public class PurchaseOrderItem { @Id diff --git a/backend/src/main/java/com/petshop/backend/entity/Refund.java b/src/main/java/com/petshop/backend/entity/Refund.java similarity index 89% rename from backend/src/main/java/com/petshop/backend/entity/Refund.java rename to src/main/java/com/petshop/backend/entity/Refund.java index 70a7b1f2..48297ec1 100644 --- a/backend/src/main/java/com/petshop/backend/entity/Refund.java +++ b/src/main/java/com/petshop/backend/entity/Refund.java @@ -1,9 +1,6 @@ package com.petshop.backend.entity; import jakarta.persistence.*; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; import org.hibernate.annotations.CreationTimestamp; import java.math.BigDecimal; @@ -13,9 +10,9 @@ import java.util.List; @Entity @Table(name = "refunds") -@Data -@NoArgsConstructor -@AllArgsConstructor + + + public class Refund { @Id diff --git a/backend/src/main/java/com/petshop/backend/entity/RefundItem.java b/src/main/java/com/petshop/backend/entity/RefundItem.java similarity index 82% rename from backend/src/main/java/com/petshop/backend/entity/RefundItem.java rename to src/main/java/com/petshop/backend/entity/RefundItem.java index 2f34b537..59826733 100644 --- a/backend/src/main/java/com/petshop/backend/entity/RefundItem.java +++ b/src/main/java/com/petshop/backend/entity/RefundItem.java @@ -1,17 +1,14 @@ package com.petshop.backend.entity; import jakarta.persistence.*; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; import java.math.BigDecimal; @Entity @Table(name = "refund_items") -@Data -@NoArgsConstructor -@AllArgsConstructor + + + public class RefundItem { @Id diff --git a/backend/src/main/java/com/petshop/backend/entity/Sale.java b/src/main/java/com/petshop/backend/entity/Sale.java similarity index 91% rename from backend/src/main/java/com/petshop/backend/entity/Sale.java rename to src/main/java/com/petshop/backend/entity/Sale.java index 3f46562c..29ccff01 100644 --- a/backend/src/main/java/com/petshop/backend/entity/Sale.java +++ b/src/main/java/com/petshop/backend/entity/Sale.java @@ -1,9 +1,6 @@ package com.petshop.backend.entity; import jakarta.persistence.*; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; import org.hibernate.annotations.CreationTimestamp; import java.math.BigDecimal; @@ -13,9 +10,9 @@ import java.util.List; @Entity @Table(name = "sales") -@Data -@NoArgsConstructor -@AllArgsConstructor + + + public class Sale { @Id diff --git a/backend/src/main/java/com/petshop/backend/entity/SaleItem.java b/src/main/java/com/petshop/backend/entity/SaleItem.java similarity index 84% rename from backend/src/main/java/com/petshop/backend/entity/SaleItem.java rename to src/main/java/com/petshop/backend/entity/SaleItem.java index 012f706b..c5f183d9 100644 --- a/backend/src/main/java/com/petshop/backend/entity/SaleItem.java +++ b/src/main/java/com/petshop/backend/entity/SaleItem.java @@ -1,17 +1,14 @@ package com.petshop.backend.entity; import jakarta.persistence.*; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; import java.math.BigDecimal; @Entity @Table(name = "sale_items") -@Data -@NoArgsConstructor -@AllArgsConstructor + + + public class SaleItem { @Id diff --git a/backend/src/main/java/com/petshop/backend/entity/Service.java b/src/main/java/com/petshop/backend/entity/Service.java similarity index 89% rename from backend/src/main/java/com/petshop/backend/entity/Service.java rename to src/main/java/com/petshop/backend/entity/Service.java index 2373239b..7c293e78 100644 --- a/backend/src/main/java/com/petshop/backend/entity/Service.java +++ b/src/main/java/com/petshop/backend/entity/Service.java @@ -1,9 +1,6 @@ package com.petshop.backend.entity; import jakarta.persistence.*; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.annotations.UpdateTimestamp; @@ -12,9 +9,9 @@ import java.time.LocalDateTime; @Entity @Table(name = "services") -@Data -@NoArgsConstructor -@AllArgsConstructor + + + public class Service { @Id diff --git a/backend/src/main/java/com/petshop/backend/entity/Store.java b/src/main/java/com/petshop/backend/entity/Store.java similarity index 81% rename from backend/src/main/java/com/petshop/backend/entity/Store.java rename to src/main/java/com/petshop/backend/entity/Store.java index fbbd0f21..8f9befe2 100644 --- a/backend/src/main/java/com/petshop/backend/entity/Store.java +++ b/src/main/java/com/petshop/backend/entity/Store.java @@ -1,18 +1,15 @@ package com.petshop.backend.entity; import jakarta.persistence.*; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; import org.hibernate.annotations.CreationTimestamp; import java.time.LocalDateTime; @Entity @Table(name = "stores") -@Data -@NoArgsConstructor -@AllArgsConstructor + + + public class Store { @Id diff --git a/backend/src/main/java/com/petshop/backend/entity/Supplier.java b/src/main/java/com/petshop/backend/entity/Supplier.java similarity index 89% rename from backend/src/main/java/com/petshop/backend/entity/Supplier.java rename to src/main/java/com/petshop/backend/entity/Supplier.java index 57f66bcf..3aa5f66d 100644 --- a/backend/src/main/java/com/petshop/backend/entity/Supplier.java +++ b/src/main/java/com/petshop/backend/entity/Supplier.java @@ -1,9 +1,6 @@ package com.petshop.backend.entity; import jakarta.persistence.*; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.annotations.UpdateTimestamp; @@ -11,9 +8,9 @@ import java.time.LocalDateTime; @Entity @Table(name = "suppliers") -@Data -@NoArgsConstructor -@AllArgsConstructor + + + public class Supplier { @Id diff --git a/backend/src/main/java/com/petshop/backend/entity/User.java b/src/main/java/com/petshop/backend/entity/User.java similarity index 88% rename from backend/src/main/java/com/petshop/backend/entity/User.java rename to src/main/java/com/petshop/backend/entity/User.java index 5ac817f6..22674b64 100644 --- a/backend/src/main/java/com/petshop/backend/entity/User.java +++ b/src/main/java/com/petshop/backend/entity/User.java @@ -1,9 +1,6 @@ package com.petshop.backend.entity; import jakarta.persistence.*; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.annotations.UpdateTimestamp; @@ -11,9 +8,9 @@ import java.time.LocalDateTime; @Entity @Table(name = "users") -@Data -@NoArgsConstructor -@AllArgsConstructor + + + public class User { @Id diff --git a/backend/src/main/java/com/petshop/backend/exception/BusinessException.java b/src/main/java/com/petshop/backend/exception/BusinessException.java similarity index 100% rename from backend/src/main/java/com/petshop/backend/exception/BusinessException.java rename to src/main/java/com/petshop/backend/exception/BusinessException.java diff --git a/backend/src/main/java/com/petshop/backend/exception/GlobalExceptionHandler.java b/src/main/java/com/petshop/backend/exception/GlobalExceptionHandler.java similarity index 100% rename from backend/src/main/java/com/petshop/backend/exception/GlobalExceptionHandler.java rename to src/main/java/com/petshop/backend/exception/GlobalExceptionHandler.java diff --git a/backend/src/main/java/com/petshop/backend/exception/ResourceNotFoundException.java b/src/main/java/com/petshop/backend/exception/ResourceNotFoundException.java similarity index 100% rename from backend/src/main/java/com/petshop/backend/exception/ResourceNotFoundException.java rename to src/main/java/com/petshop/backend/exception/ResourceNotFoundException.java diff --git a/backend/src/main/java/com/petshop/backend/repository/AdoptionRepository.java b/src/main/java/com/petshop/backend/repository/AdoptionRepository.java similarity index 100% rename from backend/src/main/java/com/petshop/backend/repository/AdoptionRepository.java rename to src/main/java/com/petshop/backend/repository/AdoptionRepository.java diff --git a/backend/src/main/java/com/petshop/backend/repository/AppointmentRepository.java b/src/main/java/com/petshop/backend/repository/AppointmentRepository.java similarity index 100% rename from backend/src/main/java/com/petshop/backend/repository/AppointmentRepository.java rename to src/main/java/com/petshop/backend/repository/AppointmentRepository.java diff --git a/backend/src/main/java/com/petshop/backend/repository/CategoryRepository.java b/src/main/java/com/petshop/backend/repository/CategoryRepository.java similarity index 100% rename from backend/src/main/java/com/petshop/backend/repository/CategoryRepository.java rename to src/main/java/com/petshop/backend/repository/CategoryRepository.java diff --git a/backend/src/main/java/com/petshop/backend/repository/CustomerRepository.java b/src/main/java/com/petshop/backend/repository/CustomerRepository.java similarity index 100% rename from backend/src/main/java/com/petshop/backend/repository/CustomerRepository.java rename to src/main/java/com/petshop/backend/repository/CustomerRepository.java diff --git a/backend/src/main/java/com/petshop/backend/repository/InventoryRepository.java b/src/main/java/com/petshop/backend/repository/InventoryRepository.java similarity index 100% rename from backend/src/main/java/com/petshop/backend/repository/InventoryRepository.java rename to src/main/java/com/petshop/backend/repository/InventoryRepository.java diff --git a/backend/src/main/java/com/petshop/backend/repository/PetRepository.java b/src/main/java/com/petshop/backend/repository/PetRepository.java similarity index 100% rename from backend/src/main/java/com/petshop/backend/repository/PetRepository.java rename to src/main/java/com/petshop/backend/repository/PetRepository.java diff --git a/backend/src/main/java/com/petshop/backend/repository/ProductRepository.java b/src/main/java/com/petshop/backend/repository/ProductRepository.java similarity index 100% rename from backend/src/main/java/com/petshop/backend/repository/ProductRepository.java rename to src/main/java/com/petshop/backend/repository/ProductRepository.java diff --git a/backend/src/main/java/com/petshop/backend/repository/ProductSupplierRepository.java b/src/main/java/com/petshop/backend/repository/ProductSupplierRepository.java similarity index 100% rename from backend/src/main/java/com/petshop/backend/repository/ProductSupplierRepository.java rename to src/main/java/com/petshop/backend/repository/ProductSupplierRepository.java diff --git a/backend/src/main/java/com/petshop/backend/repository/PurchaseOrderRepository.java b/src/main/java/com/petshop/backend/repository/PurchaseOrderRepository.java similarity index 100% rename from backend/src/main/java/com/petshop/backend/repository/PurchaseOrderRepository.java rename to src/main/java/com/petshop/backend/repository/PurchaseOrderRepository.java diff --git a/backend/src/main/java/com/petshop/backend/repository/RefundRepository.java b/src/main/java/com/petshop/backend/repository/RefundRepository.java similarity index 100% rename from backend/src/main/java/com/petshop/backend/repository/RefundRepository.java rename to src/main/java/com/petshop/backend/repository/RefundRepository.java diff --git a/backend/src/main/java/com/petshop/backend/repository/SaleItemRepository.java b/src/main/java/com/petshop/backend/repository/SaleItemRepository.java similarity index 100% rename from backend/src/main/java/com/petshop/backend/repository/SaleItemRepository.java rename to src/main/java/com/petshop/backend/repository/SaleItemRepository.java diff --git a/backend/src/main/java/com/petshop/backend/repository/SaleRepository.java b/src/main/java/com/petshop/backend/repository/SaleRepository.java similarity index 100% rename from backend/src/main/java/com/petshop/backend/repository/SaleRepository.java rename to src/main/java/com/petshop/backend/repository/SaleRepository.java diff --git a/backend/src/main/java/com/petshop/backend/repository/ServiceRepository.java b/src/main/java/com/petshop/backend/repository/ServiceRepository.java similarity index 100% rename from backend/src/main/java/com/petshop/backend/repository/ServiceRepository.java rename to src/main/java/com/petshop/backend/repository/ServiceRepository.java diff --git a/backend/src/main/java/com/petshop/backend/repository/StoreRepository.java b/src/main/java/com/petshop/backend/repository/StoreRepository.java similarity index 100% rename from backend/src/main/java/com/petshop/backend/repository/StoreRepository.java rename to src/main/java/com/petshop/backend/repository/StoreRepository.java diff --git a/backend/src/main/java/com/petshop/backend/repository/SupplierRepository.java b/src/main/java/com/petshop/backend/repository/SupplierRepository.java similarity index 100% rename from backend/src/main/java/com/petshop/backend/repository/SupplierRepository.java rename to src/main/java/com/petshop/backend/repository/SupplierRepository.java diff --git a/backend/src/main/java/com/petshop/backend/repository/UserRepository.java b/src/main/java/com/petshop/backend/repository/UserRepository.java similarity index 100% rename from backend/src/main/java/com/petshop/backend/repository/UserRepository.java rename to src/main/java/com/petshop/backend/repository/UserRepository.java diff --git a/backend/src/main/java/com/petshop/backend/security/JwtAuthenticationFilter.java b/src/main/java/com/petshop/backend/security/JwtAuthenticationFilter.java similarity index 97% rename from backend/src/main/java/com/petshop/backend/security/JwtAuthenticationFilter.java rename to src/main/java/com/petshop/backend/security/JwtAuthenticationFilter.java index f08d4b5b..9ef6610b 100644 --- a/backend/src/main/java/com/petshop/backend/security/JwtAuthenticationFilter.java +++ b/src/main/java/com/petshop/backend/security/JwtAuthenticationFilter.java @@ -4,7 +4,6 @@ import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import lombok.RequiredArgsConstructor; import org.springframework.lang.NonNull; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.context.SecurityContextHolder; @@ -17,7 +16,7 @@ import org.springframework.web.filter.OncePerRequestFilter; import java.io.IOException; @Component -@RequiredArgsConstructor + public class JwtAuthenticationFilter extends OncePerRequestFilter { private final JwtUtil jwtUtil; diff --git a/backend/src/main/java/com/petshop/backend/security/JwtUtil.java b/src/main/java/com/petshop/backend/security/JwtUtil.java similarity index 100% rename from backend/src/main/java/com/petshop/backend/security/JwtUtil.java rename to src/main/java/com/petshop/backend/security/JwtUtil.java diff --git a/backend/src/main/java/com/petshop/backend/security/SecurityConfig.java b/src/main/java/com/petshop/backend/security/SecurityConfig.java similarity index 98% rename from backend/src/main/java/com/petshop/backend/security/SecurityConfig.java rename to src/main/java/com/petshop/backend/security/SecurityConfig.java index a846a8ef..573281ec 100644 --- a/backend/src/main/java/com/petshop/backend/security/SecurityConfig.java +++ b/src/main/java/com/petshop/backend/security/SecurityConfig.java @@ -1,6 +1,5 @@ package com.petshop.backend.security; -import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.HttpMethod; @@ -22,7 +21,7 @@ import org.springframework.security.web.authentication.UsernamePasswordAuthentic @Configuration @EnableWebSecurity @EnableMethodSecurity -@RequiredArgsConstructor + public class SecurityConfig { private final JwtAuthenticationFilter jwtAuthFilter; diff --git a/backend/src/main/java/com/petshop/backend/security/UserDetailsServiceImpl.java b/src/main/java/com/petshop/backend/security/UserDetailsServiceImpl.java similarity index 95% rename from backend/src/main/java/com/petshop/backend/security/UserDetailsServiceImpl.java rename to src/main/java/com/petshop/backend/security/UserDetailsServiceImpl.java index ec040275..09dd2d5b 100644 --- a/backend/src/main/java/com/petshop/backend/security/UserDetailsServiceImpl.java +++ b/src/main/java/com/petshop/backend/security/UserDetailsServiceImpl.java @@ -2,7 +2,6 @@ package com.petshop.backend.security; import com.petshop.backend.entity.User; import com.petshop.backend.repository.UserRepository; -import lombok.RequiredArgsConstructor; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; @@ -12,7 +11,7 @@ import org.springframework.stereotype.Service; import java.util.Collections; @Service -@RequiredArgsConstructor + public class UserDetailsServiceImpl implements UserDetailsService { private final UserRepository userRepository; diff --git a/backend/src/main/java/com/petshop/backend/service/AdoptionService.java b/src/main/java/com/petshop/backend/service/AdoptionService.java similarity index 98% rename from backend/src/main/java/com/petshop/backend/service/AdoptionService.java rename to src/main/java/com/petshop/backend/service/AdoptionService.java index f55cf358..089bc164 100644 --- a/backend/src/main/java/com/petshop/backend/service/AdoptionService.java +++ b/src/main/java/com/petshop/backend/service/AdoptionService.java @@ -10,14 +10,13 @@ import com.petshop.backend.exception.ResourceNotFoundException; import com.petshop.backend.repository.AdoptionRepository; import com.petshop.backend.repository.CustomerRepository; import com.petshop.backend.repository.PetRepository; -import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service -@RequiredArgsConstructor + public class AdoptionService { private final AdoptionRepository adoptionRepository; diff --git a/backend/src/main/java/com/petshop/backend/service/AppointmentService.java b/src/main/java/com/petshop/backend/service/AppointmentService.java similarity index 98% rename from backend/src/main/java/com/petshop/backend/service/AppointmentService.java rename to src/main/java/com/petshop/backend/service/AppointmentService.java index 3c941b68..fcd7eaed 100644 --- a/backend/src/main/java/com/petshop/backend/service/AppointmentService.java +++ b/src/main/java/com/petshop/backend/service/AppointmentService.java @@ -11,7 +11,6 @@ import com.petshop.backend.repository.AppointmentRepository; import com.petshop.backend.repository.CustomerRepository; import com.petshop.backend.repository.PetRepository; import com.petshop.backend.repository.ServiceRepository; -import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -23,7 +22,7 @@ import java.util.Set; import java.util.stream.Collectors; @Service -@RequiredArgsConstructor + public class AppointmentService { private final AppointmentRepository appointmentRepository; diff --git a/backend/src/main/java/com/petshop/backend/service/CategoryService.java b/src/main/java/com/petshop/backend/service/CategoryService.java similarity index 97% rename from backend/src/main/java/com/petshop/backend/service/CategoryService.java rename to src/main/java/com/petshop/backend/service/CategoryService.java index 7d596ce7..f8fdf7e8 100644 --- a/backend/src/main/java/com/petshop/backend/service/CategoryService.java +++ b/src/main/java/com/petshop/backend/service/CategoryService.java @@ -6,14 +6,13 @@ import com.petshop.backend.dto.common.BulkDeleteRequest; import com.petshop.backend.entity.Category; import com.petshop.backend.exception.ResourceNotFoundException; import com.petshop.backend.repository.CategoryRepository; -import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service -@RequiredArgsConstructor + public class CategoryService { private final CategoryRepository categoryRepository; diff --git a/backend/src/main/java/com/petshop/backend/service/CustomerService.java b/src/main/java/com/petshop/backend/service/CustomerService.java similarity index 98% rename from backend/src/main/java/com/petshop/backend/service/CustomerService.java rename to src/main/java/com/petshop/backend/service/CustomerService.java index fca95ad8..608aa535 100644 --- a/backend/src/main/java/com/petshop/backend/service/CustomerService.java +++ b/src/main/java/com/petshop/backend/service/CustomerService.java @@ -6,14 +6,13 @@ import com.petshop.backend.dto.customer.CustomerResponse; import com.petshop.backend.entity.Customer; import com.petshop.backend.exception.ResourceNotFoundException; import com.petshop.backend.repository.CustomerRepository; -import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service -@RequiredArgsConstructor + public class CustomerService { private final CustomerRepository customerRepository; diff --git a/backend/src/main/java/com/petshop/backend/service/InventoryService.java b/src/main/java/com/petshop/backend/service/InventoryService.java similarity index 98% rename from backend/src/main/java/com/petshop/backend/service/InventoryService.java rename to src/main/java/com/petshop/backend/service/InventoryService.java index 0599e255..d2a4395d 100644 --- a/backend/src/main/java/com/petshop/backend/service/InventoryService.java +++ b/src/main/java/com/petshop/backend/service/InventoryService.java @@ -10,7 +10,6 @@ import com.petshop.backend.exception.ResourceNotFoundException; import com.petshop.backend.repository.InventoryRepository; import com.petshop.backend.repository.ProductRepository; import com.petshop.backend.repository.StoreRepository; -import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -19,7 +18,7 @@ import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; @Service -@RequiredArgsConstructor + public class InventoryService { private final InventoryRepository inventoryRepository; diff --git a/backend/src/main/java/com/petshop/backend/service/PetService.java b/src/main/java/com/petshop/backend/service/PetService.java similarity index 97% rename from backend/src/main/java/com/petshop/backend/service/PetService.java rename to src/main/java/com/petshop/backend/service/PetService.java index 9d87cde2..0509f346 100644 --- a/backend/src/main/java/com/petshop/backend/service/PetService.java +++ b/src/main/java/com/petshop/backend/service/PetService.java @@ -6,14 +6,13 @@ import com.petshop.backend.dto.pet.PetResponse; import com.petshop.backend.entity.Pet; import com.petshop.backend.exception.ResourceNotFoundException; import com.petshop.backend.repository.PetRepository; -import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service -@RequiredArgsConstructor + public class PetService { private final PetRepository petRepository; diff --git a/backend/src/main/java/com/petshop/backend/service/ProductService.java b/src/main/java/com/petshop/backend/service/ProductService.java similarity index 98% rename from backend/src/main/java/com/petshop/backend/service/ProductService.java rename to src/main/java/com/petshop/backend/service/ProductService.java index 150d676d..2b7646de 100644 --- a/backend/src/main/java/com/petshop/backend/service/ProductService.java +++ b/src/main/java/com/petshop/backend/service/ProductService.java @@ -8,14 +8,13 @@ import com.petshop.backend.entity.Product; import com.petshop.backend.exception.ResourceNotFoundException; import com.petshop.backend.repository.CategoryRepository; import com.petshop.backend.repository.ProductRepository; -import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service -@RequiredArgsConstructor + public class ProductService { private final ProductRepository productRepository; diff --git a/backend/src/main/java/com/petshop/backend/service/ProductSupplierService.java b/src/main/java/com/petshop/backend/service/ProductSupplierService.java similarity index 98% rename from backend/src/main/java/com/petshop/backend/service/ProductSupplierService.java rename to src/main/java/com/petshop/backend/service/ProductSupplierService.java index 20c0bb66..c93c5899 100644 --- a/backend/src/main/java/com/petshop/backend/service/ProductSupplierService.java +++ b/src/main/java/com/petshop/backend/service/ProductSupplierService.java @@ -10,14 +10,13 @@ import com.petshop.backend.exception.ResourceNotFoundException; import com.petshop.backend.repository.ProductRepository; import com.petshop.backend.repository.ProductSupplierRepository; import com.petshop.backend.repository.SupplierRepository; -import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service -@RequiredArgsConstructor + public class ProductSupplierService { private final ProductSupplierRepository productSupplierRepository; diff --git a/backend/src/main/java/com/petshop/backend/service/PurchaseOrderService.java b/src/main/java/com/petshop/backend/service/PurchaseOrderService.java similarity index 97% rename from backend/src/main/java/com/petshop/backend/service/PurchaseOrderService.java rename to src/main/java/com/petshop/backend/service/PurchaseOrderService.java index fa5d9859..d3ecd74a 100644 --- a/backend/src/main/java/com/petshop/backend/service/PurchaseOrderService.java +++ b/src/main/java/com/petshop/backend/service/PurchaseOrderService.java @@ -6,7 +6,6 @@ import com.petshop.backend.entity.PurchaseOrder; import com.petshop.backend.entity.PurchaseOrderItem; import com.petshop.backend.exception.ResourceNotFoundException; import com.petshop.backend.repository.PurchaseOrderRepository; -import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -15,7 +14,7 @@ import java.util.List; import java.util.stream.Collectors; @Service -@RequiredArgsConstructor + public class PurchaseOrderService { private final PurchaseOrderRepository purchaseOrderRepository; diff --git a/backend/src/main/java/com/petshop/backend/service/RefundService.java b/src/main/java/com/petshop/backend/service/RefundService.java similarity index 98% rename from backend/src/main/java/com/petshop/backend/service/RefundService.java rename to src/main/java/com/petshop/backend/service/RefundService.java index 8f2a4e6a..1758d732 100644 --- a/backend/src/main/java/com/petshop/backend/service/RefundService.java +++ b/src/main/java/com/petshop/backend/service/RefundService.java @@ -6,7 +6,6 @@ import com.petshop.backend.entity.*; import com.petshop.backend.exception.BusinessException; import com.petshop.backend.exception.ResourceNotFoundException; import com.petshop.backend.repository.*; -import lombok.RequiredArgsConstructor; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -17,7 +16,7 @@ import java.util.ArrayList; import java.util.List; @Service -@RequiredArgsConstructor + public class RefundService { private final RefundRepository refundRepository; diff --git a/backend/src/main/java/com/petshop/backend/service/SaleService.java b/src/main/java/com/petshop/backend/service/SaleService.java similarity index 98% rename from backend/src/main/java/com/petshop/backend/service/SaleService.java rename to src/main/java/com/petshop/backend/service/SaleService.java index e3769adc..d74b6fa8 100644 --- a/backend/src/main/java/com/petshop/backend/service/SaleService.java +++ b/src/main/java/com/petshop/backend/service/SaleService.java @@ -6,7 +6,6 @@ import com.petshop.backend.entity.*; import com.petshop.backend.exception.BusinessException; import com.petshop.backend.exception.ResourceNotFoundException; import com.petshop.backend.repository.*; -import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.security.core.context.SecurityContextHolder; @@ -19,7 +18,7 @@ import java.util.ArrayList; import java.util.List; @Service -@RequiredArgsConstructor + public class SaleService { private final SaleRepository saleRepository; diff --git a/backend/src/main/java/com/petshop/backend/service/ServiceService.java b/src/main/java/com/petshop/backend/service/ServiceService.java similarity index 98% rename from backend/src/main/java/com/petshop/backend/service/ServiceService.java rename to src/main/java/com/petshop/backend/service/ServiceService.java index 15faea62..e01b2092 100644 --- a/backend/src/main/java/com/petshop/backend/service/ServiceService.java +++ b/src/main/java/com/petshop/backend/service/ServiceService.java @@ -5,14 +5,13 @@ import com.petshop.backend.dto.service.ServiceRequest; import com.petshop.backend.dto.service.ServiceResponse; import com.petshop.backend.exception.ResourceNotFoundException; import com.petshop.backend.repository.ServiceRepository; -import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service -@RequiredArgsConstructor + public class ServiceService { private final ServiceRepository serviceRepository; diff --git a/backend/src/main/java/com/petshop/backend/service/SupplierService.java b/src/main/java/com/petshop/backend/service/SupplierService.java similarity index 98% rename from backend/src/main/java/com/petshop/backend/service/SupplierService.java rename to src/main/java/com/petshop/backend/service/SupplierService.java index d86a8c13..91daaa35 100644 --- a/backend/src/main/java/com/petshop/backend/service/SupplierService.java +++ b/src/main/java/com/petshop/backend/service/SupplierService.java @@ -6,14 +6,13 @@ import com.petshop.backend.dto.supplier.SupplierResponse; import com.petshop.backend.entity.Supplier; import com.petshop.backend.exception.ResourceNotFoundException; import com.petshop.backend.repository.SupplierRepository; -import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service -@RequiredArgsConstructor + public class SupplierService { private final SupplierRepository supplierRepository; diff --git a/backend/src/main/java/com/petshop/backend/service/UserService.java b/src/main/java/com/petshop/backend/service/UserService.java similarity index 97% rename from backend/src/main/java/com/petshop/backend/service/UserService.java rename to src/main/java/com/petshop/backend/service/UserService.java index da028f9a..e9e7c3e9 100644 --- a/backend/src/main/java/com/petshop/backend/service/UserService.java +++ b/src/main/java/com/petshop/backend/service/UserService.java @@ -6,7 +6,6 @@ import com.petshop.backend.dto.user.UserResponse; import com.petshop.backend.entity.User; import com.petshop.backend.exception.ResourceNotFoundException; import com.petshop.backend.repository.UserRepository; -import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.security.crypto.password.PasswordEncoder; @@ -14,7 +13,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service -@RequiredArgsConstructor + public class UserService { private final UserRepository userRepository; diff --git a/backend/src/main/resources/application.yml b/src/main/resources/application.yml similarity index 100% rename from backend/src/main/resources/application.yml rename to src/main/resources/application.yml