Commit 462833f 1 parent ccb4714 commit 462833f Copy full SHA for 462833f
File tree 4 files changed +2
-32
lines changed
JeMPI_AsyncReceiver/src/main/java/org/jembi/jempi/async_receiver
JeMPI_LibShared/src/main/java/org/jembi/jempi/shared
devops/linux/docker/data-config
4 files changed +2
-32
lines changed Original file line number Diff line number Diff line change @@ -76,12 +76,7 @@ static AuxInteractionData auxInteractionData(final CSVRecord csvRecord) {
76
76
.stream ()
77
77
.map (f -> new AuxInteractionData .AuxInteractionUserField (f .scName (),
78
78
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 ())))
85
80
.toList ());
86
81
}
87
82
Original file line number Diff line number Diff line change @@ -198,7 +198,6 @@ private static String blockSelectQuery(
198
198
GoldenRecord.aux_date_created
199
199
GoldenRecord.aux_auto_update_enabled
200
200
GoldenRecord.aux_id
201
- GoldenRecord.aux_gid
202
201
""" .formatted (rule .vars ().getFirst (), rule .vars ().getFirst ())
203
202
+ jsonConfig .demographicFields ()
204
203
.stream ()
@@ -267,7 +266,6 @@ private static String blockSelectQuery(
267
266
GoldenRecord.aux_date_created
268
267
GoldenRecord.aux_auto_update_enabled
269
268
GoldenRecord.aux_id
270
- GoldenRecord.aux_gid
271
269
""" .formatted (postfixToInfix2 (filters , postfix ))
272
270
+ jsonConfig .demographicFields ()
273
271
.stream ()
@@ -300,7 +298,6 @@ private static String deterministicSelectQuery(
300
298
GoldenRecord.aux_date_created
301
299
GoldenRecord.aux_auto_update_enabled
302
300
GoldenRecord.aux_id
303
- GoldenRecord.aux_gid
304
301
""" .formatted (rule .vars ().getFirst (), rule .vars ().getFirst ())
305
302
+ jsonConfig .demographicFields ()
306
303
.stream ()
@@ -337,7 +334,6 @@ private static String deterministicSelectQuery(
337
334
GoldenRecord.aux_date_created
338
335
GoldenRecord.aux_auto_update_enabled
339
336
GoldenRecord.aux_id
340
- GoldenRecord.aux_gid
341
337
""" .formatted (postfixToInfix1 (rule .vars (), postfix ))
342
338
+ jsonConfig .demographicFields ()
343
339
.stream ()
Original file line number Diff line number Diff line change 5
5
import com .fasterxml .jackson .databind .JsonNode ;
6
6
import org .jembi .jempi .shared .config .DGraphConfig ;
7
7
import org .jembi .jempi .shared .config .FieldsConfig ;
8
- import org .jembi .jempi .shared .utils .AppUtils ;
9
8
10
9
import java .time .Instant ;
11
10
import java .time .LocalDateTime ;
@@ -38,9 +37,7 @@ public AuxGoldenRecordData(final AuxInteractionData auxInteractionData) {
38
37
.interactionField ()))
39
38
.toList ()
40
39
.getFirst ().value ()
41
- : auxGoldenRecordUserField .source ().generate () != null
42
- ? AppUtils .applyFunction (auxGoldenRecordUserField .source ().generate ().func ())
43
- : null ))
40
+ : null ))
44
41
.toList ());
45
42
}
46
43
Original file line number Diff line number Diff line change 17
17
"source" : {
18
18
"csvCol" : 10
19
19
}
20
- },
21
- {
22
- "fieldName" : " aux_iid" ,
23
- "fieldType" : " String" ,
24
- "source" : {
25
- "generate" : {
26
- "func" : " AppUtils::autoGenerateId"
27
- }
28
- }
29
20
}
30
21
],
31
22
"auxGoldenRecordFields" : [
44
35
"source" : {
45
36
"interactionField" : " aux_id"
46
37
}
47
- },
48
- {
49
- "fieldName" : " aux_gid" ,
50
- "fieldType" : " String" ,
51
- "source" : {
52
- "generate" : {
53
- "func" : " AppUtils::autoGenerateId"
54
- }
55
- }
56
38
}
57
39
],
58
40
"additionalNodes" : [
You can’t perform that action at this time.
0 commit comments