Skip to content

Allow disabling of AutoTimestamp on insertion event if values are not null #1863

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

Merged
merged 3 commits into from
Jan 15, 2025
Merged

Allow disabling of AutoTimestamp on insertion event if values are not null #1863

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d16d644
Allow disabling of AutoTimestamp on insertion events if values alread…
codeconsole Jan 14, 2025
8dddc27
Use Settings
codeconsole Jan 14, 2025
a68a7e0
Add tests for AutoTimestampEventListener.insertOverwrite
codeconsole Jan 15, 2025
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
2 changes: 2 additions & 0 deletions grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/config/Settings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,6 @@ public interface Settings {
*/
String SETTING_DB_CREATE = SETTING_DATASOURCE + ".dbCreate";

String SETTING_AUTO_TIMESTAMP_INSERT_OVERWRITE = PREFIX + '.' + "events.autoTimestampInsertOverwrite";

}
24 changes: 17 additions & 7 deletions ...ore-gorm/src/main/groovy/org/grails/datastore/gorm/events/AutoTimestampEventListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.grails.datastore.gorm.timestamp.DefaultTimestampProvider;
import org.grails.datastore.gorm.timestamp.TimestampProvider;
import org.grails.datastore.mapping.config.Entity;
import org.grails.datastore.mapping.config.Settings;
import org.grails.datastore.mapping.core.Datastore;
import org.grails.datastore.mapping.engine.EntityAccess;
import org.grails.datastore.mapping.engine.event.AbstractPersistenceEvent;
Expand All @@ -34,6 +35,7 @@
import org.grails.datastore.mapping.model.MappingContext;
import org.grails.datastore.mapping.model.PersistentEntity;
import org.grails.datastore.mapping.model.PersistentProperty;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.ApplicationEvent;

/**
Expand All @@ -44,6 +46,10 @@
*/
public class AutoTimestampEventListener extends AbstractPersistenceEventListener implements MappingContext.Listener {

// if false, will not set timestamp on insert event if value is not null
@Value("${" + Settings.SETTING_AUTO_TIMESTAMP_INSERT_OVERWRITE + ":true}")
boolean insertOverwrite = true;

public static final String DATE_CREATED_PROPERTY = "dateCreated";
public static final String LAST_UPDATED_PROPERTY = "lastUpdated";

Expand Down Expand Up @@ -98,19 +104,23 @@ public boolean beforeInsert(PersistentEntity entity, EntityAccess ea) {
Set<String> props = getDateCreatedPropertyNames(name);
if (props != null) {
for (String prop : props) {
dateCreatedType = ea.getPropertyType(prop);
timestamp = timestampProvider.createTimestamp(dateCreatedType);
ea.setProperty(prop, timestamp);
if (insertOverwrite || ea.getPropertyValue(prop) == null) {
dateCreatedType = ea.getPropertyType(prop);
timestamp = timestampProvider.createTimestamp(dateCreatedType);
ea.setProperty(prop, timestamp);
}
}
}
props = getLastUpdatedPropertyNames(name);
if (props != null) {
for (String prop : props) {
Class<?> lastUpdateType = ea.getPropertyType(prop);
if (dateCreatedType == null || !lastUpdateType.isAssignableFrom(dateCreatedType)) {
timestamp = timestampProvider.createTimestamp(lastUpdateType);
if (insertOverwrite || ea.getPropertyValue(prop) == null) {
Class<?> lastUpdateType = ea.getPropertyType(prop);
if (dateCreatedType == null || !lastUpdateType.isAssignableFrom(dateCreatedType)) {
timestamp = timestampProvider.createTimestamp(lastUpdateType);
}
ea.setProperty(prop, timestamp);
}
ea.setProperty(prop, timestamp);
}
}
return true;
Expand Down
Loading