Skip to content
Snippets Groups Projects
Unverified Commit 96ea2c5c authored by Benaissa BENARBIA's avatar Benaissa BENARBIA Committed by GitHub
Browse files

[VAS] Bug 8660 - Make application EXTERNAL_PARAM_PROFILE_APP multi tenant (#460)

* make application EXTERNAL_PARAM_PROFILE_APP multi tenant

* include tenant identifier on criteria for external params
parent 1b71972d
No related branches found
No related tags found
1 merge request!51Merge mis a jour vitam-ui
......@@ -40,12 +40,14 @@ import com.fasterxml.jackson.databind.JsonNode;
import fr.gouv.vitam.common.client.VitamContext;
import fr.gouv.vitam.common.exception.VitamClientException;
import fr.gouv.vitamui.commons.api.CommonConstants;
import fr.gouv.vitamui.commons.api.domain.CriterionOperator;
import fr.gouv.vitamui.commons.api.domain.DirectionDto;
import fr.gouv.vitamui.commons.api.domain.ExternalParamProfileDto;
import fr.gouv.vitamui.commons.api.domain.ExternalParametersDto;
import fr.gouv.vitamui.commons.api.domain.PaginatedValuesDto;
import fr.gouv.vitamui.commons.api.domain.ParameterDto;
import fr.gouv.vitamui.commons.api.domain.ProfileDto;
import fr.gouv.vitamui.commons.api.domain.QueryDto;
import fr.gouv.vitamui.commons.api.domain.ServicesData;
import fr.gouv.vitamui.commons.api.logger.VitamUILogger;
import fr.gouv.vitamui.commons.api.logger.VitamUILoggerFactory;
......@@ -112,7 +114,11 @@ public class ExternalParamProfileInternalService {
public PaginatedValuesDto<ExternalParamProfileDto> getAllPaginated(final Integer page, final Integer size,
final String criteria, final String orderBy, final DirectionDto direction) {
return externalParamProfileRepository.getAllPaginated(page, size, criteria, orderBy, direction);
final Integer tenantIdentifier = internalSecurityService.getTenantIdentifier();
QueryDto queryDto = QueryDto.fromJson(criteria);
queryDto
.addQuery(QueryDto.andQuery().addCriterion("tenantIdentifier", tenantIdentifier, CriterionOperator.EQUALS));
return externalParamProfileRepository.getAllPaginated(page, size, queryDto.toJson(), orderBy, direction);
}
@Transactional
......
db = db.getSiblingDB('iam')
print("START_38_update_external_params_profiles_app_multi_tenant_flag.js");
// -------- EXTERNAL_PARAM_PROFILE_APP -----
db.applications.update({
"identifier":"EXTERNAL_PARAM_PROFILE_APP"
},
{
$set:{
"hasTenantList":true
}
});
print("END_38_update_external_params_profiles_app_multi_tenant_flag.js");
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