kangaroo-and-rabbit/archidata
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

[FEAT] rename parameter to be clear

Browse Source
This commit is contained in:
Edouard DUPIN 2025-03-30 16:59:34 +02:00
parent 288e1f8293
commit a5b9b60294
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/org/kar/archidata/dataAccess/addOnSQL/AddOnDataJson.java
View File

@ -219,57 +219,57 @@ public class AddOnDataJson implements DataAccessAddOn {
public static void addLink( public static void addLink(
final DBAccess ioDb, final DBAccess ioDb,
final Class<?> clazz, final Class<?> clazz,
final String columnId, final String clazzPrimaryKeyName,
final Object id, final Object clazzPrimaryKeyValue,
final String columnList, final String fieldNameToUpdate,
final Object remoteKey) throws Exception { final Object valueToAdd) throws Exception {
final String tableName = AnnotationTools.getTableName(clazz); final String tableName = AnnotationTools.getTableName(clazz);
final QueryOptions options = new QueryOptions(new OverrideTableName(tableName), final QueryOptions options = new QueryOptions(new OverrideTableName(tableName),
new OptionSpecifyType("id", id.getClass()), new OptionSpecifyType("id", clazzPrimaryKeyValue.getClass()),
new OptionSpecifyType("covers", remoteKey.getClass(), true)); new OptionSpecifyType("covers", valueToAdd.getClass(), true));
if (columnId != null && !columnId.equals("id")) { if (clazzPrimaryKeyName != null && !clazzPrimaryKeyName.equals("id")) {
options.add(new OptionRenameColumn("id", columnId)); options.add(new OptionRenameColumn("id", clazzPrimaryKeyName));
} }
if (columnList != null && !columnList.equals("covers")) { if (fieldNameToUpdate != null && !fieldNameToUpdate.equals("covers")) {
options.add(new OptionRenameColumn("covers", columnList)); options.add(new OptionRenameColumn("covers", fieldNameToUpdate));
} }
final TableCoversGeneric data = ioDb.get(TableCoversGeneric.class, id, options.getAllArray()); final TableCoversGeneric data = ioDb.get(TableCoversGeneric.class, clazzPrimaryKeyValue, options.getAllArray());
if (data.covers == null) { if (data.covers == null) {
data.covers = new ArrayList<>(); data.covers = new ArrayList<>();
} }
for (final Object elem : data.covers) { for (final Object elem : data.covers) {
if (elem.equals(remoteKey)) { if (elem.equals(valueToAdd)) {
return; return;
} }
} }
data.covers.add(remoteKey); data.covers.add(valueToAdd);
ioDb.update(data, data.id, List.of("covers"), options.getAllArray()); ioDb.update(data, data.id, List.of("covers"), options.getAllArray());
} }
public static void removeLink( public static void removeLink(
final DBAccess ioDb, final DBAccess ioDb,
final Class<?> clazz, final Class<?> clazz,
final String columnId, final String clazzPrimaryKeyName,
final Object id, final Object clazzPrimaryKeyValue,
final String columnList, final String fieldNameToUpdate,
final Object remoteKey) throws Exception { final Object valueToRemove) throws Exception {
final String tableName = AnnotationTools.getTableName(clazz); final String tableName = AnnotationTools.getTableName(clazz);
final QueryOptions options = new QueryOptions(new OverrideTableName(tableName), final QueryOptions options = new QueryOptions(new OverrideTableName(tableName),
new OptionSpecifyType("id", id.getClass()), new OptionSpecifyType("id", clazzPrimaryKeyValue.getClass()),
new OptionSpecifyType("covers", remoteKey.getClass(), true)); new OptionSpecifyType("covers", valueToRemove.getClass(), true));
if (columnId != null && !columnId.equals("id")) { if (clazzPrimaryKeyName != null && !clazzPrimaryKeyName.equals("id")) {
options.add(new OptionRenameColumn("id", columnId)); options.add(new OptionRenameColumn("id", clazzPrimaryKeyName));
} }
if (columnList != null && !columnList.equals("covers")) { if (fieldNameToUpdate != null && !fieldNameToUpdate.equals("covers")) {
options.add(new OptionRenameColumn("covers", columnList)); options.add(new OptionRenameColumn("covers", fieldNameToUpdate));
} }
final TableCoversGeneric data = ioDb.get(TableCoversGeneric.class, id, options.getAllArray()); final TableCoversGeneric data = ioDb.get(TableCoversGeneric.class, clazzPrimaryKeyValue, options.getAllArray());
if (data.covers == null) { if (data.covers == null) {
return; return;
} }
final List<Object> newList = new ArrayList<>(); final List<Object> newList = new ArrayList<>();
for (final Object elem : data.covers) { for (final Object elem : data.covers) {
if (elem.equals(remoteKey)) { if (elem.equals(valueToRemove)) {
continue; continue;
} }
newList.add(elem); newList.add(elem);