From fd9b52de8a269f0f8ac600fe5299e452bdaba446 Mon Sep 17 00:00:00 2001 From: ksenianeva <95441235+ksenianeva@users.noreply.github.com> Date: Mon, 15 May 2023 22:15:56 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B0=D0=BF?= =?UTF-8?q?=D0=BA=D0=B8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/lab/data.mv.db | Bin 73728 -> 77824 bytes .../Models/Cart.java | 2 +- .../Models/CountProduct.java | 2 +- .../Models/Customer.java | 2 +- .../Models/Product.java | 2 +- .../Models/ProductCategory.java | 2 +- .../Services/CartService.java | 9 ++++----- .../Services/CountProductService.java | 6 +++--- .../Services/CustomerService.java | 4 ++-- .../Services/ProductCategoryService.java | 4 ++-- .../Services/ProductService.java | 6 +++--- .../test/java/com/example/lab/DBTests.java | 12 ++++++------ 12 files changed, 25 insertions(+), 26 deletions(-) rename backend/lab/src/main/java/com/example/lab/{DataBaseLab3 => DataBase}/Models/Cart.java (97%) rename backend/lab/src/main/java/com/example/lab/{DataBaseLab3 => DataBase}/Models/CountProduct.java (97%) rename backend/lab/src/main/java/com/example/lab/{DataBaseLab3 => DataBase}/Models/Customer.java (97%) rename backend/lab/src/main/java/com/example/lab/{DataBaseLab3 => DataBase}/Models/Product.java (98%) rename backend/lab/src/main/java/com/example/lab/{DataBaseLab3 => DataBase}/Models/ProductCategory.java (97%) rename backend/lab/src/main/java/com/example/lab/{DataBaseLab3 => DataBase}/Services/CartService.java (91%) rename backend/lab/src/main/java/com/example/lab/{DataBaseLab3 => DataBase}/Services/CountProductService.java (93%) rename backend/lab/src/main/java/com/example/lab/{DataBaseLab3 => DataBase}/Services/CustomerService.java (95%) rename backend/lab/src/main/java/com/example/lab/{DataBaseLab3 => DataBase}/Services/ProductCategoryService.java (94%) rename backend/lab/src/main/java/com/example/lab/{DataBaseLab3 => DataBase}/Services/ProductService.java (93%) diff --git a/backend/lab/data.mv.db b/backend/lab/data.mv.db index 8767b180d8e1e3b430a6919339bc17851e82b0c2..cdafddd985c8297c5793b283da4b663e6008d923 100644 GIT binary patch delta 5754 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 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;