From 69f1ff5791bd93b34b52fd6b3e240a26f28edd26 Mon Sep 17 00:00:00 2001
From: mikereiche <michael.reiche@couchbase.com>
Date: Thu, 18 Jun 2020 10:35:53 -0700
Subject: [PATCH] DATACOUCH-546 - set generated id on entity returned to caller

---
 .../convert/MappingCouchbaseConverter.java    |  4 +-
 .../MappingCouchbaseConverterTests.java       | 90 +++++++++++++++++++
 2 files changed, 93 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/MappingCouchbaseConverter.java b/src/main/java/org/springframework/data/couchbase/core/convert/MappingCouchbaseConverter.java
index 52d9189d..e9c48f31 100644
--- a/src/main/java/org/springframework/data/couchbase/core/convert/MappingCouchbaseConverter.java
+++ b/src/main/java/org/springframework/data/couchbase/core/convert/MappingCouchbaseConverter.java
@@ -537,7 +537,9 @@ public class MappingCouchbaseConverter extends AbstractCouchbaseConverter implem
 			String id = accessor.getProperty(idProperty, String.class);
 			if (idProperty.isAnnotationPresent(GeneratedValue.class) && (id == null || id.equals(""))) {
 				generatedValueInfo = idProperty.findAnnotation(GeneratedValue.class);
-				target.setId(generateId(generatedValueInfo, prefixes, suffixes, idAttributes));
+				String generatedId = generateId(generatedValueInfo, prefixes, suffixes, idAttributes);
+				target.setId(generatedId);
+				accessor.setProperty(idProperty, generatedId);
 			} else {
 				target.setId(id);
 			}
diff --git a/src/test/java/org/springframework/data/couchbase/core/mapping/MappingCouchbaseConverterTests.java b/src/test/java/org/springframework/data/couchbase/core/mapping/MappingCouchbaseConverterTests.java
index 2a2a14b8..cb650cb5 100644
--- a/src/test/java/org/springframework/data/couchbase/core/mapping/MappingCouchbaseConverterTests.java
+++ b/src/test/java/org/springframework/data/couchbase/core/mapping/MappingCouchbaseConverterTests.java
@@ -34,6 +34,9 @@ import org.springframework.data.convert.WritingConverter;
 import org.springframework.data.couchbase.core.convert.CouchbaseCustomConversions;
 import org.springframework.data.couchbase.core.convert.CouchbaseJsr310Converters.LocalDateTimeToLongConverter;
 import org.springframework.data.couchbase.core.convert.MappingCouchbaseConverter;
+import org.springframework.data.couchbase.core.mapping.id.GeneratedValue;
+import org.springframework.data.couchbase.core.mapping.id.GenerationStrategy;
+import org.springframework.data.couchbase.core.mapping.id.IdPrefix;
 import org.springframework.data.couchbase.domain.Config;
 import org.springframework.data.couchbase.domain.User;
 import org.springframework.data.mapping.MappingException;
@@ -723,6 +726,7 @@ public class MappingCouchbaseConverterTests {
 		@Field("decimalValue") private BigDecimal value;
 		@Field("listOfDecimalValues") private List<BigDecimal> listOfValues;
 		@Field("mapOfDecimalValues") private Map<String, BigDecimal> mapOfValues;
+
 		public CustomFieldsEntity(BigDecimal value, List<BigDecimal> listOfValues, Map<String, BigDecimal> mapOfValues) {
 			this.value = value;
 			this.listOfValues = listOfValues;
@@ -783,4 +787,90 @@ public class MappingCouchbaseConverterTests {
 		}
 	}
 
+	@Test
+	void idTest00() { // id does not get set
+		CouchbaseDocument converted = new CouchbaseDocument();
+		IdTest00Entity entity = new IdTest00Entity();
+		converter.write(entity, converted);
+		Map<String, Object> result = converted.export();
+		assertThat(converted.getId()).isEqualTo(entity.getId());
+	}
+
+	public static class IdTest00Entity { // id does not get set
+		public static final String ID = "mockid";
+		@Id private String id = ID;
+
+		String getId() {
+			return id;
+		}
+	}
+
+	@Test
+	void idTest02() { // id is String
+		CouchbaseDocument converted = new CouchbaseDocument();
+		IdTest02Entity entity = new IdTest02Entity();
+		converter.write(entity, converted);
+		Map<String, Object> result = converted.export();
+		assertThat(converted.getId()).isEqualTo(entity.getId());
+	}
+
+	public static class IdTest02Entity { // id is String
+		@GeneratedValue(strategy = GenerationStrategy.UNIQUE) @Id String id;
+
+		String getId() {
+			return id;
+		}
+	}
+
+	@Test
+	void idTest03() { // id is UUID
+		CouchbaseDocument converted = new CouchbaseDocument();
+		IdTest03Entity entity = new IdTest03Entity();
+		converter.write(entity, converted);
+		assertThat(converted.getId()).isEqualTo(entity.getId());
+	}
+
+	public static class IdTest03Entity { // id is UUID
+		@GeneratedValue(strategy = GenerationStrategy.UNIQUE) @Id UUID id;
+
+		String getId() {
+			return id.toString();
+		}
+
+	}
+
+	@Test
+	void idTest05() { // id is Integer
+		CouchbaseDocument converted = new CouchbaseDocument();
+		IdTest05Entity entity = new IdTest05Entity();
+		converter.write(entity, converted);
+		assertThat(converted.getId()).isEqualTo(entity.getId());
+	}
+
+	public static class IdTest05Entity { // id is Integer
+		@GeneratedValue() @Id Integer id;
+		@IdPrefix public String prefix = "123";
+
+		String getId() {
+			return id.toString();
+		}
+	}
+
+	@Test
+	void idTest07() { // id is Number
+		CouchbaseDocument converted = new CouchbaseDocument();
+		IdTest07Entity entity = new IdTest07Entity();
+		converter.write(entity, converted);
+		assertThat(converted.getId()).isEqualTo(entity.getId());
+	}
+
+	public static class IdTest07Entity { // id is Number
+		@GeneratedValue() @Id public Number id;
+		@IdPrefix public String prefix = "123";
+
+		String getId() {
+			return id.toString();
+		}
+	}
+
 }