windy/go-caatsm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: Update ARR body parsing logic

Browse Source 
The code changes in `aviation_parser_test.go` update the ARR body parsing logic. The `ParseHeader` function now correctly handles ARR bodies with optional time components. This ensures accurate parsing of ARR bodies and improves the overall functionality of the aviation parser.
This commit is contained in:
windyboy
2024-07-22 12:42:30 +08:00
parent c72b6e2163
commit 0391f9f481
11 changed files with 306 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/parsers/aviation_parser.go
+18 -14
View File
@@ -3,7 +3,6 @@ package parsers
import (
"caatsm/internal/config"
"caatsm/internal/domain"
"caatsm/pkg/utils"
"fmt"
"regexp"
"strings"
@@ -17,9 +16,9 @@ const (
)
var (
categoryRegex = regexp.MustCompile(`\(([A-Z]{3})(.*)\)`)
categoryRegex = regexp.MustCompile(`\((?P<category>[A-Z]+)-`)
emptyLineRemove = regexp.MustCompile(`(?m)^\s*$`)
bodyOnly = regexp.MustCompile(`^(ZCZC(.|\n)*)NNNN$`)
bodyOnly = regexp.MustCompile(`(.|\n)?((ZCZC(.|\n)*))NNNN$`)
)
type BodyParser struct {
@@ -43,30 +42,30 @@ func (bp *BodyParser) SetBodyPatterns(patterns map[string]config.BodyConfig) {
// Parse attempts to parse the body text using the configured patterns.
func (bp *BodyParser) Parse(body string) (interface{}, error) {
log := utils.Logger
// log := utils.Logger
body = strings.TrimSpace(body)
log.Info("Parsing body text", body)
// log.Info("Parsing body text", body)
category := findCategory(body)
if category == "" {
log.Error("No category found in body text")
// log.Error("No category found in body text")
return nil, fmt.Errorf("no category found in body text")
}
patters := bp.GetBodyPatterns()
log.Infof("body config [%s] %v\n", category, patters[category])
// log.Infof("body config [%s] %v\n", category, patters[category])
if patterConfig := patters[category]; patterConfig.Patterns != nil {
for _, p := range patterConfig.Patterns {
log.Infof("Trying pattern %s\n%s\n", p.Comments, p.Pattern)
// log.Infof("Trying pattern %s\n%s\n", p.Comments, p.Pattern)
re := p.Expression
match := re.FindStringSubmatch(body)
log.Info("Match: ", match)
// log.Info("Match: ", match)
if match != nil {
log.Infof("Matched: %v\n", match)
// log.Infof("Matched: %v\n", match)
data := extractData(match, re)
return createBodyData(data)
}
log.Infof("No match for pattern %s\n", p.Comments)
// log.Infof("No match for pattern %s\n", p.Comments)
}
}
@@ -75,9 +74,14 @@ func (bp *BodyParser) Parse(body string) (interface{}, error) {
func findCategory(body string) string {
match := categoryRegex.FindStringSubmatch(body)
utils.Logger.Infof("Match: %v\n", match)
// utils.Logger.Infof("Match: %v\n", match)
if match != nil {
return match[1]
groups := categoryRegex.SubexpNames()
for i, name := range groups {
if i != 0 && name == "category" {
return match[i]
}
}
}
return ""
}
@@ -168,7 +172,7 @@ func clean(text string) string {
if bodyOnly != nil {
match := bodyOnly.FindStringSubmatch(cleanText)
if len(match) > 1 {
bodyOnly := match[1]
bodyOnly := match[2]
if bodyOnly[len(bodyOnly)-1] == '\n' {
return bodyOnly[:len(bodyOnly)-1]
}
internal/parsers/aviation_parser_test.go
+7 -45
View File
@@ -109,44 +109,6 @@ NNNN`
})
Context("with NOTAM message", func() {
It("should parse the header correctly", func() {
message := `
ZCZC NOTAM1234 230715
GG EDDNZEZN
.
GG EDDNYNYX
.BERLINTWR 230714
Q) EDMM/QOATT/IV/BO/A/000/999/4814N01120E005
A) EDDM
B) 2307150600 C) 2307151800
E) AERODROME CONTROL TOWER HOURS OF SERVICE
0600-1800 DUE TO MAINTENANCE
NNNN
`
parsedMessage, err := ParseHeader(message)
Expect(err).ToNot(HaveOccurred())
Expect(parsedMessage.StartIndicator).To(Equal("ZCZC"))
Expect(parsedMessage.MessageID).To(Equal("NOTAM1234"))
Expect(parsedMessage.DateTime).To(Equal("230715"))
Expect(parsedMessage.PriorityIndicator).To(Equal("GG"))
Expect(parsedMessage.PrimaryAddress).To(Equal("EDDNZEZN"))
Expect(parsedMessage.SecondaryAddresses).To(Equal([]string{"GG EDDNYNYX"}))
Expect(parsedMessage.Originator).To(Equal("BERLINTWR"))
Expect(parsedMessage.OriginatorDateTime).To(Equal("230714"))
// fmt.Print(parsedMessage.BodyAndFooter)
Expect(parsedMessage.BodyAndFooter).To(Equal(`
Q) EDMM/QOATT/IV/BO/A/000/999/4814N01120E005
A) EDDM
B) 2307150600 C) 2307151800
E) AERODROME CONTROL TOWER HOURS OF SERVICE
0600-1800 DUE TO MAINTENANCE
NNNN
`))
})
})
Describe("ParseBody", func() {
Context("with ARR body (ARR-CES5470-ZBTJ-ZSHC1614)", func() {
@@ -187,19 +149,19 @@ NNNN
Context("with DEP body", func() {
parser := NewBodyParser()
It("should parse the body (DEP-AB123-SSR1234-KJFK-1500-KLAX) correctly", func() {
body := "(DEP-AB123-SSR1234-KJFK-1500-KLAX)"
It("should parse the body (DEP-CYZ9017/A5633-ZBTJ1638-ZSPD) correctly", func() {
body := "(DEP-CYZ9017/A5633-ZBTJ1638-ZSPD)"
parsedBody, err := parser.Parse(body)
Expect(err).ToNot(HaveOccurred())
Expect(parsedBody).ToNot(BeNil())
Expect(parsedBody).To(BeAssignableToTypeOf(&domain.DEP{}))
depMessage := parsedBody.(*domain.DEP)
Expect(depMessage.Category).To(Equal("DEP"))
Expect(depMessage.AircraftID).To(Equal("AB123"))
Expect(depMessage.SSRModeAndCode).To(Equal("SSR1234"))
Expect(depMessage.DepartureAirport).To(Equal("KJFK"))
Expect(depMessage.DepartureTime).To(Equal("1500"))
Expect(depMessage.Destination).To(Equal("KLAX"))
Expect(depMessage.AircraftID).To(Equal("CYZ9017"))
Expect(depMessage.SSRModeAndCode).To(Equal("A5633"))
Expect(depMessage.DepartureAirport).To(Equal("ZBTJ"))
Expect(depMessage.DepartureTime).To(Equal("1638"))
Expect(depMessage.Destination).To(Equal("ZSPD"))
})
})