From f861ef57f992575fbfc94891d08a506d5a4761cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awek=20Zatorski?= Date: Mon, 11 Nov 2024 17:45:37 +0100 Subject: [PATCH] aa --- .../event/config/LoggingConfiguration.java | 12 +++++++++ .../event/web/rest/RegistrationResource.java | 27 +++++++++++++++++-- src/main/resources/config/application-dev.yml | 1 + .../resources/config/application-prod.yml | 5 ++-- src/main/resources/logback-spring.xml | 19 +++++++------ 5 files changed, 52 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/sasiedzi/event/config/LoggingConfiguration.java b/src/main/java/com/sasiedzi/event/config/LoggingConfiguration.java index 510541d..90b5b1d 100644 --- a/src/main/java/com/sasiedzi/event/config/LoggingConfiguration.java +++ b/src/main/java/com/sasiedzi/event/config/LoggingConfiguration.java @@ -9,7 +9,9 @@ import java.util.HashMap; import java.util.Map; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.web.filter.CommonsRequestLoggingFilter; import tech.jhipster.config.JHipsterProperties; /* @@ -44,4 +46,14 @@ public class LoggingConfiguration { addContextListener(context, customFields, loggingProperties); } } + + @Bean + public CommonsRequestLoggingFilter requestLoggingFilter() { + CommonsRequestLoggingFilter loggingFilter = new CommonsRequestLoggingFilter(); + loggingFilter.setIncludeClientInfo(true); + loggingFilter.setIncludeQueryString(true); + loggingFilter.setIncludePayload(true); + loggingFilter.setMaxPayloadLength(64000); + return loggingFilter; + } } diff --git a/src/main/java/com/sasiedzi/event/web/rest/RegistrationResource.java b/src/main/java/com/sasiedzi/event/web/rest/RegistrationResource.java index 6010abc..bda8b43 100644 --- a/src/main/java/com/sasiedzi/event/web/rest/RegistrationResource.java +++ b/src/main/java/com/sasiedzi/event/web/rest/RegistrationResource.java @@ -1,19 +1,26 @@ package com.sasiedzi.event.web.rest; import com.sasiedzi.event.domain.Registration; +import com.sasiedzi.event.domain.User; import com.sasiedzi.event.repository.RegistrationRepository; +import com.sasiedzi.event.repository.UserRepository; +import com.sasiedzi.event.service.UserService; +import com.sasiedzi.event.service.dto.AdminUserDTO; import com.sasiedzi.event.web.rest.errors.BadRequestAlertException; import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; import java.net.URI; import java.net.URISyntaxException; +import java.security.Principal; import java.util.List; import java.util.Objects; import java.util.Optional; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.ResponseEntity; +import org.springframework.security.authentication.AbstractAuthenticationToken; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import tech.jhipster.web.util.HeaderUtil; @@ -31,13 +38,20 @@ public class RegistrationResource { private static final String ENTITY_NAME = "registration"; + @Autowired + UserService userService; + @Value("${jhipster.clientApp.name}") private String applicationName; private final RegistrationRepository registrationRepository; - public RegistrationResource(RegistrationRepository registrationRepository) { + @Autowired + private UserRepository userRepository; + + public RegistrationResource(RegistrationRepository registrationRepository, UserRepository userRepository) { this.registrationRepository = registrationRepository; + this.userRepository = userRepository; } /** @@ -48,11 +62,20 @@ public class RegistrationResource { * @throws URISyntaxException if the Location URI syntax is incorrect. */ @PostMapping("") - public ResponseEntity createRegistration(@Valid @RequestBody Registration registration) throws URISyntaxException { + public ResponseEntity createRegistration(@Valid @RequestBody Registration registration, Principal principal) + throws URISyntaxException { LOG.debug("REST request to save Registration : {}", registration); + AdminUserDTO userFromAuthentication; + if (principal instanceof AbstractAuthenticationToken) { + userFromAuthentication = userService.getUserFromAuthentication((AbstractAuthenticationToken) principal); + } else { + throw new RuntimeException("User could not be found"); + } if (registration.getId() != null) { throw new BadRequestAlertException("A new registration cannot already have an ID", ENTITY_NAME, "idexists"); } + Optional oneByLogin = userRepository.findOneByLogin(userFromAuthentication.getLogin()); + registration.setUser(oneByLogin.get()); registration = registrationRepository.save(registration); return ResponseEntity.created(new URI("/api/registrations/" + registration.getId())) .headers(HeaderUtil.createEntityCreationAlert(applicationName, false, ENTITY_NAME, registration.getId().toString())) diff --git a/src/main/resources/config/application-dev.yml b/src/main/resources/config/application-dev.yml index 36381ed..5c66858 100644 --- a/src/main/resources/config/application-dev.yml +++ b/src/main/resources/config/application-dev.yml @@ -19,6 +19,7 @@ logging: tech.jhipster: DEBUG org.hibernate.SQL: DEBUG com.sasiedzi.event: DEBUG + org.springframeworkweb.filter.CommonsRequestLoggingFilter: DEBUG spring: devtools: diff --git a/src/main/resources/config/application-prod.yml b/src/main/resources/config/application-prod.yml index f459efb..9be06ca 100644 --- a/src/main/resources/config/application-prod.yml +++ b/src/main/resources/config/application-prod.yml @@ -15,9 +15,10 @@ logging: level: - ROOT: INFO + ROOT: DEBUG tech.jhipster: INFO - com.sasiedzi.event: INFO + com.sasiedzi.event: DEBUG + org.springframeworkweb.filter.CommonsRequestLoggingFilter: DEBUG management: prometheus: diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index f90eb44..810aaaa 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -6,15 +6,16 @@ - + + + + - + + + + + @@ -70,6 +72,7 @@ +