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

✨ Update agent guidelines and improve documentation structure. Refactor AGENTS.md to streamline commands and code style guidelines, enhancing clarity and usability. Update README.md with refined NATS consumer configuration details and observability metrics. Modify .gitignore to exclude dynamically generated Prometheus target files. Enhance configuration files for development and production environments, ensuring consistency and clarity in settings.

Browse Source
This commit is contained in:
windyboy
2025-11-19 13:07:09 +08:00
parent 06fc9cb9e0
commit c687fdcde8
39 changed files with 1112 additions and 3193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/adapter/parser/aviation.go
+34 -42
View File
@@ -1,8 +1,8 @@
package parser
import (
"caatsm/internal/domain"
"caatsm/internal/adapter/dto"
"caatsm/internal/domain"
"errors"
"fmt"
"regexp"
@@ -24,7 +24,6 @@ const (
OtherInfo = "other"
ReferenceData = "reference_data"
Aircraft = "aircraft"
CategorySurveillance = "surve"
Indicator = "indicator"
Other = "other"
@@ -75,7 +74,11 @@ func NewBodyParser(body string) *BodyParser {
func (parser *BodyParser) GetBodyPatterns() map[string]BodyConfig {
parser.mu.Lock()
defer parser.mu.Unlock()
return parser.bodyPatterns
copied := make(map[string]BodyConfig, len(parser.bodyPatterns))
for k, v := range parser.bodyPatterns {
copied[k] = v
}
return copied
}
func (parser *BodyParser) SetBodyPatterns(patterns map[string]BodyConfig) {
@@ -200,6 +203,23 @@ func (parser *BodyParser) createBodyData(data map[string]string) (string, interf
}
}
func headerToParsedTelegram(header Header) dto.ParsedTelegram {
return dto.ParsedTelegram{
MessageID: header.MessageID,
DateTime: header.DateTime,
PriorityIndicator: header.PriorityIndicator,
PrimaryAddress: header.PrimaryAddress,
SecondaryAddresses: header.SecondaryAddresses,
Originator: header.Originator,
OriginatorDateTime: header.OriginatorDateTime,
Category: header.Category,
Body: header.Body,
Content: header.Content,
ReceivedAt: header.ReceivedAt,
ParsedAt: header.ParsedAt,
}
}
func Parse(rawText string) (*dto.ParsedTelegram, error) {
header, err := ParseHeader(rawText)
if err != nil {
@@ -217,48 +237,20 @@ func Parse(rawText string) (*dto.ParsedTelegram, error) {
header.ParsedAt = time.Now()
if bodyErr != nil {
return &dto.ParsedTelegram{
MessageID: header.MessageID,
DateTime: header.DateTime,
PriorityIndicator: header.PriorityIndicator,
PrimaryAddress: header.PrimaryAddress,
SecondaryAddresses: header.SecondaryAddresses,
Originator: header.Originator,
OriginatorDateTime: header.OriginatorDateTime,
Category: header.Category,
Body: header.Body,
Content: header.Content,
ReceivedAt: header.ReceivedAt,
ParsedAt: header.ParsedAt,
Parsed: false,
Comments: bodyErr.Error(),
Status: dto.MessageStatusBodyError,
ErrorReason: bodyErr.Error(),
}, fmt.Errorf("%w: %w", ErrBodyParse, bodyErr)
}
parsed := &dto.ParsedTelegram{
MessageID: header.MessageID,
DateTime: header.DateTime,
PriorityIndicator: header.PriorityIndicator,
PrimaryAddress: header.PrimaryAddress,
SecondaryAddresses: header.SecondaryAddresses,
Originator: header.Originator,
OriginatorDateTime: header.OriginatorDateTime,
Category: header.Category,
Body: header.Body,
Content: header.Content,
BodyData: bodyData,
ReceivedAt: header.ReceivedAt,
ParsedAt: header.ParsedAt,
Parsed: true,
Status: dto.MessageStatusParsed,
ErrorReason: "",
parsed := headerToParsedTelegram(header)
parsed.Parsed = false
parsed.Comments = bodyErr.Error()
parsed.Status = dto.MessageStatusBodyError
parsed.ErrorReason = bodyErr.Error()
return &parsed, fmt.Errorf("%w: %w", ErrBodyParse, bodyErr)
}
parsed := headerToParsedTelegram(header)
parsed.BodyData = bodyData
parsed.Parsed = true
parsed.Status = dto.MessageStatusParsed
parsed.Uuid = uuid.New().String()
return parsed, nil
return &parsed, nil
}
func cleanMessage(text string) string {
internal/adapter/parser/schedule.go
+10 -2
View File
@@ -30,8 +30,9 @@ func ExtractWaypoint(message string) *domain.WayPoint {
}
func FindDef(code string) *LineParser {
// fmt.Printf("Finding definition for %s\n", code)
// fmt.Println("ParserDef: ", parserDef)
if parserDef == nil {
return nil
}
for _, def := range *parserDef {
for _, airline := range def.Airlines {
if airline == code {
@@ -70,6 +71,9 @@ func ParseWithDef(line string, parserDef *LineParser) *domain.ScheduleLine {
}
for i, field := range parserDef.Fields {
if i >= len(words) {
break
}
// log.Debugf("Parsing field %v -> %s", i, field)
data := extract(words[i], parserMap[field])
if data != nil {
@@ -225,6 +229,10 @@ func getFlightNumbers(data string) []string {
flightNumbers := append([]string{}, baseNumber)
for _, number := range data[1:] {
length := len(number)
if length >= baseLength {
zap.S().Warnf("Flight number suffix '%s' is not shorter than base '%s'; skipping", number, baseNumber)
continue
}
flightNumber := baseNumber[:baseLength-length] + number
flightNumbers = append(flightNumbers, flightNumber)
}
internal/adapter/parser/schedule_parser_test.go
-19
View File
@@ -527,25 +527,6 @@ var _ = Describe("Parse Line with PreDef", func() {
Expect(schedule.Waypoints[1].DepartureTime).To(Equal("0535"))
Expect(schedule.Waypoints[2].Airport).To(Equal("CAN"))
})
It("83. CZ3301/2 B2823 B752 CAN0135 TSN0535 CAN", func() {
lineText := "83. CZ3301/2 B2823 B752 CAN0135 TSN0535 CAN"
def := FindDef("CZ")
Expect(def).NotTo(BeNil())
schedule := ParseWithDef(lineText, def)
Expect(schedule).NotTo(BeNil())
Expect(schedule.Index).To(Equal("83."))
Expect(len(schedule.FlightNumber)).To(Equal(2))
Expect(schedule.FlightNumber).To(ContainElement("CZ3301"))
Expect(schedule.FlightNumber).To(ContainElement("CZ3302"))
Expect(schedule.AircraftReg).To(Equal("B2823"))
Expect(len(schedule.Waypoints)).To(Equal(3))
Expect(schedule.Waypoints[0].Airport).To(Equal("CAN"))
Expect(schedule.Waypoints[0].DepartureTime).To(Equal("0135"))
Expect(schedule.Waypoints[1].Airport).To(Equal("TSN"))
Expect(schedule.Waypoints[1].DepartureTime).To(Equal("0535"))
Expect(schedule.Waypoints[2].Airport).To(Equal("CAN"))
})
})
Context("HO", func() {