From 346e5b27b598e0fef5edffb4653892feea206520 Mon Sep 17 00:00:00 2001 From: Sergey Melnikov Date: Mon, 29 Jan 2024 08:09:30 +0300 Subject: [PATCH] rename --- docker-compose.yml | 6 +++--- go.mod | 2 +- src/aws/aws.go | 2 +- src/controller/controller.go | 4 ++-- src/controller/mocks/mock.go | 2 +- src/controller/usercontroller.go | 4 ++-- src/main.go | 8 ++++---- src/main_test.go | 6 +++--- src/model/cassandra.go | 4 ++-- src/model/model.go | 2 +- src/model/user_model.go | 6 +++--- src/utils/utils.go | 2 +- src/view/api.go | 10 +++++----- 13 files changed, 29 insertions(+), 29 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 2c4d81a..c57ad49 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ services: cassandra: container_name: cassandra environment: - - CASSANDRA_KEYSPACE=userprofileservice + - CASSANDRA_KEYSPACE=userservice - TABLE_NAME=users build: context: . @@ -16,7 +16,7 @@ services: environment: - CASSANDRA_HOST=cassandra - CASSANDRA_PORT=9042 - - CASSANDRA_KEYSPACE=userprofileservice + - CASSANDRA_KEYSPACE=userservice - CASSANDRA_CONSISTANCY=LOCAL_QUORUM - TABLE_NAME=users - BIDN_SERVICE=:8080 @@ -25,7 +25,7 @@ services: - AWS_SECRET_ACCESS_KEY=fake-secret - BUCKET_NAME=fake-bucket - AWS_ACL=public-read - build: + build: context: . dockerfile: ./docker/api/Dockerfile ports: diff --git a/go.mod b/go.mod index 942f151..f7850e9 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module userprofileservice +module userservice go 1.21.6 diff --git a/src/aws/aws.go b/src/aws/aws.go index 663fac5..9095253 100644 --- a/src/aws/aws.go +++ b/src/aws/aws.go @@ -2,7 +2,7 @@ package aws import ( "io" - "userprofileservice/src/utils" + "userservice/src/utils" "github.com/aws/aws-sdk-go/aws/session" ) diff --git a/src/controller/controller.go b/src/controller/controller.go index 81af147..33250ed 100644 --- a/src/controller/controller.go +++ b/src/controller/controller.go @@ -1,8 +1,8 @@ package controller import ( - "userprofileservice/src/model" - "userprofileservice/src/structs" + "userservice/src/model" + "userservice/src/structs" "github.com/gocql/gocql" ) diff --git a/src/controller/mocks/mock.go b/src/controller/mocks/mock.go index 59cc26f..7287a8e 100644 --- a/src/controller/mocks/mock.go +++ b/src/controller/mocks/mock.go @@ -6,7 +6,7 @@ package mock_controller import ( reflect "reflect" - structs "userprofileservice/src/structs" + structs "userservice/src/structs" gocql "github.com/gocql/gocql" gomock "github.com/golang/mock/gomock" diff --git a/src/controller/usercontroller.go b/src/controller/usercontroller.go index c47bcaf..cdbca6c 100644 --- a/src/controller/usercontroller.go +++ b/src/controller/usercontroller.go @@ -1,8 +1,8 @@ package controller import ( - "userprofileservice/src/model" - "userprofileservice/src/structs" + "userservice/src/model" + "userservice/src/structs" "github.com/gocql/gocql" ) diff --git a/src/main.go b/src/main.go index 8b8d8db..632ea05 100644 --- a/src/main.go +++ b/src/main.go @@ -3,10 +3,10 @@ package main import ( "log" "net/http" - "userprofileservice/src/controller" - "userprofileservice/src/model" - "userprofileservice/src/utils" - "userprofileservice/src/view" + "userservice/src/controller" + "userservice/src/model" + "userservice/src/utils" + "userservice/src/view" ) func main() { diff --git a/src/main_test.go b/src/main_test.go index 2295c5d..baa5ddd 100644 --- a/src/main_test.go +++ b/src/main_test.go @@ -3,9 +3,9 @@ package main import ( "log" "testing" - "userprofileservice/src/controller" - mock_controller "userprofileservice/src/controller/mocks" - "userprofileservice/src/structs" + "userservice/src/controller" + mock_controller "userservice/src/controller/mocks" + "userservice/src/structs" "github.com/gocql/gocql" "github.com/golang/mock/gomock" diff --git a/src/model/cassandra.go b/src/model/cassandra.go index 75bb229..4ba5214 100644 --- a/src/model/cassandra.go +++ b/src/model/cassandra.go @@ -3,7 +3,7 @@ package model import ( "log" "time" - "userprofileservice/src/utils" + "userservice/src/utils" "github.com/gocql/gocql" ) @@ -11,7 +11,7 @@ import ( func NewCassandra() *gocql.Session { conf := gocql.NewCluster(utils.GetEnv("CASSANDRA_HOST", "cassandra")) conf.Port = utils.ParsePort(utils.GetEnv("CASSANDRA_PORT", "9042")) - conf.Keyspace = utils.GetEnv("CASSANDRA_KEYSPACE", "userprofileservice") + conf.Keyspace = utils.GetEnv("CASSANDRA_KEYSPACE", "userservice") conf.Consistency = gocql.ParseConsistency(utils.GetEnv("CASSANDRA_CONSISTANCY", "LOCAL_QUORUM")) sess, err := conf.CreateSession() if err != nil { diff --git a/src/model/model.go b/src/model/model.go index 5adc7b2..d421a00 100644 --- a/src/model/model.go +++ b/src/model/model.go @@ -1,7 +1,7 @@ package model import ( - "userprofileservice/src/structs" + "userservice/src/structs" "github.com/gocql/gocql" ) diff --git a/src/model/user_model.go b/src/model/user_model.go index 64956fc..e7d4504 100644 --- a/src/model/user_model.go +++ b/src/model/user_model.go @@ -1,8 +1,8 @@ package model import ( - "userprofileservice/src/structs" - "userprofileservice/src/utils" + "userservice/src/structs" + "userservice/src/utils" "github.com/gocql/gocql" ) @@ -71,7 +71,7 @@ func (c *ModelCassandra) CreateUser(user *structs.USER) error { // GetUser return user data by id func (c *ModelCassandra) GetUser(id gocql.UUID) (*structs.USER, error) { - q := `SELECT id, firstname, lastname, currentlocation, birthday, userpicture, certificate + q := `SELECT id, firstname, lastname, currentlocation, birthday, userpicture, certificate FROM ` + c.TableName + ` WHERE id = ? LIMIT 1` user := &structs.USER{} diff --git a/src/utils/utils.go b/src/utils/utils.go index b337720..8af4055 100644 --- a/src/utils/utils.go +++ b/src/utils/utils.go @@ -5,7 +5,7 @@ import ( "reflect" "strconv" "strings" - "userprofileservice/src/structs" + "userservice/src/structs" ) // GetEnv look up ENV settings diff --git a/src/view/api.go b/src/view/api.go index 66782dc..493b755 100644 --- a/src/view/api.go +++ b/src/view/api.go @@ -4,12 +4,12 @@ import ( "encoding/json" "errors" "net/http" - "userprofileservice/src/aws" - "userprofileservice/src/controller" - "userprofileservice/src/structs" - "userprofileservice/src/utils" + "userservice/src/aws" + "userservice/src/controller" + "userservice/src/structs" + "userservice/src/utils" - _ "userprofileservice/src/docs" + _ "userservice/src/docs" "github.com/gocql/gocql" "github.com/gorilla/mux"