From 69006ca06768931ca994e9efafc6fc0e0e371b04 Mon Sep 17 00:00:00 2001
From: Edouard DUPIN <yui.heero@gmail.com>
Date: Fri, 26 Apr 2024 00:02:14 +0200
Subject: [PATCH] [FIX] correct remote element

---
 .../kar/archidata/dataAccess/DataAccess.java  | 29 +++++++++++++++
 .../dataAccess/addOn/AddOnManyToMany.java     | 35 ++++++++++---------
 2 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/src/org/kar/archidata/dataAccess/DataAccess.java b/src/org/kar/archidata/dataAccess/DataAccess.java
index c9e19f0..6881a5a 100644
--- a/src/org/kar/archidata/dataAccess/DataAccess.java
+++ b/src/org/kar/archidata/dataAccess/DataAccess.java
@@ -14,6 +14,7 @@ import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalTime;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
@@ -212,6 +213,34 @@ public class DataAccess {
 		return out;
 	}
 
+	public static byte[][] splitIntoGroupsOf32Bytes(final byte[] input) {
+		final int inputLength = input.length;
+		final int numOfGroups = (inputLength + 31) / 32; // Calculate the number of groups needed
+		final byte[][] groups = new byte[numOfGroups][32];
+
+		for (int i = 0; i < numOfGroups; i++) {
+			final int startIndex = i * 32;
+			final int endIndex = Math.min(startIndex + 32, inputLength);
+			groups[i] = Arrays.copyOfRange(input, startIndex, endIndex);
+		}
+
+		return groups;
+	}
+
+	public static List<UUID> getListOfRawUUIDs(final ResultSet rs, final int iii) throws SQLException {
+		final byte[] trackString = rs.getBytes(iii);
+		if (rs.wasNull()) {
+			return null;
+		}
+		final byte[][] elements = splitIntoGroupsOf32Bytes(trackString);
+		final List<UUID> out = new ArrayList<>();
+		for (final byte[] elem : elements) {
+			final UUID tmp = UUID.nameUUIDFromBytes(elem);
+			out.add(tmp);
+		}
+		return out;
+	}
+
 	protected static <T> void setValuedb(final Class<?> type, final T data, final CountInOut iii, final Field field, final PreparedStatement ps) throws Exception {
 		if (type == UUID.class) {
 			final Object tmp = field.get(data);
diff --git a/src/org/kar/archidata/dataAccess/addOn/AddOnManyToMany.java b/src/org/kar/archidata/dataAccess/addOn/AddOnManyToMany.java
index c84e038..0930cbf 100644
--- a/src/org/kar/archidata/dataAccess/addOn/AddOnManyToMany.java
+++ b/src/org/kar/archidata/dataAccess/addOn/AddOnManyToMany.java
@@ -73,9 +73,15 @@ public class AddOnManyToMany implements DataAccessAddOn {
 		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType()).getActualTypeArguments()[0];
 		if (objectClass == Long.class || objectClass == UUID.class) {
 			return true;
-		} else {
+		}
+		final ManyToMany decorators = field.getDeclaredAnnotation(ManyToMany.class);
+		if (decorators == null) {
 			return false;
 		}
+		if (decorators.targetEntity() == objectClass) {
+			return true;
+		}
+		return false;
 	}
 
 	public static String generateLinkTableNameField(final String tableName, final Field field) throws Exception {
@@ -99,19 +105,13 @@ public class AddOnManyToMany implements DataAccessAddOn {
 			@NotNull final String name, //
 			@NotNull final CountInOut elemCount, //
 			final QueryOptions options//
-	) {
+	) throws Exception {
 		final String linkTableName = generateLinkTableName(tableName, name);
 		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType()).getActualTypeArguments()[0];
 		final String tmpVariable = "tmp_" + Integer.toString(elemCount.value);
 		querrySelect.append(" (SELECT GROUP_CONCAT(");
-		if (objectClass == Long.class) {
-			querrySelect.append(tmpVariable);
-			querrySelect.append(".object2Id ");
-		} else {
-			querrySelect.append("BIN_TO_UUID(");
-			querrySelect.append(tmpVariable);
-			querrySelect.append(".object2Id) ");
-		}
+		querrySelect.append(tmpVariable);
+		querrySelect.append(".object2Id ");
 		if ("sqlite".equals(ConfigBaseVariable.getDBType())) {
 			querrySelect.append(", ");
 		} else {
@@ -120,9 +120,11 @@ public class AddOnManyToMany implements DataAccessAddOn {
 		querrySelect.append("'");
 		if (objectClass == Long.class) {
 			querrySelect.append(SEPARATOR_LONG);
-		} else {
-			querrySelect.append(SEPARATOR_UUID);
-
+		} else if (objectClass == UUID.class) {} else {
+			final Class<?> foreignKeyType = AnnotationTools.getPrimaryKeyField(objectClass).getType();
+			if (foreignKeyType == Long.class) {
+				querrySelect.append(SEPARATOR_LONG);
+			}
 		}
 		querrySelect.append("') FROM ");
 		querrySelect.append(linkTableName);
@@ -208,9 +210,10 @@ public class AddOnManyToMany implements DataAccessAddOn {
 			return;
 		}
 		if (objectClass == decorators.targetEntity()) {
+			final Class<?> foreignKeyType = AnnotationTools.getPrimaryKeyField(objectClass).getType();
 			if (decorators.fetch() == FetchType.EAGER) {
 				throw new DataAccessException("EAGER is not supported for list of element...");
-			} else if (objectClass == Long.class) {
+			} else if (foreignKeyType == Long.class) {
 				final List<Long> idList = DataAccess.getListOfIds(rs, count.value, SEPARATOR_LONG);
 				// field.set(data, idList);
 				count.inc();
@@ -229,8 +232,8 @@ public class AddOnManyToMany implements DataAccessAddOn {
 					};
 					lazyCall.add(lambda);
 				}
-			} else if (objectClass == UUID.class) {
-				final List<UUID> idList = DataAccess.getListOfUUIDs(rs, count.value, SEPARATOR_UUID);
+			} else if (foreignKeyType == UUID.class) {
+				final List<UUID> idList = DataAccess.getListOfRawUUIDs(rs, count.value);
 				// field.set(data, idList);
 				count.inc();
 				if (idList != null && idList.size() > 0) {