diff --git a/src/main/java/de/thm/arsnova/entities/migration/FromV2Migrator.java b/src/main/java/de/thm/arsnova/entities/migration/FromV2Migrator.java index 898c6241d255126ff1711b25255754d0a2a2f653..0b48b68911625fd3106491bdbd2a200db9ef2866 100644 --- a/src/main/java/de/thm/arsnova/entities/migration/FromV2Migrator.java +++ b/src/main/java/de/thm/arsnova/entities/migration/FromV2Migrator.java @@ -50,6 +50,8 @@ public class FromV2Migrator { static final String V2_TYPE_GRID = "grid"; private static final Map<String, de.thm.arsnova.entities.Content.Format> formatMapping; + private boolean ignoreRevision = false; + static { formatMapping = new HashMap<>(); formatMapping.put(V2_TYPE_ABCD, de.thm.arsnova.entities.Content.Format.CHOICE); @@ -64,7 +66,9 @@ public class FromV2Migrator { private void copyCommonProperties(final Entity from, final de.thm.arsnova.entities.Entity to) { to.setId(from.getId()); - //to.setRevision(from.getRevision()); + if (!ignoreRevision) { + to.setRevision(from.getRevision()); + } } public UserProfile migrate(final DbUser dbUser, final LoggedIn loggedIn, final MotdList motdList) { @@ -355,4 +359,8 @@ public class FromV2Migrator { return UserProfile.AuthProvider.UNKNOWN; } + + public void setIgnoreRevision(final boolean ignoreRevision) { + this.ignoreRevision = ignoreRevision; + } } diff --git a/src/main/java/de/thm/arsnova/persistance/couchdb/migrations/V2ToV3Migration.java b/src/main/java/de/thm/arsnova/persistance/couchdb/migrations/V2ToV3Migration.java index 92ab519b9716fa239968190a5123e95eb032d227..60647e2edc37ad31d1cf6eda81821fb86de9825d 100644 --- a/src/main/java/de/thm/arsnova/persistance/couchdb/migrations/V2ToV3Migration.java +++ b/src/main/java/de/thm/arsnova/persistance/couchdb/migrations/V2ToV3Migration.java @@ -82,10 +82,12 @@ public class V2ToV3Migration implements Migration { public void migrate() { createV2Index(); + migrator.setIgnoreRevision(true); migrateUsers(); migrateUnregisteredUsers(); migrateRooms(); migrateMotds(); + migrator.setIgnoreRevision(false); } private void createV2Index() {