use ourairports.com as new datasource for search selection

explore-flights · May 9, 2024 · 1873e8c · 1873e8c
1 parent 518c158
commit 1873e8c
Show file tree

Hide file tree

Showing 11 changed files with 267 additions and 229 deletions.
diff --git a/cdk/lib/constructs/api-lambda-construct.ts b/cdk/lib/constructs/api-lambda-construct.ts
@@ -58,9 +58,9 @@ export class ApiLambdaConstruct extends Construct {
     });
 
     props.dataBucket.grantRead(lambda, 'processed/flights/*');
-    props.dataBucket.grantRead(lambda, 'raw/LH_Public_Data/airports.json');
-    props.dataBucket.grantRead(lambda, 'raw/LH_Public_Data/cities.json');
-    props.dataBucket.grantRead(lambda, 'raw/LH_Public_Data/countries.json');
+    props.dataBucket.grantRead(lambda, 'raw/ourairports_data/airports.csv');
+    props.dataBucket.grantRead(lambda, 'raw/ourairports_data/countries.csv');
+    props.dataBucket.grantRead(lambda, 'raw/ourairports_data/regions.csv');
 
     this.functionURL = new FunctionUrl(this, 'ApiLambdaFunctionUrl', {
       function: lambda,

diff --git a/go/api/config_lambda.go b/go/api/config_lambda.go
@@ -8,7 +8,6 @@ import (
 	"errors"
 	"github.com/aws/aws-sdk-go-v2/config"
 	"github.com/aws/aws-sdk-go-v2/service/s3"
-	"github.com/explore-flights/monorepo/go/api/data"
 	"github.com/explore-flights/monorepo/go/api/search"
 	"os"
 	"strconv"
@@ -28,20 +27,15 @@ func s3Client(ctx context.Context) (*s3.Client, error) {
 	return s3.NewFromConfig(cfg), nil
 }
 
-func dataRepo(ctx context.Context, s3c data.MinimalS3Client) (*data.Repo, error) {
-	dataBucket := os.Getenv("FLIGHTS_DATA_BUCKET")
-	if dataBucket == "" {
-		return nil, errors.New("env variable FLIGHTS_DATA_BUCKET required")
+func dataBucket() (string, error) {
+	bucket := os.Getenv("FLIGHTS_DATA_BUCKET")
+	if bucket == "" {
+		return "", errors.New("env variable FLIGHTS_DATA_BUCKET required")
 	}
 
-	return data.NewRepo(s3c, dataBucket), nil
+	return bucket, nil
 }
 
-func flightRepo(ctx context.Context, s3c search.MinimalS3Client) (*search.FlightRepo, error) {
-	dataBucket := os.Getenv("FLIGHTS_DATA_BUCKET")
-	if dataBucket == "" {
-		return nil, errors.New("env variable FLIGHTS_DATA_BUCKET required")
-	}
-
-	return search.NewFlightRepo(s3c, dataBucket), nil
+func flightRepo(ctx context.Context, s3c search.MinimalS3Client, bucket string) (*search.FlightRepo, error) {
+	return search.NewFlightRepo(s3c, bucket), nil
 }
diff --git a/go/api/config_local.go b/go/api/config_local.go
@@ -4,7 +4,6 @@ package main
 
 import (
 	"context"
-	"github.com/explore-flights/monorepo/go/api/data"
 	"github.com/explore-flights/monorepo/go/api/local"
 	"github.com/explore-flights/monorepo/go/api/search"
 	"os"
@@ -24,10 +23,10 @@ func s3Client(ctx context.Context) (*local.S3Client, error) {
 	return local.NewS3Client(filepath.Join(home, "Downloads", "local_s3")), nil
 }
 
-func dataRepo(ctx context.Context, s3c data.MinimalS3Client) (*data.Repo, error) {
-	return data.NewRepo(s3c, "flights_data_bucket"), nil
+func dataBucket() (string, error) {
+	return "flights_data_bucket", nil
 }
 
-func flightRepo(ctx context.Context, s3c search.MinimalS3Client) (*search.FlightRepo, error) {
-	return search.NewFlightRepo(s3c, "flights_data_bucket"), nil
+func flightRepo(ctx context.Context, s3c search.MinimalS3Client, bucket string) (*search.FlightRepo, error) {
+	return search.NewFlightRepo(s3c, bucket), nil
 }