Skip to content

Commit 462833f

Browse files
committed
CU-86bzmec77 - Remove AuxIID AuxGID
1 parent ccb4714 commit 462833f

File tree

4 files changed

+2
-32
lines changed

4 files changed

+2
-32
lines changed

JeMPI_Apps/JeMPI_AsyncReceiver/src/main/java/org/jembi/jempi/async_receiver/Main.java

+1-6
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,7 @@ static AuxInteractionData auxInteractionData(final CSVRecord csvRecord) {
7676
.stream()
7777
.map(f -> new AuxInteractionData.AuxInteractionUserField(f.scName(),
7878
f.ccName(),
79-
f.source().csvCol() != null
80-
?
81-
csvRecord.get(f.source().csvCol())
82-
:
83-
AppUtils.applyFunction(f.source().generate().func())
84-
))
79+
csvRecord.get(f.source().csvCol())))
8580
.toList());
8681
}
8782

JeMPI_Apps/JeMPI_LibShared/src/main/java/org/jembi/jempi/shared/config/linker/Programs.java

-4
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,6 @@ private static String blockSelectQuery(
198198
GoldenRecord.aux_date_created
199199
GoldenRecord.aux_auto_update_enabled
200200
GoldenRecord.aux_id
201-
GoldenRecord.aux_gid
202201
""".formatted(rule.vars().getFirst(), rule.vars().getFirst())
203202
+ jsonConfig.demographicFields()
204203
.stream()
@@ -267,7 +266,6 @@ private static String blockSelectQuery(
267266
GoldenRecord.aux_date_created
268267
GoldenRecord.aux_auto_update_enabled
269268
GoldenRecord.aux_id
270-
GoldenRecord.aux_gid
271269
""".formatted(postfixToInfix2(filters, postfix))
272270
+ jsonConfig.demographicFields()
273271
.stream()
@@ -300,7 +298,6 @@ private static String deterministicSelectQuery(
300298
GoldenRecord.aux_date_created
301299
GoldenRecord.aux_auto_update_enabled
302300
GoldenRecord.aux_id
303-
GoldenRecord.aux_gid
304301
""".formatted(rule.vars().getFirst(), rule.vars().getFirst())
305302
+ jsonConfig.demographicFields()
306303
.stream()
@@ -337,7 +334,6 @@ private static String deterministicSelectQuery(
337334
GoldenRecord.aux_date_created
338335
GoldenRecord.aux_auto_update_enabled
339336
GoldenRecord.aux_id
340-
GoldenRecord.aux_gid
341337
""".formatted(postfixToInfix1(rule.vars(), postfix))
342338
+ jsonConfig.demographicFields()
343339
.stream()

JeMPI_Apps/JeMPI_LibShared/src/main/java/org/jembi/jempi/shared/models/AuxGoldenRecordData.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import com.fasterxml.jackson.databind.JsonNode;
66
import org.jembi.jempi.shared.config.DGraphConfig;
77
import org.jembi.jempi.shared.config.FieldsConfig;
8-
import org.jembi.jempi.shared.utils.AppUtils;
98

109
import java.time.Instant;
1110
import java.time.LocalDateTime;
@@ -38,9 +37,7 @@ public AuxGoldenRecordData(final AuxInteractionData auxInteractionData) {
3837
.interactionField()))
3938
.toList()
4039
.getFirst().value()
41-
: auxGoldenRecordUserField.source().generate() != null
42-
? AppUtils.applyFunction(auxGoldenRecordUserField.source().generate().func())
43-
: null))
40+
: null))
4441
.toList());
4542
}
4643

devops/linux/docker/data-config/config-reference-link-dp.json

-18
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,6 @@
1717
"source": {
1818
"csvCol": 10
1919
}
20-
},
21-
{
22-
"fieldName": "aux_iid",
23-
"fieldType": "String",
24-
"source": {
25-
"generate": {
26-
"func": "AppUtils::autoGenerateId"
27-
}
28-
}
2920
}
3021
],
3122
"auxGoldenRecordFields": [
@@ -44,15 +35,6 @@
4435
"source": {
4536
"interactionField": "aux_id"
4637
}
47-
},
48-
{
49-
"fieldName": "aux_gid",
50-
"fieldType": "String",
51-
"source": {
52-
"generate": {
53-
"func": "AppUtils::autoGenerateId"
54-
}
55-
}
5638
}
5739
],
5840
"additionalNodes": [

0 commit comments

Comments
 (0)