Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue 68 - 270/271 5010 support #73

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Issue 68 - 270/271 5010 support #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0eaa7d6
# Added 270 & 271 mapping XML
anupchaudhari Jun 24, 2024
920576c
# Added 270 & 271 mapping file support
anupchaudhari Jun 24, 2024
9ab5111
# Removed tab character
anupchaudhari Jun 24, 2024
687fb84
# Removed tab characters
anupchaudhari Jun 24, 2024
8ad260d
Merge branch 'master' into issue_68_270_271_5010_support
anupchaudhari Sep 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/main/java/com/imsweb/x12/reader/X12Reader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ public class X12Reader {
private static final String _X214_ANSI_VERSION = "005010X214";
private static final String _X270_271_092_ANSI_VERSION = "004010X092A1";
private static final String _X212_ANSI_VERSION = "005010X212";
private static final String _X270_271_279_ANSI_VERSION = "005010X279A1";
private static final String _X220_ANSI_VERSION = "005010X220A1";
private static final EnumMap<FileType, String> _TYPES = new EnumMap<>(FileType.class);

Expand Down Expand Up @@ -81,6 +82,8 @@ public enum FileType {
ANSI277_5010_X214("mapping/277.5010.X214.xml"),
ANSI270_4010_X092("mapping/270.4010.X092.A1.xml"),
ANSI271_4010_X092("mapping/271.4010.X092.A1.xml"),
ANSI270_5010_X279("mapping/270.5010.X279.A1.xml"),
ANSI271_5010_X279("mapping/271.5010.X279.A1.xml"),
ANSI277_5010_X212("mapping/277.5010.X212.xml");

private final String _mapping;
Expand Down Expand Up @@ -123,6 +126,8 @@ public synchronized TransactionDefinition getDefinition() {
_TYPES.put(FileType.ANSI837_5010_X231, _X231_ANSI_VERSION);
_TYPES.put(FileType.ANSI270_4010_X092, _X270_271_092_ANSI_VERSION);
_TYPES.put(FileType.ANSI271_4010_X092, _X270_271_092_ANSI_VERSION);
_TYPES.put(FileType.ANSI270_5010_X279, _X270_271_279_ANSI_VERSION);
_TYPES.put(FileType.ANSI271_5010_X279, _X270_271_279_ANSI_VERSION);
_TYPES.put(FileType.ANSI277_5010_X212, _X212_ANSI_VERSION);
}

Expand Down Expand Up @@ -774,6 +779,13 @@ private LoopConfig getFinalizedMatch(String previousLoopId, List<LoopConfig> mat
if (parentLoop != null)
result = matchedLoops.stream().filter(matchedLoop -> parentLoop.equals(getParentLoop(matchedLoop.getLoopId(), null))).findFirst().orElse(null);
}

// otherwise, if one of the ambiguous loops is the parent of the previous loop then we should use that loop
if (result == null) {
String parentLoop = getParentLoop(previousLoopId, null);
if (parentLoop != null)
result = matchedLoops.stream().filter(matchedLoop -> parentLoop.equals(matchedLoop.getLoopId())).findFirst().orElse(null);
}
break;
}
}
Expand Down
Loading