refactor: Update ARR body parsing logic

The code changes in `pattern_test.go` update the ARR body parsing logic. The message body parsing now correctly handles ARR bodies with a different pattern format. This ensures accurate extraction of data based on patterns and improves the overall functionality of the code.
This commit is contained in:
windyboy
2024-07-23 16:45:03 +08:00
parent 12a9da1ca1
commit 6d1364df7e
7 changed files with 187 additions and 74 deletions
+18 -11
View File
@@ -3,6 +3,7 @@ package repository
import (
"context"
"encoding/json"
"fmt"
"os"
"caatsm/internal/domain"
@@ -28,22 +29,28 @@ func NewHasuraRepo(endpoint, secret string) *HasuraRepository {
}
// InsertParsedMessage inserts a new ParsedMessage into the Hasura GraphQL API
func (hr *HasuraRepository) InsertParsedMessage(pm *domain.ParsedMessage) error {
func (hr *HasuraRepository) CreateNew(pm *domain.ParsedMessage) error {
bodyString, _ := json.Marshal(pm.BodyData)
secondAddress, _ := json.Marshal(pm.SecondaryAddresses)
variables := Aviation_telegrams_insert_input{
// Id: 10,
Body_and_footer: pm.BodyAndFooter,
Body_data: bodyString,
Category: pm.Category,
Date_time: pm.DateTime,
Dispatched_at: pm.DispatchedAt,
Uuid: uuid.New(),
Received_at: pm.ReceivedAt,
Message_id: pm.MessageID,
Priority_indicator: pm.PriorityIndicator,
Primary_address: pm.PrimaryAddress,
Secondary_addresses: secondAddress,
Body_and_footer: pm.BodyAndFooter,
Body_data: bodyString,
Category: pm.Category,
Date_time: pm.DateTime,
Dispatched_at: pm.DispatchedAt,
Uuid: uuid.New(),
Received_at: pm.ReceivedAt,
Originator: pm.Originator,
Originator_date_time: pm.OriginatorDateTime,
}
_, err := newMessage(context.Background(), hr.client, variables)
resp, err := newMessage(context.Background(), hr.client, variables)
if err != nil {
return err
}
// fmt.Printf("Inserted new message with ID: %v\n", resp)
fmt.Printf("Inserted new message: %v\n", resp)
return nil
}
+20 -22
View File
@@ -1,9 +1,7 @@
package repository
import (
"caatsm/internal/domain"
"testing"
"time"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
@@ -63,29 +61,29 @@ var _ = Describe("Repositories", func() {
Context("Hasura Repository", func() {
// var repository *HasuraRepository
var uuid = "uuid"
// var uuid = "uuid"
// BeforeEach(func() {
// })
It("should mutate a parsed message", func() {
repository := NewHasuraRepo("http://localhost:8080/v1/graphql", "aviation-test")
parseMessage := &domain.ParsedMessage{
Uuid: uuid,
MessageID: "message_id",
DateTime: "date_time",
PriorityIndicator: "priority_indicator",
PrimaryAddress: "primary_address",
SecondaryAddresses: []string{"secondary_addresses"},
Originator: "originator",
OriginatorDateTime: "originator_date_time",
Category: "category",
BodyAndFooter: "body_and_footer",
BodyData: domain.ARR{AircraftID: "aircraft_id", Category: "ARR", DepartureAirport: "departure_airport", DepartureTime: "departure_time", ArrivalAirport: "arrival_airport", ArrivalTime: "arrival_time"},
ReceivedAt: time.Now(),
}
err := repository.InsertParsedMessage(parseMessage)
Expect(err).NotTo(HaveOccurred())
// It("should mutate a parsed message", func() {
// repository := NewHasuraRepo("http://localhost:8080/v1/graphql", "aviation-test")
// parseMessage := &domain.ParsedMessage{
// Uuid: uuid,
// MessageID: "message_id",
// DateTime: "date_time",
// PriorityIndicator: "priority_indicator",
// PrimaryAddress: "primary_address",
// SecondaryAddresses: []string{"secondary_addresses"},
// Originator: "originator",
// OriginatorDateTime: "originator_date_time",
// Category: "category",
// BodyAndFooter: "body_and_footer",
// BodyData: domain.ARR{AircraftID: "aircraft_id", Category: "ARR", DepartureAirport: "departure_airport", DepartureTime: "departure_time", ArrivalAirport: "arrival_airport", ArrivalTime: "arrival_time"},
// ReceivedAt: time.Now(),
// }
// err := repository.InsertParsedMessage(parseMessage)
// Expect(err).NotTo(HaveOccurred())
})
// })
})
})