Skip to content
Snippets Groups Projects
Commit c8202126 authored by Oussama's avatar Oussama Committed by ludovic Blanchet
Browse files

add logger to other iam services

parent 5dce3b31
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 47 additions and 0 deletions
api/api-iam/iam-internal/src/main/java/fr/gouv/vitamui/iam/internal/server/logbook/service/IamLogbookService.java
+ 6
− 0
View file @ c8202126
......@@ -155,6 +155,9 @@ public class IamLogbookService {
}
public void subrogation(final Subrogation sourceEvent, final EventType eventType) {
final VitamContext vitamContext = internalSecurityService.buildVitamContext(internalSecurityService.getTenantIdentifier());
LOGGER.info("Subrogation EvIdAppSession : {} " , vitamContext.getApplicationSessionId());
this.subrogation(converters.getSubrogationConverter().convertEntityToDto(sourceEvent), eventType);
}
......@@ -521,6 +524,9 @@ public class IamLogbookService {
}
public Tenant getProofTenantByCustomerId(final String customerId) {
final VitamContext vitamContext = internalSecurityService.buildVitamContext(internalSecurityService.getTenantIdentifier());
LOGGER.info("Tenant EvIdAppSession : {} " , vitamContext.getApplicationSessionId());
final Optional<Tenant> optTenant = tenantRepository.findOne(Query.query(Criteria.where("customerId").is(customerId).and("proof").is(true)));
optTenant.orElseThrow(() -> new NotFoundException("No proof tenant found for customerId : " + customerId));
......
api/api-iam/iam-internal/src/main/java/fr/gouv/vitamui/iam/internal/server/subrogation/service/SubrogationInternalService.java
+ 20
− 0
View file @ c8202126
......@@ -42,6 +42,10 @@ import java.util.Optional;
import javax.validation.constraints.NotNull;
import fr.gouv.vitam.common.client.VitamContext;
import fr.gouv.vitamui.commons.api.logger.VitamUILogger;
import fr.gouv.vitamui.commons.api.logger.VitamUILoggerFactory;
import fr.gouv.vitamui.commons.logbook.service.EventService;
import org.apache.commons.lang.time.DateUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -88,6 +92,8 @@ import lombok.Setter;
@Setter
public class SubrogationInternalService extends VitamUICrudService<SubrogationDto, Subrogation> {
private static final VitamUILogger LOGGER = VitamUILoggerFactory.getInstance(SubrogationInternalService.class);
private SubrogationRepository subrogationRepository;
private UserRepository userRepository;
......@@ -161,7 +167,9 @@ public class SubrogationInternalService extends VitamUICrudService<SubrogationDt
@Override
protected void beforeCreate(final SubrogationDto dto) {
super.beforeCreate(dto);
final VitamContext vitamContext = internalSecurityService.buildVitamContext(internalSecurityService.getTenantIdentifier());
LOGGER.info("Create Subrogation EvIdAppSession : {} " , vitamContext.getApplicationSessionId());
Assert.isTrue(dto.getStatus().equals(SubrogationStatusEnum.CREATED), "the subrogation must have the status CREATED at the creation");
checkUsers(dto);
// if status is now ACCEPTED, it's a generic user, set genericUsersSubrogationTtl min as lifetime
......@@ -196,6 +204,9 @@ public class SubrogationInternalService extends VitamUICrudService<SubrogationDt
}
private void checkUsers(final SubrogationDto dto) {
final VitamContext vitamContext = internalSecurityService.buildVitamContext(internalSecurityService.getTenantIdentifier());
LOGGER.info("Check Subrogation EvIdAppSession : {} " , vitamContext.getApplicationSessionId());
final String emailSurrogate = dto.getSurrogate();
final String emailSuperUser = dto.getSuperUser();
final User surrogate = userRepository.findByEmail(emailSurrogate);
......@@ -232,6 +243,9 @@ public class SubrogationInternalService extends VitamUICrudService<SubrogationDt
protected void beforeDelete(final String id) {
final Optional<Subrogation> subrogation = subrogationRepository.findById(id);
if (subrogation.isPresent()) {
final VitamContext vitamContext = internalSecurityService.buildVitamContext(internalSecurityService.getTenantIdentifier());
LOGGER.info("To Delete Subrogation EvIdAppSession : {} " , vitamContext.getApplicationSessionId());
final String emailSuperUser = subrogation.get().getSuperUser();
final String emailCurrentUser = internalSecurityService.getUser().getEmail();
Assert.isTrue(emailSuperUser.equals(emailCurrentUser), "Only super user can stop subrogation");
......@@ -239,6 +253,9 @@ public class SubrogationInternalService extends VitamUICrudService<SubrogationDt
}
public SubrogationDto accept(final String id) {
final VitamContext vitamContext = internalSecurityService.buildVitamContext(internalSecurityService.getTenantIdentifier());
LOGGER.info("Accept Subrogation EvIdAppSession : {} " , vitamContext.getApplicationSessionId());
final Optional<Subrogation> optSubrogation = subrogationRepository.findById(id);
final Subrogation subro = optSubrogation
.orElseThrow(() -> new IllegalArgumentException("Unable to accept subrogation: no subrogation found with id=" + id));
......@@ -257,6 +274,9 @@ public class SubrogationInternalService extends VitamUICrudService<SubrogationDt
@Transactional
public void decline(final String id) {
final VitamContext vitamContext = internalSecurityService.buildVitamContext(internalSecurityService.getTenantIdentifier());
LOGGER.info("Decline Subrogation EvIdAppSession : {} " , vitamContext.getApplicationSessionId());
final Optional<Subrogation> optSubrogation = subrogationRepository.findById(id);
final Subrogation subro = optSubrogation
.orElseThrow(() -> new IllegalArgumentException("Unable to decline subrogation: no subrogation found with id=" + id));
......
api/api-iam/iam-internal/src/main/java/fr/gouv/vitamui/iam/internal/server/tenant/service/TenantInternalService.java
+ 5
− 0
View file @ c8202126
......@@ -310,6 +310,9 @@ public class TenantInternalService extends VitamUICrudService<TenantDto, Tenant>
@Override
protected void processPatch(final Tenant tenant, final Map<String, Object> partialDto) {
final Collection<EventDiffDto> logbooks = new ArrayList<>();
final VitamContext vitamContext = internalSecurityService.buildVitamContext(internalSecurityService.getTenantIdentifier());
LOGGER.info("Patch Tenant EvIdAppSession : {} " , vitamContext.getApplicationSessionId());
for (final Entry<String, Object> entry : partialDto.entrySet()) {
switch (entry.getKey()) {
case "id" :
......@@ -455,6 +458,7 @@ public class TenantInternalService extends VitamUICrudService<TenantDto, Tenant>
public JsonNode findHistoryById(final String id) throws VitamClientException {
LOGGER.debug("findHistoryById for id" + id);
final Integer tenantIdentifier = internalSecurityService.getTenantIdentifier();
final VitamContext vitamContext = new VitamContext(tenantIdentifier)
.setAccessContract(internalSecurityService.getTenant(tenantIdentifier).getAccessContractLogbookIdentifier())
......@@ -463,6 +467,7 @@ public class TenantInternalService extends VitamUICrudService<TenantDto, Tenant>
final Optional<Tenant> tenant = getRepository().findById(id);
tenant.orElseThrow(() -> new NotFoundException(String.format("No tenant found with id : %s", id)));
LOGGER.info("Tenant History EvIdAppSession : {} " , internalSecurityService.buildVitamContext(internalSecurityService.getTenantIdentifier()).getApplicationSessionId());
return logbookService.findEventsByIdentifierAndCollectionNames(String.valueOf(tenant.get().getIdentifier()), MongoDbCollections.TENANTS, vitamContext)
.toJsonNode();
}
......
api/api-iam/iam-internal/src/main/java/fr/gouv/vitamui/iam/internal/server/user/service/UserInternalService.java
+ 16
− 0
View file @ c8202126
......@@ -249,6 +249,10 @@ public class UserInternalService extends VitamUICrudService<UserDto, User> {
*/
@Override
public UserDto create(final UserDto userDto) {
final VitamContext vitamContext = internalSecurityService.buildVitamContext(internalSecurityService.getTenantIdentifier());
LOGGER.info("Create User EvIdAppSession : {} " , vitamContext.getApplicationSessionId());
UserDto createdUserDto = null;
// start Transaction if needed
......@@ -421,6 +425,9 @@ public class UserInternalService extends VitamUICrudService<UserDto, User> {
}
try {
final VitamContext vitamContext = internalSecurityService.buildVitamContext(internalSecurityService.getTenantIdentifier());
LOGGER.info("Patch User EvIdAppSession : {} " , vitamContext.getApplicationSessionId());
LOGGER.info("Patch {} with {}", getObjectName(), partialDto);
// replacing the email with the lowercase version during update
......@@ -517,6 +524,9 @@ public class UserInternalService extends VitamUICrudService<UserDto, User> {
@Override
protected void processPatch(final User user, final Map<String, Object> partialDto) {
final Collection<EventDiffDto> logbooks = new ArrayList<>();
final VitamContext vitamContext = internalSecurityService.buildVitamContext(internalSecurityService.getTenantIdentifier());
LOGGER.info("Patch User EvIdAppSession : {} " , vitamContext.getApplicationSessionId());
for (final Entry<String, Object> entry : partialDto.entrySet()) {
switch (entry.getKey()) {
case "id":
......@@ -818,6 +828,9 @@ public class UserInternalService extends VitamUICrudService<UserDto, User> {
}
public AuthUserDto loadGroupAndProfiles(final UserDto userDto) {
final VitamContext vitamContext = internalSecurityService.buildVitamContext(internalSecurityService.getTenantIdentifier());
LOGGER.info("Load Group And Profiles EvIdAppSession : {} " , vitamContext.getApplicationSessionId());
final AuthUserDto authUserDto = new AuthUserDto(userDto);
final String groupId = userDto.getGroupId();
......@@ -850,6 +863,9 @@ public class UserInternalService extends VitamUICrudService<UserDto, User> {
}
public void addTenantsByAppInformation(final AuthUserDto authUserDto) {
final VitamContext vitamContext = internalSecurityService.buildVitamContext(internalSecurityService.getTenantIdentifier());
LOGGER.info("Add Tenant EvIdAppSession : {} " , vitamContext.getApplicationSessionId());
final Map<String, Set<TenantDto>> tenantsByApp = new HashMap<>();
if (authUserDto.getProfileGroup().getProfiles() != null) {
authUserDto.getProfileGroup().getProfiles().stream().filter(profile -> profile.getTenantName() != null).forEach(profile -> {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment