diff --git a/backend/lab/data.mv.db b/backend/lab/data.mv.db index 8767b18..cdafddd 100644 Binary files a/backend/lab/data.mv.db and b/backend/lab/data.mv.db differ diff --git a/backend/lab/src/main/java/com/example/lab/DataBaseLab3/Models/Cart.java b/backend/lab/src/main/java/com/example/lab/DataBase/Models/Cart.java similarity index 97% rename from backend/lab/src/main/java/com/example/lab/DataBaseLab3/Models/Cart.java rename to backend/lab/src/main/java/com/example/lab/DataBase/Models/Cart.java index c850381..8781342 100644 --- a/backend/lab/src/main/java/com/example/lab/DataBaseLab3/Models/Cart.java +++ b/backend/lab/src/main/java/com/example/lab/DataBase/Models/Cart.java @@ -1,4 +1,4 @@ -package com.example.lab.DataBaseLab3.Models; +package com.example.lab.DataBase.Models; import jakarta.persistence.*; diff --git a/backend/lab/src/main/java/com/example/lab/DataBaseLab3/Models/CountProduct.java b/backend/lab/src/main/java/com/example/lab/DataBase/Models/CountProduct.java similarity index 97% rename from backend/lab/src/main/java/com/example/lab/DataBaseLab3/Models/CountProduct.java rename to backend/lab/src/main/java/com/example/lab/DataBase/Models/CountProduct.java index dce0c20..370673c 100644 --- a/backend/lab/src/main/java/com/example/lab/DataBaseLab3/Models/CountProduct.java +++ b/backend/lab/src/main/java/com/example/lab/DataBase/Models/CountProduct.java @@ -1,4 +1,4 @@ -package com.example.lab.DataBaseLab3.Models; +package com.example.lab.DataBase.Models; import jakarta.persistence.*; import java.util.*; diff --git a/backend/lab/src/main/java/com/example/lab/DataBaseLab3/Models/Customer.java b/backend/lab/src/main/java/com/example/lab/DataBase/Models/Customer.java similarity index 97% rename from backend/lab/src/main/java/com/example/lab/DataBaseLab3/Models/Customer.java rename to backend/lab/src/main/java/com/example/lab/DataBase/Models/Customer.java index 533ba72..d9b7f48 100644 --- a/backend/lab/src/main/java/com/example/lab/DataBaseLab3/Models/Customer.java +++ b/backend/lab/src/main/java/com/example/lab/DataBase/Models/Customer.java @@ -1,4 +1,4 @@ -package com.example.lab.DataBaseLab3.Models; +package com.example.lab.DataBase.Models; import jakarta.persistence.*; import java.util.Objects; diff --git a/backend/lab/src/main/java/com/example/lab/DataBaseLab3/Models/Product.java b/backend/lab/src/main/java/com/example/lab/DataBase/Models/Product.java similarity index 98% rename from backend/lab/src/main/java/com/example/lab/DataBaseLab3/Models/Product.java rename to backend/lab/src/main/java/com/example/lab/DataBase/Models/Product.java index b73ddcf..0f18cc5 100644 --- a/backend/lab/src/main/java/com/example/lab/DataBaseLab3/Models/Product.java +++ b/backend/lab/src/main/java/com/example/lab/DataBase/Models/Product.java @@ -1,4 +1,4 @@ -package com.example.lab.DataBaseLab3.Models; +package com.example.lab.DataBase.Models; import jakarta.persistence.*; diff --git a/backend/lab/src/main/java/com/example/lab/DataBaseLab3/Models/ProductCategory.java b/backend/lab/src/main/java/com/example/lab/DataBase/Models/ProductCategory.java similarity index 97% rename from backend/lab/src/main/java/com/example/lab/DataBaseLab3/Models/ProductCategory.java rename to backend/lab/src/main/java/com/example/lab/DataBase/Models/ProductCategory.java index 19bca1c..432e249 100644 --- a/backend/lab/src/main/java/com/example/lab/DataBaseLab3/Models/ProductCategory.java +++ b/backend/lab/src/main/java/com/example/lab/DataBase/Models/ProductCategory.java @@ -1,4 +1,4 @@ -package com.example.lab.DataBaseLab3.Models; +package com.example.lab.DataBase.Models; import jakarta.persistence.*; import java.util.*; diff --git a/backend/lab/src/main/java/com/example/lab/DataBaseLab3/Services/CartService.java b/backend/lab/src/main/java/com/example/lab/DataBase/Services/CartService.java similarity index 91% rename from backend/lab/src/main/java/com/example/lab/DataBaseLab3/Services/CartService.java rename to backend/lab/src/main/java/com/example/lab/DataBase/Services/CartService.java index 921f406..1fbd0ac 100644 --- a/backend/lab/src/main/java/com/example/lab/DataBaseLab3/Services/CartService.java +++ b/backend/lab/src/main/java/com/example/lab/DataBase/Services/CartService.java @@ -1,12 +1,11 @@ -package com.example.lab.DataBaseLab3.Services; +package com.example.lab.DataBase.Services; -import com.example.lab.DataBaseLab3.Models.Customer; -import com.example.lab.DataBaseLab3.Models.Product; -import com.example.lab.DataBaseLab3.Models.CountProduct; +import com.example.lab.DataBase.Models.Customer; +import com.example.lab.DataBase.Models.Product; import jakarta.persistence.*; import jakarta.transaction.Transactional; import org.springframework.stereotype.Service; -import com.example.lab.DataBaseLab3.Models.Cart; +import com.example.lab.DataBase.Models.Cart; import java.util.List; @Service diff --git a/backend/lab/src/main/java/com/example/lab/DataBaseLab3/Services/CountProductService.java b/backend/lab/src/main/java/com/example/lab/DataBase/Services/CountProductService.java similarity index 93% rename from backend/lab/src/main/java/com/example/lab/DataBaseLab3/Services/CountProductService.java rename to backend/lab/src/main/java/com/example/lab/DataBase/Services/CountProductService.java index 7fad59e..80ccf8b 100644 --- a/backend/lab/src/main/java/com/example/lab/DataBaseLab3/Services/CountProductService.java +++ b/backend/lab/src/main/java/com/example/lab/DataBase/Services/CountProductService.java @@ -1,10 +1,10 @@ -package com.example.lab.DataBaseLab3.Services; +package com.example.lab.DataBase.Services; -import com.example.lab.DataBaseLab3.Models.*; +import com.example.lab.DataBase.Models.*; import jakarta.persistence.*; import jakarta.transaction.Transactional; import org.springframework.stereotype.Service; -import com.example.lab.DataBaseLab3.Models.Product; +import com.example.lab.DataBase.Models.Product; import java.util.List; diff --git a/backend/lab/src/main/java/com/example/lab/DataBaseLab3/Services/CustomerService.java b/backend/lab/src/main/java/com/example/lab/DataBase/Services/CustomerService.java similarity index 95% rename from backend/lab/src/main/java/com/example/lab/DataBaseLab3/Services/CustomerService.java rename to backend/lab/src/main/java/com/example/lab/DataBase/Services/CustomerService.java index bcf4801..fd4e52c 100644 --- a/backend/lab/src/main/java/com/example/lab/DataBaseLab3/Services/CustomerService.java +++ b/backend/lab/src/main/java/com/example/lab/DataBase/Services/CustomerService.java @@ -1,9 +1,9 @@ -package com.example.lab.DataBaseLab3.Services; +package com.example.lab.DataBase.Services; import jakarta.persistence.*; import jakarta.transaction.Transactional; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; -import com.example.lab.DataBaseLab3.Models.Customer; +import com.example.lab.DataBase.Models.Customer; import java.util.List; @Service diff --git a/backend/lab/src/main/java/com/example/lab/DataBaseLab3/Services/ProductCategoryService.java b/backend/lab/src/main/java/com/example/lab/DataBase/Services/ProductCategoryService.java similarity index 94% rename from backend/lab/src/main/java/com/example/lab/DataBaseLab3/Services/ProductCategoryService.java rename to backend/lab/src/main/java/com/example/lab/DataBase/Services/ProductCategoryService.java index f70e74e..53ec41e 100644 --- a/backend/lab/src/main/java/com/example/lab/DataBaseLab3/Services/ProductCategoryService.java +++ b/backend/lab/src/main/java/com/example/lab/DataBase/Services/ProductCategoryService.java @@ -1,10 +1,10 @@ -package com.example.lab.DataBaseLab3.Services; +package com.example.lab.DataBase.Services; import jakarta.persistence.*; import jakarta.transaction.Transactional; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; -import com.example.lab.DataBaseLab3.Models.ProductCategory; +import com.example.lab.DataBase.Models.ProductCategory; import java.util.List; @Service diff --git a/backend/lab/src/main/java/com/example/lab/DataBaseLab3/Services/ProductService.java b/backend/lab/src/main/java/com/example/lab/DataBase/Services/ProductService.java similarity index 93% rename from backend/lab/src/main/java/com/example/lab/DataBaseLab3/Services/ProductService.java rename to backend/lab/src/main/java/com/example/lab/DataBase/Services/ProductService.java index 6ebeca6..cd45e8b 100644 --- a/backend/lab/src/main/java/com/example/lab/DataBaseLab3/Services/ProductService.java +++ b/backend/lab/src/main/java/com/example/lab/DataBase/Services/ProductService.java @@ -1,11 +1,11 @@ -package com.example.lab.DataBaseLab3.Services; +package com.example.lab.DataBase.Services; -import com.example.lab.DataBaseLab3.Models.ProductCategory; +import com.example.lab.DataBase.Models.ProductCategory; import jakarta.persistence.*; import jakarta.transaction.Transactional; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; -import com.example.lab.DataBaseLab3.Models.Product; +import com.example.lab.DataBase.Models.Product; import java.util.List; @Service diff --git a/backend/lab/src/test/java/com/example/lab/DBTests.java b/backend/lab/src/test/java/com/example/lab/DBTests.java index 9ba4eb1..af2b6e4 100644 --- a/backend/lab/src/test/java/com/example/lab/DBTests.java +++ b/backend/lab/src/test/java/com/example/lab/DBTests.java @@ -1,11 +1,11 @@ package com.example.lab; -import com.example.lab.DataBaseLab3.Models.*; -import com.example.lab.DataBaseLab3.Services.CartService; -import com.example.lab.DataBaseLab3.Services.CustomerService; -import com.example.lab.DataBaseLab3.Services.ProductCategoryService; -import com.example.lab.DataBaseLab3.Services.ProductService; -import com.example.lab.DataBaseLab3.Services.CountProductService; +import com.example.lab.DataBase.Models.*; +import com.example.lab.DataBase.Services.CartService; +import com.example.lab.DataBase.Services.CustomerService; +import com.example.lab.DataBase.Services.ProductCategoryService; +import com.example.lab.DataBase.Services.ProductService; +import com.example.lab.DataBase.Services.CountProductService; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired;