Skip to content

Commit

Permalink
Merge pull request #29 from state303/dev/core
Browse files Browse the repository at this point in the history
fix: release item not to contain an empty str field
  • Loading branch information
state303 authored Feb 10, 2024
2 parents fc158db + 72cbcfb commit 8f91201
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 2 deletions.
29 changes: 29 additions & 0 deletions src/batch/release_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,32 @@ func TestReleaseRelationRead(t *testing.T) {
}
require.Len(t, s, 3)
}

func TestReleaseRelationStrTim(t *testing.T) {
emptyStr := " "
rel := XmlReleaseRelation{
ID: 0,
Title: &emptyStr,
Country: &emptyStr,
DataQuality: &emptyStr,
ListedReleaseDate: nil,
Notes: &emptyStr,
MasterInfo: XmlReleaseMasterInfo{},
Status: nil,
Artists: nil,
Labels: nil,
CreditedArtists: nil,
Formats: nil,
Genres: []string{" ", ""},
Styles: []string{" ", ""},
}

require.Len(t, rel.GetGenres(), 0, "release must return empty genres slice")
require.Len(t, rel.GetStyles(), 0, "release must return empty styles slice")

releaseObj := rel.GetRelease()
require.Nil(t, releaseObj.Title)
require.Nil(t, releaseObj.Country)
require.Nil(t, releaseObj.DataQuality)
require.Nil(t, releaseObj.Notes)
}
8 changes: 6 additions & 2 deletions src/batch/xml.go
Original file line number Diff line number Diff line change
Expand Up @@ -345,15 +345,19 @@ type XmlReleaseRelation struct {
func (r *XmlReleaseRelation) GetGenres() []*model.Genre {
genres := make([]*model.Genre, 0)
for _, v := range unique.Slice(r.Genres) {
genres = append(genres, &model.Genre{Name: v})
if v = strings.TrimSpace(v); len(v) > 0 {
genres = append(genres, &model.Genre{Name: v})
}
}
return genres
}

func (r *XmlReleaseRelation) GetStyles() []*model.Style {
styles := make([]*model.Style, 0)
for _, v := range unique.Slice(r.Styles) {
styles = append(styles, &model.Style{Name: v})
if v = strings.TrimSpace(v); len(v) > 0 {
styles = append(styles, &model.Style{Name: v})
}
}
return styles
}
Expand Down

0 comments on commit 8f91201

Please sign in to comment.