Skip to content

Commit

Permalink
refactor: create new directory structure
Browse files Browse the repository at this point in the history
* create "pkg" directory with all packages that are part of the application
* create directory "tests" with e2e and integration tests
  • Loading branch information
lonnik committed Jun 11, 2024
1 parent dceba83 commit 9725951
Show file tree
Hide file tree
Showing 94 changed files with 1,350 additions and 1,298 deletions.
2 changes: 1 addition & 1 deletion services/server/.air.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ tmp_dir = "tmp"
[build]
args_bin = []
bin = "./tmp/main"
cmd = "go build -o ./tmp/main ."
cmd = "go build -o ./tmp/main ./cmd"
delay = 1000
exclude_dir = ["assets", "tmp", "vendor", "testdata"]
exclude_file = []
Expand Down
4 changes: 2 additions & 2 deletions services/server/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ clean:
go run scripts/clean/main.go

build:
go build -o ./tmp/main .
go build -o ./tmp/main ./cmd

develop:
air

migrate:
migrate -path=./postgres/migrations/ -database "postgres://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:5432/${DB_NAME}?sslmode=disable" up
migrate -path=./pkg/postgres/migrations/ -database "postgres://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:5432/${DB_NAME}?sslmode=disable" up

.PHONY: seed clean build develop migrate
55 changes: 55 additions & 0 deletions services/server/cmd/main.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
package main

import (
"context"
"fmt"
"os"
"spaces-p/pkg/firebase"
googlegeocode "spaces-p/pkg/repositories/google_geocode"
"spaces-p/pkg/server"
"spaces-p/pkg/utils"
"spaces-p/pkg/zerologger"
"time"

"github.com/joho/godotenv"
"github.com/rs/zerolog"
)

func main() {
ctx := context.Background()

if os.Getenv("ENVIRONMENT") == "development" {
err := godotenv.Load(".env")
exitOnError(err)
}

firebaseAuthClient, err := firebase.NewFirebaseAuthClient(context.Background())
exitOnError(err)

googleGeocodeApiKey, err := utils.GetEnv("GOOGLE_GEOCODE_API_KEY")
exitOnError(err)

googleGeocodeRepo := googlegeocode.NewGoogleGeocodeRepo(googleGeocodeApiKey)

// logger configuration
logFile, err := os.Create("logfile.log")
exitOnError(err)
defer logFile.Close()

consoleWriter := zerolog.ConsoleWriter{
Out: os.Stdout,
TimeFormat: time.RFC3339,
}
multi := zerolog.MultiLevelWriter(consoleWriter, logFile)
logger := zerologger.New(multi)

err = server.Run(ctx, logger, utils.GetEnv, firebaseAuthClient, googleGeocodeRepo)
exitOnError(err)
}

func exitOnError(err error) {
if err != nil {
fmt.Fprintf(os.Stderr, "%s\n", err)
os.Exit(1)
}
}
124 changes: 0 additions & 124 deletions services/server/e2e/address_get.go

This file was deleted.

135 changes: 0 additions & 135 deletions services/server/e2e/space_create.go

This file was deleted.

Loading

0 comments on commit 9725951

Please sign in to comment.