aleyckin/IP_Aleikin_PIbd-22
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/LabWork03' into LabWork03

Browse Source 
# Conflicts:
#	src/main/java/ru/ulstu/is/sbapp/HardwareShop/models/Product.java
#	src/main/java/ru/ulstu/is/sbapp/HardwareShop/services/ProductService.java
#	src/test/java/ru/ulstu/is/sbapp/JpaProductTests.java
This commit is contained in:
Артём Алейкин 2023-05-01 21:50:27 +04:00
commit 56bc353670
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -13,6 +13,8 @@ repositories {
} }
dependencies { dependencies {
// https://mvnrepository.com/artifact/commons-io/commons-io
implementation group: 'commons-io', name: 'commons-io', version: '2.6'
implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
implementation 'com.h2database:h2:2.1.210' implementation 'com.h2database:h2:2.1.210'

3
src/main/java/ru/ulstu/is/sbapp/HardwareShop/models/Category.java
View File

@ -10,9 +10,6 @@ public class Category {
@GeneratedValue(strategy = GenerationType.AUTO) @GeneratedValue(strategy = GenerationType.AUTO)
private Long id; private Long id;
@OneToMany(mappedBy = "category")
private List<Product> productList;
@Column @Column
private String name; private String name;

3
src/main/java/ru/ulstu/is/sbapp/HardwareShop/models/Manufacturer.java
View File

@ -10,7 +10,8 @@ public class Manufacturer {
@GeneratedValue(strategy = GenerationType.AUTO) @GeneratedValue(strategy = GenerationType.AUTO)
private Long id; private Long id;
@ManyToMany(mappedBy = "manufacturerList") @ManyToMany(fetch = FetchType.EAGER,
mappedBy = "manufacturerList")
private List<Product> productList; private List<Product> productList;
@Column @Column