add more tests cases
This commit is contained in:
parent
60e3a804ac
commit
9ab669868d
3
service_a/assets/test_5.csv
Normal file
3
service_a/assets/test_5.csv
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
Fecha;Ciudad;Temperatura Máxima (C);Temperatura Mínima (C);Precipitación (mm);Nubosidad (%)
|
||||||
|
2025/10/12;Madrid;;6,25;0;10
|
||||||
|
|
||||||
|
3
service_a/assets/test_6.csv
Normal file
3
service_a/assets/test_6.csv
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
Fecha;Ciudad;Temperatura Máxima (C);Temperatura Mínima (C);Precipitación (mm);Nubosidad (%)
|
||||||
|
2025/10/12;;11,55;6,25;0;10
|
||||||
|
|
||||||
|
3
service_a/assets/test_7.csv
Normal file
3
service_a/assets/test_7.csv
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
Fecha;Ciudad;Temperatura Máxima (C);Temperatura Mínima (C);Precipitación (mm);Nubosidad (%)
|
||||||
|
;Madrid;11,55;6,25;0;10
|
||||||
|
|
||||||
|
@ -32,19 +32,14 @@ var (
|
|||||||
ErrCannotParseFile = errors.New("cannot parse file")
|
ErrCannotParseFile = errors.New("cannot parse file")
|
||||||
ErrValidateRecord = errors.New("error validating record")
|
ErrValidateRecord = errors.New("error validating record")
|
||||||
ErrRecordNotValid = errors.New("record not valid")
|
ErrRecordNotValid = errors.New("record not valid")
|
||||||
ErrInvalidDateFormat = errors.New("invalid date format")
|
|
||||||
ErrReadingCSVHeader = errors.New("error reading CSV header")
|
ErrReadingCSVHeader = errors.New("error reading CSV header")
|
||||||
ErrReadingCSVRow = errors.New("error reading CSV row")
|
ErrReadingCSVRow = errors.New("error reading CSV row")
|
||||||
ErrMissingDateField = errors.New("missing date field")
|
ErrMissingOrInvalidDateField = errors.New("missing or invalid date field")
|
||||||
ErrMissingCityField = errors.New("missing city field")
|
ErrMissingOrInvalidCityField = errors.New("missing or invalid city field")
|
||||||
ErrMissingMaxTempField = errors.New("missing max temp field")
|
ErrMissingOrInvalidMaxTemp = errors.New("missing or invalid max temp field")
|
||||||
ErrMissingMinTempField = errors.New("missing min temp field")
|
ErrMissingOrInvalidMinTemp = errors.New("missing or invalid min temp field")
|
||||||
ErrMissingRainfallField = errors.New("missing rainfall field")
|
ErrMissingOrInvalidRainfall = errors.New("missing or invalid rainfall field")
|
||||||
ErrMissingCloudinessField = errors.New("missing cloudiness field")
|
ErrMissingOrInvalidCloudiness = errors.New("missing or invalid cloudiness field")
|
||||||
ErrInvalidMaxTemp = errors.New("invalid max temp")
|
|
||||||
ErrInvalidMinTemp = errors.New("invalid min temp")
|
|
||||||
ErrInvalidRainfall = errors.New("invalid rainfall")
|
|
||||||
ErrInvalidCloudiness = errors.New("invalid cloudiness")
|
|
||||||
ErrMaxTempOutOfRange = errors.New("max temp out of range (must be <= 60°C)")
|
ErrMaxTempOutOfRange = errors.New("max temp out of range (must be <= 60°C)")
|
||||||
ErrMinTempOutOfRange = errors.New("min temp out of range (must be >= -20°C)")
|
ErrMinTempOutOfRange = errors.New("min temp out of range (must be >= -20°C)")
|
||||||
ErrRainfallOutOfRange = errors.New("rainfall out of range (must be 0-500 mm)")
|
ErrRainfallOutOfRange = errors.New("rainfall out of range (must be 0-500 mm)")
|
||||||
|
|||||||
@ -101,70 +101,67 @@ func (c *CSV) Parse(r io.Reader, fs *FileStats) ([]MeteoData, []RejectedMeteoDat
|
|||||||
func normalize(record H) (*MeteoData, error) {
|
func normalize(record H) (*MeteoData, error) {
|
||||||
meteoData := &MeteoData{}
|
meteoData := &MeteoData{}
|
||||||
|
|
||||||
if dateStr, ok := record["Fecha"].(string); ok {
|
var err error
|
||||||
t, err := time.Parse("2006/01/02", dateStr)
|
|
||||||
|
meteoData.Timestamp, err = parseDate(record, "Fecha", ErrMissingOrInvalidDateField)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("%w: %v", ErrInvalidDateFormat, err)
|
return nil, err
|
||||||
}
|
|
||||||
meteoData.Timestamp = t
|
|
||||||
} else {
|
|
||||||
return nil, ErrMissingDateField
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if location, ok := record["Ciudad"].(string); ok {
|
meteoData.Location, err = parseString(record, "Ciudad", ErrMissingOrInvalidCityField)
|
||||||
meteoData.Location = location
|
if err != nil {
|
||||||
} else {
|
return nil, err
|
||||||
return nil, ErrMissingCityField
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if maxTempStr, ok := record["Temperatura Máxima (C)"].(string); ok {
|
meteoData.MaxTemp, err = parseFloatField(record, "Temperatura Máxima (C)", ErrMissingOrInvalidMaxTemp)
|
||||||
maxTemp, err := parseFloat(maxTempStr)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("%w: %v", ErrInvalidMaxTemp, err)
|
return nil, err
|
||||||
}
|
|
||||||
meteoData.MaxTemp = maxTemp
|
|
||||||
} else {
|
|
||||||
return nil, ErrMissingMaxTempField
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if minTempStr, ok := record["Temperatura Mínima (C)"].(string); ok {
|
meteoData.MinTemp, err = parseFloatField(record, "Temperatura Mínima (C)", ErrMissingOrInvalidMinTemp)
|
||||||
minTemp, err := parseFloat(minTempStr)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("%w: %v", ErrInvalidMinTemp, err)
|
return nil, err
|
||||||
}
|
|
||||||
meteoData.MinTemp = minTemp
|
|
||||||
} else {
|
|
||||||
return nil, ErrMissingMinTempField
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if rainfallStr, ok := record["Precipitación (mm)"].(string); ok {
|
meteoData.Rainfall, err = parseFloatField(record, "Precipitación (mm)", ErrMissingOrInvalidRainfall)
|
||||||
rainfall, err := parseFloat(rainfallStr)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("%w: %v", ErrInvalidRainfall, err)
|
return nil, err
|
||||||
}
|
|
||||||
meteoData.Rainfall = rainfall
|
|
||||||
} else {
|
|
||||||
return nil, ErrMissingRainfallField
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if cloudinessStr, ok := record["Nubosidad (%)"].(string); ok {
|
meteoData.Cloudiness, err = parseFloatField(record, "Nubosidad (%)", ErrMissingOrInvalidCloudiness)
|
||||||
cloudiness, err := parseFloat(cloudinessStr)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("%w: %v", ErrInvalidCloudiness, err)
|
return nil, err
|
||||||
}
|
|
||||||
meteoData.Cloudiness = cloudiness
|
|
||||||
} else {
|
|
||||||
return nil, ErrMissingCloudinessField
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return meteoData, nil
|
return meteoData, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func parseFloat(s string) (float32, error) {
|
func parseDate(record H, key string, errMissing error) (time.Time, error) {
|
||||||
s = strings.Replace(s, ",", ".", 1)
|
if str, ok := record[key].(string); ok && str != "" {
|
||||||
f, err := strconv.ParseFloat(s, 32)
|
t, err := time.Parse("2006/01/02", str)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return 0, err
|
return time.Time{}, errMissing
|
||||||
|
}
|
||||||
|
return t, nil
|
||||||
|
}
|
||||||
|
return time.Time{}, errMissing
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseString(record H, key string, errMissing error) (string, error) {
|
||||||
|
if str, ok := record[key].(string); ok && str != "" {
|
||||||
|
return str, nil
|
||||||
|
}
|
||||||
|
return "", errMissing
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseFloatField(record H, key string, errMissing error) (float32, error) {
|
||||||
|
if str, ok := record[key].(string); ok && str != "" {
|
||||||
|
str = strings.Replace(str, ",", ".", 1)
|
||||||
|
f, err := strconv.ParseFloat(str, 32)
|
||||||
|
if err != nil {
|
||||||
|
return 0, errMissing
|
||||||
}
|
}
|
||||||
return float32(f), nil
|
return float32(f), nil
|
||||||
}
|
}
|
||||||
|
return 0, errMissing
|
||||||
|
}
|
||||||
|
|||||||
@ -44,7 +44,6 @@ func Test_CSV_ParseFile(t *testing.T) {
|
|||||||
expectedRejected: 0,
|
expectedRejected: 0,
|
||||||
validateInserted: func(t *testing.T, inserted []meteo.MeteoData) {
|
validateInserted: func(t *testing.T, inserted []meteo.MeteoData) {
|
||||||
assert.Equal(t, 1, len(inserted))
|
assert.Equal(t, 1, len(inserted))
|
||||||
// TrimLeadingSpace should handle the spaces before Madrid
|
|
||||||
assert.Equal(t, "Madrid", inserted[0].Location)
|
assert.Equal(t, "Madrid", inserted[0].Location)
|
||||||
},
|
},
|
||||||
validateRejected: func(t *testing.T, rejected []meteo.RejectedMeteoData) {
|
validateRejected: func(t *testing.T, rejected []meteo.RejectedMeteoData) {
|
||||||
@ -61,7 +60,7 @@ func Test_CSV_ParseFile(t *testing.T) {
|
|||||||
},
|
},
|
||||||
validateRejected: func(t *testing.T, rejected []meteo.RejectedMeteoData) {
|
validateRejected: func(t *testing.T, rejected []meteo.RejectedMeteoData) {
|
||||||
assert.Equal(t, 1, len(rejected))
|
assert.Equal(t, 1, len(rejected))
|
||||||
assert.Contains(t, rejected[0].Reason, "missing city field")
|
assert.Contains(t, rejected[0].Reason, "missing or invalid city field")
|
||||||
assert.Equal(t, "2025/10/12;11,55;6,25;0;10", rejected[0].RowValue)
|
assert.Equal(t, "2025/10/12;11,55;6,25;0;10", rejected[0].RowValue)
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -77,6 +76,48 @@ func Test_CSV_ParseFile(t *testing.T) {
|
|||||||
assert.Empty(t, rejected)
|
assert.Empty(t, rejected)
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: "missing max temp field value",
|
||||||
|
filePath: "./../../../assets/test_5.csv",
|
||||||
|
expectedInserted: 0,
|
||||||
|
expectedRejected: 1,
|
||||||
|
validateInserted: func(t *testing.T, inserted []meteo.MeteoData) {
|
||||||
|
assert.Empty(t, inserted)
|
||||||
|
},
|
||||||
|
validateRejected: func(t *testing.T, rejected []meteo.RejectedMeteoData) {
|
||||||
|
assert.Equal(t, 1, len(rejected))
|
||||||
|
assert.Contains(t, rejected[0].Reason, "missing or invalid max temp field")
|
||||||
|
assert.Equal(t, "2025/10/12;Madrid;;6,25;0;10", rejected[0].RowValue)
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "missing city field value",
|
||||||
|
filePath: "./../../../assets/test_6.csv",
|
||||||
|
expectedInserted: 0,
|
||||||
|
expectedRejected: 1,
|
||||||
|
validateInserted: func(t *testing.T, inserted []meteo.MeteoData) {
|
||||||
|
assert.Empty(t, inserted)
|
||||||
|
},
|
||||||
|
validateRejected: func(t *testing.T, rejected []meteo.RejectedMeteoData) {
|
||||||
|
assert.Equal(t, 1, len(rejected))
|
||||||
|
assert.Contains(t, rejected[0].Reason, "missing or invalid city field")
|
||||||
|
assert.Equal(t, "2025/10/12;;11,55;6,25;0;10", rejected[0].RowValue)
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "missing date field value",
|
||||||
|
filePath: "./../../../assets/test_7.csv",
|
||||||
|
expectedInserted: 0,
|
||||||
|
expectedRejected: 1,
|
||||||
|
validateInserted: func(t *testing.T, inserted []meteo.MeteoData) {
|
||||||
|
assert.Empty(t, inserted)
|
||||||
|
},
|
||||||
|
validateRejected: func(t *testing.T, rejected []meteo.RejectedMeteoData) {
|
||||||
|
assert.Equal(t, 1, len(rejected))
|
||||||
|
assert.Contains(t, rejected[0].Reason, "missing or invalid date field")
|
||||||
|
assert.Equal(t, ";Madrid;11,55;6,25;0;10", rejected[0].RowValue)
|
||||||
|
},
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tt := range tests {
|
for _, tt := range tests {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user