Skip to content

Commit dbc7cca

Browse files
committed
fix enum logic
1 parent 43ffaef commit dbc7cca

3 files changed

Lines changed: 8 additions & 6 deletions

File tree

backend/cmd/JSON_ADE

backend/internal/pod_data/measurement.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,16 @@ func getEnumMeasurement(adeMeas adj.Measurement) EnumMeasurement {
8787
Id: adeMeas.Id,
8888
Name: adeMeas.Name,
8989
Type: EnumType,
90-
Options: getEnumMembers(adeMeas.EnumValues),
90+
Options: getEnumMembers(adeMeas.Type),
9191
}
9292
}
9393

94-
func getEnumMembers(enumExp []string) []string {
95-
return enumExp
94+
func getEnumMembers(enumExp string) []string {
95+
trimmedEnumExp := strings.Replace(enumExp, " ", "", -1)
96+
firstParenthesisIndex := strings.Index(trimmedEnumExp, "(")
97+
lastParenthesisIndex := strings.LastIndex(trimmedEnumExp, ")")
98+
99+
return strings.Split(trimmedEnumExp[firstParenthesisIndex+1:lastParenthesisIndex], ",")
96100
}
97101

98102
func getBooleanMeasurement(adeMeas adj.Measurement) BooleanMeasurement {

backend/internal/pod_data/pod_data.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ func getBoard(adjBoard adj.Board, globalUnits map[string]utils.Operations) (Boar
3838

3939
packets := make([]Packet, 0)
4040

41-
// TESTING
42-
4341
for _, adjPacket := range adjBoard.Packets {
4442
packet, err := getPacket(adjPacket) // Black magic fuck
4543
if err != nil {

0 commit comments

Comments
 (0)