File reformatting to match assignment topic (packages, modules and procfiles)

api_exchange.go → api_infoservice.go

-package exchange
+package covidcase
 
 import (
+	"covidcase/country"
+	"covidcase/currency"
 	"encoding/json"
-	"exchange/country"
-	"exchange/currency"
 	"fmt"
 	"github.com/go-chi/chi"
 	"html/template"
@@ -67,7 +67,7 @@ func HandlerLostUser(w http.ResponseWriter, r *http.Request) {
 }
 
 // HandlerHistory main handler for route related to `/exchangehistory` requests
-func HandlerHistory() func(http.ResponseWriter, *http.Request) {
+func HandlerCountry() func(http.ResponseWriter, *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
 		switch r.Method {
 		case http.MethodGet:

cmd/exchange_server.go

 package main
 
 import (
-	"exchange"
+	"covidcase"
 	"github.com/go-chi/chi"
 	"github.com/go-chi/chi/middleware"
 	"log"
@@ -16,12 +16,12 @@ import (
 const (
 	// Chi regex parameters
 	COUNTRY = "{country_name:[a-z]+}"			  // Country name
-	BY = "{b_year:\\d\\d\\d\\d}"		   		  // Begin year
-	BM = "{b_month:\\d\\d}"		   	  			  // Begin month
-	BD = "{b_day:\\d\\d}"		   		          // Begin day
-	EY = "{e_year:\\d\\d\\d\\d}"		   		  // End year
-	EM = "{e_month:\\d\\d}"		   	              // End month
-	ED = "{e_day:\\d\\d}"		   		          // End day
+	//BY = "{b_year:\\d\\d\\d\\d}"		   		  // Begin year
+	//BM = "{b_month:\\d\\d}"		   	  			  // Begin month
+	//BD = "{b_day:\\d\\d}"		   		          // Begin day
+	//EY = "{e_year:\\d\\d\\d\\d}"		   		  // End year
+	//EM = "{e_month:\\d\\d}"		   	              // End month
+	//ED = "{e_day:\\d\\d}"		   		          // End day
 )
 
 func main() {
@@ -40,10 +40,10 @@ func main() {
 	r.Use(middleware.Logger)
 
 	// Routes
-	r.Get("/exchange/v1/exchangehistory/"+COUNTRY+"/"+BY+"-"+BM+"-"+BD+"-"+EY+"-"+EM+"-"+ED, exchange.HandlerHistory())
-	r.Get("/exchange/v1/exchangeborder/"+COUNTRY, exchange.HandlerBorder())
-	r.Get("/exchange/v1/diag/", exchange.HandlerDiag(appStart))	// Pass appStart time value for use in this route
-	r.Get("/*", exchange.HandlerLostUser) // Route for any other query not handled by API
+	r.Get("/corona/v1/country/"+COUNTRY, covidcase.HandlerCountry()) // optional query parameter "scope" as start/end date
+	r.Get("/exchange/v1/exchangeborder/"+COUNTRY, covidcase.HandlerBorder())
+	r.Get("/exchange/v1/diag/", covidcase.HandlerDiag(appStart))	// Pass appStart time value for use in this route
+	r.Get("/*", covidcase.HandlerLostUser) // Route for any other query not handled by API
 
 	log.Fatal(http.ListenAndServe(":"+port, r))
 }
\ No newline at end of file

go.mod

-module exchange
+module covidcase
 
 // +heroku goVersion go1.13
 

procfile

-web: exchange
\ No newline at end of file