Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tenant Variable - inits empty fields #119

Merged
merged 1 commit into from
Oct 9, 2024
Merged

Tenant Variable - inits empty fields #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 10 additions & 2 deletions tenantvariables/src/main/java/org/assimbly/tenantvariables/domain/TenantVariable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,17 @@ public static TenantVariable fromDocument(Document document) {
tenantVariable.set_type(document.getString(TYPE_FIELD));
}
tenantVariable.setName(document.getString(NAME_FIELD));
if(document.getLong(CREATED_AT_FIELD) != null) {
tenantVariable.setCreatedAt(document.getLong(CREATED_AT_FIELD));

Object createdAtField = document.get(CREATED_AT_FIELD);
if (createdAtField != null) {
if (createdAtField instanceof Long) {
tenantVariable.setCreatedAt((Long) createdAtField);
} else if (createdAtField instanceof Integer) {
// Convert Integer to Long
tenantVariable.setCreatedAt(((Integer) createdAtField).longValue());
}
}

tenantVariable.setCreatedBy(document.getString(CREATED_BY_FIELD));

List<Document> valuesList = (List<Document>) document.get(VALUES_FIELD);
Expand Down
29 changes: 20 additions & 9 deletions tenantvariables/src/main/java/org/assimbly/tenantvariables/mongo/MongoDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.mongodb.client.MongoCollection;
import com.mongodb.client.MongoCursor;
import com.mongodb.client.MongoDatabase;
import org.apache.commons.lang3.StringUtils;
import org.assimbly.tenantvariables.TenantVariablesProcessor;
import org.assimbly.tenantvariables.domain.EnvironmentValue;
import org.assimbly.tenantvariables.domain.TenantVariable;
Expand Down Expand Up @@ -151,15 +152,7 @@ public static void saveTenantVariable(
TenantVariable tenantVariable = findTenantVariableByName(tenantVarName, tenant, tenantVarType);
boolean tenantVariableExist = !Objects.isNull(tenantVariable);

if(!tenantVariableExist) {
tenantVariable = new TenantVariable(tenantVarName);
tenantVariable.set_type(tenantVarType.name());
tenantVariable.setCreatedAt(new Date().getTime());
tenantVariable.setCreatedBy(CREATED_BY_SYSTEM);
}

if(!tenantVariable.find(environment).isPresent())
tenantVariable.put(new EnvironmentValue(environment));
tenantVariable = initTenantVariable(tenantVariable, tenantVarType, tenantVarName, environment, tenantVariableExist);

EnvironmentValue variable = tenantVariable.find(environment).get();

Expand All @@ -171,6 +164,24 @@ public static void saveTenantVariable(
updateTenantVariable(tenantVariable, tenant, tenantVariableExist);
}

private static TenantVariable initTenantVariable(TenantVariable tenantVariable, TenantVariable.TenantVarType tenantVarType, String tenantVarName, String environment, boolean tenantVariableExist) {
if(!tenantVariableExist) {
tenantVariable = new TenantVariable(tenantVarName);
tenantVariable.set_type(tenantVarType.name());
}
if(StringUtils.isEmpty(tenantVariable.getCreatedBy())) {
tenantVariable.setCreatedBy(CREATED_BY_SYSTEM);
}
if(tenantVariable.getCreatedAt() == 0) {
tenantVariable.setCreatedAt(new Date().getTime());
}
if(!tenantVariable.find(environment).isPresent()) {
tenantVariable.put(new EnvironmentValue(environment));
}

return tenantVariable;
}

public static void updateTenantVariable(TenantVariable tenantVariable, String tenant, boolean tenantVariableExist){
MongoDatabase database = MongoClientProvider.getInstance().getDatabase(tenant);
MongoCollection<Document> collection = database.getCollection(TENANT_VARIABLES_COLLECTION_NAME);
Expand Down