chore(repo): Linting and fixing

Author: devsjc

Makefile

@@ -27,8 +27,8 @@ lint:
 	@golangci-lint fmt
 	@uvx -q sqlfluff fix -q \
 		--disable-progress-bar \
-		--config=internal/database/postgres/sql/.sqlfluff.toml \
-		internal/database/postgres/sql/queries
+		--config=internal/server/postgres/sql/.sqlfluff.toml \
+		internal/server/postgres/sql/queries
 
 .PHONY: bench
 bench:
@@ -49,7 +49,7 @@ doctor:
 gen.db:
 	@go install github.com/sqlc-dev/sqlc/cmd/sqlc@v1.30.0
 	@echo "Generating internal database code..."
-	@sqlc generate --file internal/database/postgres/.sqlc.yaml
+	@sqlc generate --file internal/server/postgres/.sqlc.yaml
 	@echo " * Success."
 
 .PHONY: gen.proto.go
@@ -143,7 +143,7 @@ run:
 
 .PHONY: run.db # Run an instance of Postgres with the required extensions
 run.db:
-	docker build -f internal/database/postgres/infra/Containerfile internal/database/postgres/infra -t data-platform-pgdb:local
+	docker build -f internal/server/postgres/infra/Containerfile internal/server/postgres/infra -t data-platform-pgdb:local
 	docker run --rm -e POSTGRES_USER=postgres -e POSTGRES_PASSWORD=postgres -e POSTGRES_DB=postgres -p "5400:5432" data-platform-pgdb:local
 
 .PHONY: run.client # Run a GRPC client to inspect the API

cmd/main.go

@@ -16,10 +16,10 @@ import (
 	"google.golang.org/grpc/health/grpc_health_v1"
 	"google.golang.org/grpc/reflection"
 
-	dbdy "github.com/openclimatefix/data-platform/internal/server/dummy"
-	dbpg "github.com/openclimatefix/data-platform/internal/server/postgres"
 	pb "github.com/openclimatefix/data-platform/internal/gen/ocf/dp"
 	ix "github.com/openclimatefix/data-platform/internal/interceptors"
+	dbdy "github.com/openclimatefix/data-platform/internal/server/dummy"
+	dbpg "github.com/openclimatefix/data-platform/internal/server/postgres"
 )
 
 func main() {

internal/server/postgres/adminserverimpl.go

@@ -18,9 +18,9 @@ import (
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/types/known/timestamppb"
 
-	db "github.com/openclimatefix/data-platform/internal/server/postgres/gen"
 	pb "github.com/openclimatefix/data-platform/internal/gen/ocf/dp"
 	ix "github.com/openclimatefix/data-platform/internal/interceptors"
+	db "github.com/openclimatefix/data-platform/internal/server/postgres/gen"
 )
 
 // --- Server Implementation ----------------------------------------------------------------------

internal/server/postgres/dataserverimpl.go

@@ -25,9 +25,9 @@ import (
 	"google.golang.org/protobuf/types/known/structpb"
 	"google.golang.org/protobuf/types/known/timestamppb"
 
-	db "github.com/openclimatefix/data-platform/internal/server/postgres/gen"
 	pb "github.com/openclimatefix/data-platform/internal/gen/ocf/dp"
 	ix "github.com/openclimatefix/data-platform/internal/interceptors"
+	db "github.com/openclimatefix/data-platform/internal/server/postgres/gen"
 )
 
 // --- Reuseable Functions for Route Logic -------------------------------------------------------