File tree

11 files changed

+105
-96
lines changed

11 files changed

+105
-96
lines changed
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,11 @@
112112
<artifactId>spring-boot-starter-cache</artifactId>
113113
</dependency>
114114
<!-- &lt;!&ndash; https://mvnrepository.com/artifact/org.springframework/spring-jdbc &ndash;&gt;-->
115-
<!-- <dependency>-->
116-
<!-- <groupId>org.springframework</groupId>-->
117-
<!-- <artifactId>spring-jdbc</artifactId>-->
118-
<!-- <version>5.2.12.RELEASE</version>-->
119-
<!-- </dependency>-->
115+
<dependency>
116+
<groupId>org.springframework</groupId>
117+
<artifactId>spring-jdbc</artifactId>
118+
<version>5.2.12.RELEASE</version>
119+
</dependency>
120120

121121
<dependency>
122122
<groupId>io.springfox</groupId>
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
package com.urunov.config;
2-
3-
import org.modelmapper.ModelMapper;
4-
import org.modelmapper.convention.MatchingStrategies;
5-
import org.springframework.context.annotation.Bean;
6-
import org.springframework.context.annotation.Configuration;
7-
8-
/**
9-
* User: hamdamboy
10-
* Project: model
11-
* : @urunov
12-
*/
13-
@Configuration
14-
public class AppConfig {
15-
16-
@Bean
17-
public ModelMapper modelMapper() {
18-
19-
ModelMapper modelMapper = new ModelMapper();
20-
modelMapper.getConfiguration().setMatchingStrategy(MatchingStrategies.LOOSE);
21-
return modelMapper;
22-
}
23-
}
1+
//package com.urunov.config;
2+
//
3+
//import org.modelmapper.ModelMapper;
4+
//import org.modelmapper.convention.MatchingStrategies;
5+
//import org.springframework.context.annotation.Bean;
6+
//import org.springframework.context.annotation.Configuration;
7+
//
8+
///**
9+
// * User: hamdamboy
10+
// * Project: model
11+
// * : @urunov
12+
// */
13+
//@Configuration
14+
//public class AppConfig {
15+
//
16+
// @Bean
17+
// public ModelMapper modelMapper() {
18+
//
19+
// ModelMapper modelMapper = new ModelMapper();
20+
// modelMapper.getConfiguration().setMatchingStrategy(MatchingStrategies.LOOSE);
21+
// return modelMapper;
22+
// }
23+
//}
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
package com.urunov.config;
2-
3-
import org.springframework.context.annotation.Configuration;
4-
import org.springframework.web.servlet.config.annotation.CorsRegistry;
5-
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
6-
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
7-
8-
/**
9-
* User: hamdamboy
10-
* Project: model
11-
* : @urunov
12-
*/
13-
@Configuration
14-
@EnableWebMvc
15-
public class CorsConfig implements WebMvcConfigurer {
16-
17-
@Override
18-
public void addCorsMappings(CorsRegistry registry) {
19-
registry.addMapping("/**").allowedOrigins(System.getenv("REACT_CLIENT_URL"))
20-
.allowedMethods("GET", "POST");
21-
}
22-
}
1+
//package com.urunov.config;
2+
//
3+
//import org.springframework.context.annotation.Configuration;
4+
//import org.springframework.web.servlet.config.annotation.CorsRegistry;
5+
//import org.springframework.web.servlet.config.annotation.EnableWebMvc;
6+
//import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
7+
//
8+
///**
9+
// * User: hamdamboy
10+
// * Project: model
11+
// * : @urunov
12+
// */
13+
//@Configuration
14+
//@EnableWebMvc
15+
//public class CorsConfig implements WebMvcConfigurer {
16+
//
17+
//// @Override
18+
//// public void addCorsMappings(CorsRegistry registry) {
19+
//// registry.addMapping("/**").allowedOrigins(System.getenv("REACT_CLIENT_URL"))
20+
//// .allowedMethods("GET", "POST");
21+
//// }
22+
//}
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,5 @@ public class ApparelCategory implements Serializable {
3636
// @JsonIgnore
3737
// private List<ApparelImages> apparelImages;
3838

39-
public ApparelCategory(String apparel) {
40-
this.type = apparel;
41-
}
39+
4240
}
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package com.urunov.entity.elements.categories;
22

3-
import com.fasterxml.jackson.annotation.JsonIgnore;
4-
import com.urunov.entity.elements.info.ProductInfo;
53
import lombok.*;
64

7-
import javax.persistence.*;
5+
import javax.persistence.Entity;
6+
import javax.persistence.GeneratedValue;
7+
import javax.persistence.GenerationType;
8+
import javax.persistence.Id;
89
import java.io.Serializable;
9-
import java.util.List;
1010

1111
/**
1212
* User: hamdamboy
@@ -29,14 +29,14 @@ public class PriceRangeCategory implements Serializable {
2929
private String type;
3030

3131

32-
@OneToMany(cascade = CascadeType.ALL, orphanRemoval = true, mappedBy = "priceRangeCategory")
33-
@JsonIgnore
34-
private List<ProductInfo> productInfos;
35-
36-
37-
public PriceRangeCategory(int id, String type) {
38-
39-
this.id = id;
40-
this.type = type;
41-
}
32+
// @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true, mappedBy = "priceRangeCategory")
33+
// @JsonIgnore
34+
// private List<ProductInfo> productInfos;
35+
//
36+
//
37+
// public PriceRangeCategory(int id, String type) {
38+
//
39+
// this.id = id;
40+
// this.type = type;
41+
// }
4242
}
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import javax.persistence.GeneratedValue;
77
import javax.persistence.GenerationType;
88
import javax.persistence.Id;
9+
import java.io.Serializable;
910

1011
/**
1112
* User: hamdamboy
@@ -19,11 +20,12 @@
1920
@AllArgsConstructor
2021
@NoArgsConstructor
2122
@Entity
22-
public class Customer {
23+
public class Customer implements Serializable {
2324

2425
@Id
2526
@GeneratedValue(strategy = GenerationType.IDENTITY)
2627
private Integer id;
28+
2729
private String name;
2830
private String image;
2931
private String email;
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
package com.urunov.entity.elements.images;
22

3-
import com.fasterxml.jackson.annotation.JsonIgnore;
4-
import com.urunov.entity.elements.categories.ApparelCategory;
5-
import com.urunov.entity.elements.categories.GenderCategory;
6-
import lombok.*;
3+
import lombok.Getter;
4+
import lombok.RequiredArgsConstructor;
5+
import lombok.Setter;
6+
import lombok.ToString;
77

8-
import javax.persistence.*;
8+
import javax.persistence.Entity;
9+
import javax.persistence.GeneratedValue;
10+
import javax.persistence.GenerationType;
11+
import javax.persistence.Id;
12+
import java.io.Serializable;
913

1014
/**
1115
* User: hamdamboy
@@ -18,7 +22,7 @@
1822
@RequiredArgsConstructor
1923
@ToString
2024
@Entity
21-
public class ApparelImages {
25+
public class ApparelImages implements Serializable {
2226

2327
@Id
2428
@GeneratedValue(strategy = GenerationType.IDENTITY)
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
package com.urunov.entity.elements.images;
22

3-
import com.urunov.entity.elements.categories.ProductBrandCategory;
43
import lombok.*;
54

6-
import javax.persistence.*;
5+
import javax.persistence.Entity;
6+
import javax.persistence.GeneratedValue;
7+
import javax.persistence.GenerationType;
8+
import javax.persistence.Id;
9+
import java.io.Serializable;
710

811
/**
912
* User: hamdamboy
@@ -16,7 +19,7 @@
1619
@NoArgsConstructor
1720
@AllArgsConstructor
1821
@Entity
19-
public class BrandImages {
22+
public class BrandImages implements Serializable {
2023

2124
@Id
2225
@GeneratedValue(strategy = GenerationType.IDENTITY)
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ public class CarouselImages {
3030
private String imageURL;
3131

3232

33-
public CarouselImages(String s, String imageLocalPath, String imageURL) {
34-
this.link = s;
35-
this.imageLocalPath = imageLocalPath;
36-
this.imageURL = imageURL;
37-
}
33+
// public CarouselImages(String link, String imageLocalPath, String imageURL) {
34+
// this.link = link;
35+
// this.imageLocalPath = imageLocalPath;
36+
// this.imageURL = imageURL;
37+
// }
3838
}
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,7 @@ public class ContactInfo {
3737
// @JsonIgnore
3838
// private List<BankInfo> banks;
3939

40+
// Customer OneToOne
41+
4042

4143
}
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
package com.urunov.service.interfaces;
2-
3-
import org.springframework.context.annotation.Configuration;
4-
5-
/**
6-
* User: hamdamboy
7-
* Project: model
8-
* : @urunov
9-
*/
10-
@Configuration
11-
public interface LoadFakeDataService {
12-
13-
boolean loadTestData();
14-
}
1+
//package com.urunov.service.interfaces;
2+
//
3+
//import org.springframework.context.annotation.Configuration;
4+
//
5+
///**
6+
// * User: hamdamboy
7+
// * Project: model
8+
// * : @urunov
9+
// */
10+
//@Configuration
11+
//public interface LoadFakeDataService {
12+
//
13+
// boolean loadTestData();
14+
//}

0 commit comments

Comments
 (0)