Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/main/java/com/marcomnrq/ecommerce/EcommerceApplication.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
@SpringBootApplication
public class EcommerceApplication {

public static void main(String[] args) {
SpringApplication.run(EcommerceApplication.class, args);
}
public static void main(String[] args) {
SpringApplication.run(EcommerceApplication.class, args);
}

@Bean
public ModelMapper modelMapper() {
return new ModelMapper();
}
@Bean
public ModelMapper modelMapper() {
return new ModelMapper();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,19 @@

@Configuration
public class OpenApiConfiguration {
@Bean(name = "eCommerceOpenApi")
public OpenAPI eCommerceOpenApi() {
return new OpenAPI()
.info(
new Info()
.title("MP eCommerce Application API")
.description("API implemented with Spring Boot RESTful service and documented using springdoc-openapi and OpenAPI 3.0")
.version("1.0")
.contact(new Contact()
.name("Marco Antonio Manrique Acha")
.email("manriqueacham@gmail.com")
.url("https://blucode.solutions")));
}
@Bean(name = "eCommerceOpenApi")
public OpenAPI eCommerceOpenApi() {
return new OpenAPI()
.info(
new Info()
.title("MP eCommerce Application API")
.description(
"API implemented with Spring Boot RESTful service and documented using springdoc-openapi and OpenAPI 3.0")
.version("1.0")
.contact(
new Contact()
.name("Marco Antonio Manrique Acha")
.email("manriqueacham@gmail.com")
.url("https://blucode.solutions")));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,39 +21,42 @@
@EnableGlobalMethodSecurity(prePostEnabled = true)
public class SecurityConfiguration extends WebSecurityConfigurerAdapter {

private final UserDetailsService userDetailsService;

private final JwtAuthenticationFilter jwtAuthenticationFilter;

@Override
@Bean(BeanIds.AUTHENTICATION_MANAGER)
public AuthenticationManager authenticationManagerBean() throws Exception {
return super.authenticationManagerBean();
}

@Override
public void configure(HttpSecurity httpSecurity) throws Exception {
httpSecurity
.cors().disable()
.csrf().disable()
.authorizeRequests()

.antMatchers("/**")
.permitAll()

.anyRequest()
.authenticated();
httpSecurity
.addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);
}

@Autowired
public void configureGlobal(AuthenticationManagerBuilder authenticationManagerBuilder) throws Exception {
authenticationManagerBuilder.userDetailsService(userDetailsService).passwordEncoder(passwordEncoder());
}

@Bean
PasswordEncoder passwordEncoder() {
return new BCryptPasswordEncoder();
}
private final UserDetailsService userDetailsService;

private final JwtAuthenticationFilter jwtAuthenticationFilter;

@Override
@Bean(BeanIds.AUTHENTICATION_MANAGER)
public AuthenticationManager authenticationManagerBean() throws Exception {
return super.authenticationManagerBean();
}

@Override
public void configure(HttpSecurity httpSecurity) throws Exception {
httpSecurity
.cors()
.disable()
.csrf()
.disable()
.authorizeRequests()
.antMatchers("/**")
.permitAll()
.anyRequest()
.authenticated();
httpSecurity.addFilterBefore(
jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);
}

@Autowired
public void configureGlobal(AuthenticationManagerBuilder authenticationManagerBuilder)
throws Exception {
authenticationManagerBuilder
.userDetailsService(userDetailsService)
.passwordEncoder(passwordEncoder());
}

@Bean
PasswordEncoder passwordEncoder() {
return new BCryptPasswordEncoder();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,12 @@
import com.marcomnrq.ecommerce.resource.authentication.RefreshTokenRequest;
import com.marcomnrq.ecommerce.resource.authentication.RegistrationRequest;
import com.marcomnrq.ecommerce.service.AuthenticationService;
import javax.validation.Valid;
import lombok.AllArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
import java.security.Principal;

@RestController
@AllArgsConstructor
@RequestMapping("/api/authentication")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,4 @@
@RestController
@AllArgsConstructor
@RequestMapping("/api")
public class CartController {

}
public class CartController {}
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.marcomnrq.ecommerce.controller;

import com.marcomnrq.ecommerce.resource.IpnResource;
import com.marcomnrq.ecommerce.resource.MercadopagoResource;
import com.marcomnrq.ecommerce.service.OrderService;
import lombok.AllArgsConstructor;
import org.springframework.http.ResponseEntity;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@
import com.marcomnrq.ecommerce.domain.model.Payment;
import com.marcomnrq.ecommerce.resource.MercadopagoResource;
import com.marcomnrq.ecommerce.service.PaymentService;
import java.util.Map;
import lombok.AllArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;

import java.util.Map;

@RestController
@AllArgsConstructor
@RequestMapping("api/payments")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
import com.marcomnrq.ecommerce.domain.model.Product;
import com.marcomnrq.ecommerce.resource.ProductResource;
import com.marcomnrq.ecommerce.service.ProductService;
import java.util.List;
import java.util.stream.Collectors;
import javax.validation.Valid;
import lombok.AllArgsConstructor;
import org.modelmapper.ModelMapper;
import org.springframework.data.domain.Page;
Expand All @@ -11,10 +14,6 @@
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
import java.util.List;
import java.util.stream.Collectors;

@RestController
@AllArgsConstructor
@RequestMapping("/api")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,36 +3,36 @@
import com.marcomnrq.ecommerce.domain.model.User;
import com.marcomnrq.ecommerce.resource.UserResource;
import com.marcomnrq.ecommerce.service.UserService;
import java.security.Principal;
import javax.validation.Valid;
import lombok.AllArgsConstructor;
import org.modelmapper.ModelMapper;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
import java.security.Principal;

@RestController
@AllArgsConstructor
@RequestMapping("api/users")
public class UserController {

private final ModelMapper modelMapper;
private final ModelMapper modelMapper;

private final UserService userService;
private final UserService userService;

@GetMapping
public UserResource getUserByEmail(Principal principal) {
String email = principal.getName();
return convertToResource(userService.getUserByEmail(email));
}
@GetMapping
public UserResource getUserByEmail(Principal principal) {
String email = principal.getName();
return convertToResource(userService.getUserByEmail(email));
}

@PutMapping
public UserResource updateUser(@Valid @RequestBody UserResource userResource, Principal principal) {
String email = principal.getName();
return convertToResource(userService.updateUser(email, userResource));
}
@PutMapping
public UserResource updateUser(
@Valid @RequestBody UserResource userResource, Principal principal) {
String email = principal.getName();
return convertToResource(userService.updateUser(email, userResource));
}

// Model Mapper
private UserResource convertToResource(User entity) {
return modelMapper.map(entity, UserResource.class);
}
// Model Mapper
private UserResource convertToResource(User entity) {
return modelMapper.map(entity, UserResource.class);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,8 @@
@Controller
public class WebController {

@GetMapping( { "/"
, "/carrito"
, "/ordenes"
, "/payment"
})
public String index() {
return "index";
}
@GetMapping({"/", "/carrito", "/ordenes", "/payment"})
public String index() {
return "index";
}
}
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
package com.marcomnrq.ecommerce.domain.model;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import java.io.Serializable;
import java.util.Date;
import javax.persistence.*;
import lombok.Data;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;

import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;

@Data
@MappedSuperclass
@EntityListeners(AuditingEntityListener.class)
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/com/marcomnrq/ecommerce/domain/model/Cart.java
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
package com.marcomnrq.ecommerce.domain.model;

import java.util.List;
import javax.persistence.*;
import lombok.Data;
import org.hibernate.annotations.OnDelete;
import org.hibernate.annotations.OnDeleteAction;

import javax.persistence.*;
import java.util.List;

@Data
@Entity
@Table(name = "carts")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package com.marcomnrq.ecommerce.domain.model;

import lombok.Data;

import javax.persistence.*;
import lombok.Data;

@Data
@Entity
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
package com.marcomnrq.ecommerce.domain.model;

import java.util.List;
import javax.persistence.*;
import lombok.Data;
import net.minidev.json.annotate.JsonIgnore;
import org.hibernate.annotations.NaturalId;

import javax.persistence.*;
import java.util.List;

@Data
@Entity
@Table(name = "categories")
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/com/marcomnrq/ecommerce/domain/model/Order.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package com.marcomnrq.ecommerce.domain.model;

import lombok.Data;

import javax.persistence.*;
import java.util.List;
import javax.persistence.*;
import lombok.Data;

@Data
@Entity
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package com.marcomnrq.ecommerce.domain.model;

import lombok.Data;

import javax.persistence.*;
import lombok.Data;

@Data
@Entity
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
package com.marcomnrq.ecommerce.domain.model;


import lombok.Data;

import javax.persistence.*;

import lombok.Data;

@Data
@Entity
Expand Down
Loading