Fix the misconfigured base url env var (#178)

* Fix the misconfigured base url env var * Fix tests * Fix tests * Fix tests
th0th · May 1, 2023 · e81fa16 · e81fa16
1 parent 00d8f8d
commit e81fa16
Show file tree

Hide file tree

Showing 23 changed files with 333 additions and 341 deletions.
diff --git a/.idea/runConfigurations/_template__of_Go_Test.xml b/.idea/runConfigurations/_template__of_Go_Test.xml
diff --git a/backend/pkg/service/sitereport/browsername/main_test.go b/backend/pkg/service/sitereport/browsername/main_test.go
@@ -88,7 +88,7 @@ func TestGet(t *testing.T) {
 			}
 
 			if filteredTestData[i].VisitorCount == filteredTestData[j].VisitorCount {
-				return *filteredTestData[i].BrowserName > *filteredTestData[j].BrowserName
+				return *filteredTestData[i].BrowserName < *filteredTestData[j].BrowserName
 			}
 
 			return false

diff --git a/backend/pkg/service/sitereport/browserversion/main.go b/backend/pkg/service/sitereport/browserversion/main.go
@@ -41,7 +41,7 @@ func Get(dp *depot.Depot, filters *filter.Filters, paginationCursor *PaginationC
 
 	totalVisitorCountSubQuery := baseQuery.
 		Session(&gorm.Session{}).
-		Select("count(distinct visitor_id) as count")
+		Select("count(distinct visitor_id)")
 
 	baseSubQuery := baseQuery.
 		Session(&gorm.Session{}).

diff --git a/backend/pkg/service/sitereport/browserversion/main_test.go b/backend/pkg/service/sitereport/browserversion/main_test.go
@@ -89,7 +89,7 @@ func TestGet(t *testing.T) {
 			}
 
 			if filteredTestData[i].VisitorCount == filteredTestData[j].VisitorCount {
-				return *filteredTestData[i].BrowserVersion > *filteredTestData[j].BrowserVersion
+				return *filteredTestData[i].BrowserVersion < *filteredTestData[j].BrowserVersion
 			}
 
 			return false

diff --git a/backend/pkg/service/sitereport/country/main_test.go b/backend/pkg/service/sitereport/country/main_test.go
@@ -65,7 +65,7 @@ func TestGet(t *testing.T) {
 			}
 
 			if testData[i].VisitorCount == testData[j].VisitorCount {
-				return testData[i].CountryIsoCode > testData[j].CountryIsoCode
+				return testData[i].CountryIsoCode < testData[j].CountryIsoCode
 			}
 
 			return false

diff --git a/backend/pkg/service/sitereport/language/main_test.go b/backend/pkg/service/sitereport/language/main_test.go
@@ -87,7 +87,7 @@ func TestGet(t *testing.T) {
 			}
 
 			if filteredTestData[i].VisitorCount == filteredTestData[j].VisitorCount {
-				return *filteredTestData[i].Language > *filteredTestData[j].Language
+				return *filteredTestData[i].Language < *filteredTestData[j].Language
 			}
 
 			return false

diff --git a/backend/pkg/service/sitereport/operatingsystemname/main.go b/backend/pkg/service/sitereport/operatingsystemname/main.go
@@ -34,7 +34,7 @@ func Get(dp *depot.Depot, filters *filter.Filters, paginationCursor *PaginationC
 
 	totalVisitorCountSubQuery := baseQuery.
 		Session(&gorm.Session{}).
-		Select("count(distinct visitor_id) as count")
+		Select("count(distinct visitor_id)")
 
 	baseSubQuery := baseQuery.
 		Session(&gorm.Session{}).

diff --git a/backend/pkg/service/sitereport/operatingsystemname/main_test.go b/backend/pkg/service/sitereport/operatingsystemname/main_test.go
@@ -93,7 +93,7 @@ func TestGet(t *testing.T) {
 			}
 
 			if filteredTestData[i].VisitorCount == filteredTestData[j].VisitorCount {
-				return *filteredTestData[i].OperatingSystemName > *filteredTestData[j].OperatingSystemName
+				return *filteredTestData[i].OperatingSystemName < *filteredTestData[j].OperatingSystemName
 			}
 
 			return false

diff --git a/backend/pkg/service/sitereport/operatingsystemversion/main.go b/backend/pkg/service/sitereport/operatingsystemversion/main.go
@@ -41,7 +41,7 @@ func Get(dp *depot.Depot, filters *filter.Filters, paginationCursor *PaginationC
 
 	totalVisitorCountSubQuery := baseQuery.
 		Session(&gorm.Session{}).
-		Select("count(distinct visitor_id) as count")
+		Select("count(distinct visitor_id)")
 
 	baseSubQuery := baseQuery.
 		Session(&gorm.Session{}).

diff --git a/backend/pkg/service/sitereport/operatingsystemversion/main_test.go b/backend/pkg/service/sitereport/operatingsystemversion/main_test.go
@@ -89,7 +89,7 @@ func TestGet(t *testing.T) {
 			}
 
 			if filteredTestData[i].VisitorCount == filteredTestData[j].VisitorCount {
-				return *filteredTestData[i].OperatingSystemVersion > *filteredTestData[j].OperatingSystemVersion
+				return *filteredTestData[i].OperatingSystemVersion < *filteredTestData[j].OperatingSystemVersion
 			}
 
 			return false