From 436fa000273806cc7286d01f5be42e8b9d6dc8b0 Mon Sep 17 00:00:00 2001
From: Abdulsamad Sheikh <abdulsas@stud.ntnu.no>
Date: Thu, 7 Mar 2024 05:38:41 +0000
Subject: [PATCH] Error with iterating over countries
---
handlers/handlers.go | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/handlers/handlers.go b/handlers/handlers.go
index 799450f..a50eb13 100644
--- a/handlers/handlers.go
+++ b/handlers/handlers.go
@@ -59,7 +59,7 @@ func ReadershipHandler(w http.ResponseWriter, r *http.Request) {
}
// Fetch countries for the given language
- countries, err := services.FetchCountriesByLanguage(language)
+ countries, err := services.FetchCountriesByLanguage(language)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
@@ -68,7 +68,7 @@ func ReadershipHandler(w http.ResponseWriter, r *http.Request) {
// Fetch population data for each country and calculate total readership
var readershipDetails []models.ReadershipDetail
var totalReadership int64 = 0
- for _, country := range countries.Countries {
+ for _, country := range countries { // Directly range over countries
population, err := services.FetchPopulationByCountryCode(country.ISOCode)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -77,7 +77,7 @@ func ReadershipHandler(w http.ResponseWriter, r *http.Request) {
totalReadership += population
readershipDetail := models.ReadershipDetail{
- Country: country.Name,
+ Country: country.Official_Name,
ISOCode: country.ISOCode,
Books: len(books.Results),
Authors: services.CalculateUniqueAuthors(books.Results),
@@ -96,13 +96,14 @@ func ReadershipHandler(w http.ResponseWriter, r *http.Request) {
json.NewEncoder(w).Encode(readershipDetails)
}
+
func StatusHandler(w http.ResponseWriter, r *http.Request) {
status := models.ServiceStatus{
GutendexAPI: services.CheckServiceAvailability("http://129.241.150.113:8000/books/"),
LanguageAPI: services.CheckServiceAvailability("http://129.241.150.113:3000/language2countries/"),
CountriesAPI: services.CheckServiceAvailability("http://129.241.150.113:8080/v3.1/"),
Version: "v1",
- Uptime: services.GetUptime(), // Implement GetUptime in your services package
+ Uptime: services.GetUptime(), // Implement GetUptime in services package
}
w.Header().Set("Content-Type", "application/json")
--
GitLab