Improve URL serialization (#3)

krisukox · Jul 15, 2023 · 7b2bff8 · 7b2bff8
1 parent e08b4d6
commit 7b2bff8
Show file tree

Hide file tree

Showing 11 changed files with 353 additions and 164 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -8,7 +8,7 @@ on:
       - '**'
 
 jobs:
-  integration_test:
+  unit_test:
     name: Run tests
     runs-on: ubuntu-22.04
     steps:
@@ -21,6 +21,6 @@ jobs:
       - name: Check out repository code
         uses: actions/checkout@v3
 
-      - name: Run integration test
+      - name: Run unit tests
         run: |
           go test ./... -v
diff --git a/api/url.go b/api/url.go
diff --git a/api/url_test.go b/api/url_test.go
diff --git a/api/flight.go → flight.go b/api/flight.go → flight.go
@@ -1,4 +1,4 @@
-package api
+package main
 
 import (
 	"bufio"
@@ -107,17 +107,30 @@ func getPriceSuffix(unit currency.Unit) string {
 }
 
 func GetFlights(
-	departureDate time.Time,
+	date time.Time,
 	returnDate time.Time,
-	departureCity string,
-	arivalCity string,
+	srcCity string,
+	dstCity string,
 	unit currency.Unit,
 ) ([]flight, error) {
 	if !isSupportedCurrency(unit) {
 		return nil, fmt.Errorf(unit.String() + " is not supproted yet")
 	}
 
-	url, err := CreateFullURL(departureDate, returnDate, departureCity, arivalCity)
+	url, err := SerializeUrl(
+		date,
+		returnDate,
+		[]string{srcCity},
+		[]string{},
+		[]string{dstCity},
+		[]string{},
+		1,
+		unit,
+		AnyStops,
+		Economy,
+		RoundTrip,
+	)
+
 	if err != nil {
 		return nil, err
 	}

diff --git a/api/flight_test.go → flight_test.go b/api/flight_test.go → flight_test.go
@@ -1,4 +1,4 @@
-package api
+package main
 
 import (
 	"testing"

diff --git a/api/flight_v2.go → flight_v2.go b/api/flight_v2.go → flight_v2.go
@@ -1,4 +1,4 @@
-package api
+package main
 
 import (
 	"bufio"
@@ -66,11 +66,11 @@ func (t offer) String() string {
 }
 
 func GetRawData(date, returnDate time.Time, originCity, targetCity string) string {
-	serializedOriginCity, err := GetSerializedCityName(originCity)
+	serializedOriginCity, err := AbbrCity(originCity)
 	if err != nil {
 		log.Fatalf(err.Error())
 	}
-	serializedTargetCity, err := GetSerializedCityName(targetCity)
+	serializedTargetCity, err := AbbrCity(targetCity)
 	if err != nil {
 		log.Fatalf(err.Error())
 	}

diff --git a/api/flight_v2_test.go → flight_v2_test.go b/api/flight_v2_test.go → flight_v2_test.go
@@ -1,4 +1,4 @@
-package api
+package main
 
 import (
 	"testing"

diff --git a/main.go b/main.go
@@ -5,15 +5,14 @@ import (
 	"log"
 	"time"
 
-	"github.com/krisukox/google-flights-api/api"
 	"golang.org/x/text/currency"
 )
 
 func main() {
 	date, _ := time.Parse("2006-01-02", "2023-07-04")
 	returnDate, _ := time.Parse("2006-01-02", "2023-07-08")
 
-	offer, err := api.GetOffers(date, returnDate, "Wrocław", "Rzym", currency.PLN)
+	offer, err := GetOffers(date, returnDate, "Wrocław", "Rzym", currency.PLN)
 	if err != nil {
 		log.Fatalf(err.Error())
 	}

diff --git a/api/serialize_city.go → serialize_city.go b/api/serialize_city.go → serialize_city.go
@@ -1,4 +1,4 @@
-package api
+package main
 
 import (
 	"bufio"
@@ -88,7 +88,7 @@ func decodeInnerObject(body *bufio.Reader) ([][][][]interface{}, error) {
 	return innerObject, nil
 }
 
-func GetSerializedCityName(city string) (string, error) {
+func AbbrCity(city string) (string, error) {
 	resp, err := sendRequest(city)
 	if err != nil {
 		return "", err
@@ -117,3 +117,15 @@ func GetSerializedCityName(city string) (string, error) {
 
 	return serializedCity, nil
 }
+
+func AbbrCities(cities []string) ([]string, error) {
+	abbrCities := []string{}
+	for _, c := range cities {
+		sc, err := AbbrCity(c)
+		if err != nil {
+			return nil, err
+		}
+		abbrCities = append(abbrCities, sc)
+	}
+	return abbrCities, nil
+}