Use correct long description from DSA long RDF
- use date and DSA number as version identifier - add tests for Check and Get calls
This commit is contained in:
		
							parent
							
								
									12b2d36004
								
							
						
					
					
						commit
						182f21944b
					
				
					 5 changed files with 98 additions and 11 deletions
				
			
		|  | @ -81,8 +81,8 @@ func getRdfData(full bool) (*rdfData, error) { | |||
| } | ||||
| 
 | ||||
| type Version struct { | ||||
| 	Date  string `json:"date"` | ||||
| 	Title string `json:"title"` | ||||
| 	Date      string `json:"date"` | ||||
| 	DSANumber string `json:"dsa"` | ||||
| } | ||||
| 
 | ||||
| func (v Version) String() string { | ||||
|  | @ -104,6 +104,7 @@ type getInput struct { | |||
| 
 | ||||
| type MetaData struct { | ||||
| 	Link        string `json:"link"` | ||||
| 	Package     string `json:"package"` | ||||
| 	Description string `json:"description"` | ||||
| } | ||||
| 
 | ||||
|  | @ -126,7 +127,7 @@ func (r *VersionRange) Len() int { | |||
| } | ||||
| 
 | ||||
| func (r *VersionRange) Less(i, j int) bool { | ||||
| 	return r.versions[i].Date <= r.versions[j].Date && r.versions[i].Title < r.versions[j].Title | ||||
| 	return r.versions[i].Date <= r.versions[j].Date && r.versions[i].DSANumber < r.versions[j].DSANumber | ||||
| } | ||||
| 
 | ||||
| func (r *VersionRange) Swap(i, j int) { | ||||
|  | @ -161,7 +162,9 @@ func (r *Resource) Check() error { | |||
| 	dates := &VersionRange{} | ||||
| 
 | ||||
| 	for _, item := range dsaData.Items { | ||||
| 		dates.addVersion(Version{Date: item.Date, Title: item.Title}) | ||||
| 		parts := strings.SplitN(item.Title, " ", 2) | ||||
| 
 | ||||
| 		dates.addVersion(Version{Date: item.Date, DSANumber: parts[0]}) | ||||
| 	} | ||||
| 
 | ||||
| 	sort.Sort(dates) | ||||
|  | @ -185,19 +188,26 @@ func (r *Resource) Get(_ string) error { | |||
| 		return fmt.Errorf("could not interpret version from Concourse as date: %w", err) | ||||
| 	} | ||||
| 
 | ||||
| 	dsaData, err := getRdfData(false) | ||||
| 	dsaData, err := getRdfData(true) | ||||
| 	if err != nil { | ||||
| 		log.Fatalf("could not get DSA RDF data: %v", err) | ||||
| 	} | ||||
| 
 | ||||
| 	for _, item := range dsaData.Items { | ||||
| 		if item.Date == input.Version.Date && item.Title == input.Version.Title { | ||||
| 		if item.Date == input.Version.Date && strings.HasPrefix(item.Title, input.Version.DSANumber) { | ||||
| 			parts := strings.SplitN(item.Title, " ", 3) | ||||
| 
 | ||||
| 			err = r.writeGetOutput(Version{ | ||||
| 				Date:  item.Date, | ||||
| 				Title: item.Title, | ||||
| 				Date:      item.Date, | ||||
| 				DSANumber: parts[0], | ||||
| 			}, MetaData{ | ||||
| 				Link:        item.Link, | ||||
| 				Description: strings.TrimSpace(item.Description), | ||||
| 				Link:    item.Link, | ||||
| 				Package: parts[1], | ||||
| 				Description: strings.TrimSpace( | ||||
| 					strings.ReplaceAll(strings.ReplaceAll( | ||||
| 						item.Description, "<p>", ""), "</p>", "\n", | ||||
| 					), | ||||
| 				), | ||||
| 			}) | ||||
| 
 | ||||
| 			if err != nil { | ||||
|  |  | |||
							
								
								
									
										51
									
								
								internal/resource/dsa/dsa_test.go
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										51
									
								
								internal/resource/dsa/dsa_test.go
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,51 @@ | |||
| package dsa | ||||
| 
 | ||||
| import ( | ||||
| 	"bytes" | ||||
| 	"fmt" | ||||
| 	"strings" | ||||
| 	"testing" | ||||
| 
 | ||||
| 	"github.com/stretchr/testify/assert" | ||||
| 	"github.com/stretchr/testify/require" | ||||
| ) | ||||
| 
 | ||||
| func TestResource_Check(t *testing.T) { | ||||
| 	input := strings.NewReader("{}") | ||||
| 	output := &bytes.Buffer{} | ||||
| 
 | ||||
| 	resource := NewResource(input, output) | ||||
| 
 | ||||
| 	err := resource.Check() | ||||
| 
 | ||||
| 	assert.NoError(t, err) | ||||
| 
 | ||||
| 	result := output.String() | ||||
| 
 | ||||
| 	assert.NotEmpty(t, result) | ||||
| } | ||||
| 
 | ||||
| func TestResource_Get(t *testing.T) { | ||||
| 	rdf, err := getRdfData(false) | ||||
| 
 | ||||
| 	item := rdf.Items[0] | ||||
| 
 | ||||
| 	parts := strings.SplitN(item.Title, " ", 2) | ||||
| 
 | ||||
| 	require.NoError(t, err) | ||||
| 
 | ||||
| 	input := strings.NewReader(fmt.Sprintf( | ||||
| 		`{"source":{},"params":{},"version":{"date":"%s","dsa":"%s"}}`, item.Date, parts[0], | ||||
| 	)) | ||||
| 	output := &bytes.Buffer{} | ||||
| 
 | ||||
| 	resource := NewResource(input, output) | ||||
| 
 | ||||
| 	err = resource.Get("/tmp") | ||||
| 
 | ||||
| 	assert.NoError(t, err) | ||||
| 
 | ||||
| 	result := output.String() | ||||
| 
 | ||||
| 	assert.NotEmpty(t, result) | ||||
| } | ||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue