Cleanup API links

Author: jakub-id

broker/api/api-handler.go

@@ -95,10 +95,9 @@ func (a *ApiHandler) Get(w http.ResponseWriter, r *http.Request) {
 	index.Revision = vcs.GetCommit()
 	index.Signature = vcs.GetSignature()
 	index.Links.IllTransactionsLink = Link(r, Path(ILL_TRANSACTIONS_PATH), nil)
-	index.Links.EventsLink = Link(r, Path(EVENTS_PATH), nil)
-	index.Links.LocatedSuppliersLink = Link(r, Path(LOCATED_SUPPLIERS_PATH), nil)
 	index.Links.PeersLink = Link(r, Path(PEERS_PATH), nil)
-	index.Links.PatronRequestsLink = Link(r, Path(PATRON_REQUESTS_PATH), nil)
+	index.Links.BorrowingRequestsLink = Link(r, Path(PATRON_REQUESTS_PATH), Query("side", "borrowing"))
+	index.Links.LendingRequestsLink = Link(r, Path(PATRON_REQUESTS_PATH), Query("side", "lending"))
 	WriteJsonResponse(w, index)
 }
 

broker/oapi/open-api.yaml

@@ -130,21 +130,17 @@ components:
             peersLink:
               type: string
               description: Link to peers
-            eventsLink:
+            borrowingRequestsLink:
               type: string
-              description: Link to events
-            locatedSuppliersLink:
+              description: Link to borrowing requests
+            lendingRequestsLink:
               type: string
-              description: Link to located suppliers
-            patronRequestsLink:
-              type: string
-              description: Link to patron request
+              description: Link to lending requests
           required:
-            - eventsLink
+            - borrowingRequestsLink
             - illTransactionsLink
+            - lendingRequestsLink
             - peersLink
-            - locatedSuppliersLink
-            - patronRequestsLink
       required:
         - revision
         - signature

broker/test/api/api-handler_test.go

@@ -92,9 +92,9 @@ func TestGetIndex(t *testing.T) {
 	assert.Equal(t, vcs.GetCommit(), resp.Revision)
 	assert.Equal(t, vcs.GetSignature(), resp.Signature)
 	assert.Equal(t, getLocalhostWithPort()+api.ILL_TRANSACTIONS_PATH, resp.Links.IllTransactionsLink)
-	assert.Equal(t, getLocalhostWithPort()+api.EVENTS_PATH, resp.Links.EventsLink)
 	assert.Equal(t, getLocalhostWithPort()+api.PEERS_PATH, resp.Links.PeersLink)
-	assert.Equal(t, getLocalhostWithPort()+api.LOCATED_SUPPLIERS_PATH, resp.Links.LocatedSuppliersLink)
+	assert.Equal(t, getLocalhostWithPort()+api.PATRON_REQUESTS_PATH+"?side=borrowing", resp.Links.BorrowingRequestsLink)
+	assert.Equal(t, getLocalhostWithPort()+api.PATRON_REQUESTS_PATH+"?side=lending", resp.Links.LendingRequestsLink)
 }
 
 func TestGetEvents(t *testing.T) {