Skip to content

fix(common): #ENABLING-199, better check of dates type when importing resources into mongo #574

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

Open
juniorode wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix(common): #ENABLING-199, better check of dates type when importing resources into mongo #574

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
29 changes: 14 additions & 15 deletions common/src/main/java/org/entcore/common/folders/impl/DocumentHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,30 +154,29 @@ public static Optional<Date> getModified(JsonObject doc) {
}
}

public static JsonObject setModified(JsonObject doc, Date date)
{
try
{
// Check that the dates are in string format
String m = doc.getString("modified");
String c = doc.getString("created");

//If we get there, the dates should be strings
public static JsonObject setModified(JsonObject doc, Date date) {
Object modified = doc.getValue("modified");
Object created = doc.getValue("created");
// Check that the dates are in string format
// we also check for nullity to keep the same behaviour as in vertx 3
if((modified == null || modified instanceof String) &&
(created == null || created instanceof String)) {
String now = MongoDb.formatDate(date != null ? date : new Date());

doc.put("modified", now);

if(c == null)
if(created == null) {
doc.put("created", now);
}
catch(Exception e)
{
}
} else {
// It appears that those dates were in fact objects
JsonObject now = MongoDb.now();

doc.put("modified", now);

if(doc.getJsonObject("created") == null)
doc.put("created", now);
if(created == null) {
doc.put("created", now);
}
}

return doc;
Expand Down