From 0a87f8535833d55c4f280fbd99f3e6e798ef016c Mon Sep 17 00:00:00 2001 From: Ardeman Date: Thu, 27 Feb 2025 06:58:12 +0800 Subject: [PATCH 1/4] chore: update dependencies and bump OpenAPI version to 3.1.0 --- go.mod | 13 ++++++------- go.sum | 16 ++++++++-------- openapi.yml | 2 +- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index 8aad9eb..4859c5c 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,10 @@ go 1.24.0 require ( github.com/golang-jwt/jwt/v5 v5.2.1 + github.com/joho/godotenv v1.5.1 go.uber.org/fx v1.23.0 + golang.org/x/crypto v0.34.0 + gorm.io/driver/postgres v1.5.11 ) require ( @@ -17,24 +20,20 @@ require ( github.com/jackc/puddle/v2 v2.2.2 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect - github.com/joho/godotenv v1.5.1 // indirect github.com/leodido/go-urn v1.4.0 // indirect - golang.org/x/crypto v0.34.0 // indirect golang.org/x/net v0.34.0 // indirect golang.org/x/text v0.22.0 // indirect - gorm.io/driver/postgres v1.5.11 // indirect ) require ( github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect - github.com/go-chi/chi v1.5.5 - github.com/go-chi/chi/v5 v5.2.1 // indirect + github.com/go-chi/chi/v5 v5.2.1 github.com/go-chi/cors v1.2.1 github.com/go-playground/validator/v10 v10.25.0 github.com/google/uuid v1.6.0 - github.com/redis/go-redis/v9 v9.7.1 // indirect - github.com/sirupsen/logrus v1.9.3 // indirect + github.com/redis/go-redis/v9 v9.7.1 + github.com/sirupsen/logrus v1.9.3 go.uber.org/dig v1.18.0 // indirect go.uber.org/multierr v1.10.0 // indirect go.uber.org/zap v1.26.0 // indirect diff --git a/go.sum b/go.sum index 778b3b3..482bf47 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,7 @@ +github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= +github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c= +github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA= +github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -7,12 +11,12 @@ github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/r github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM= github.com/gabriel-vasile/mimetype v1.4.8/go.mod h1:ByKUIKGjh1ODkGM1asKUbQZOLGrPjydw3hYPU2YU9t8= -github.com/go-chi/chi v1.5.5 h1:vOB/HbEMt9QqBqErz07QehcOKHaWFtuj87tTDVz2qXE= -github.com/go-chi/chi v1.5.5/go.mod h1:C9JqLr3tIYjDOZpzn+BCuxY8z8vmca43EeMgyZt7irw= github.com/go-chi/chi/v5 v5.2.1 h1:KOIHODQj58PmL80G2Eak4WdvUzjSJSm0vG72crDCqb8= github.com/go-chi/chi/v5 v5.2.1/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops= github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4= github.com/go-chi/cors v1.2.1/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58= +github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= +github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= @@ -48,8 +52,8 @@ github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVs github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= -github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= go.uber.org/dig v1.18.0 h1:imUL1UiY0Mg4bqbFfsRQO5G4CGRBec/ZujWTvSVp3pw= go.uber.org/dig v1.18.0/go.mod h1:Us0rSJiThwCv2GteUN0Q7OKvU7n5J4dxZ9JKUXozFdE= go.uber.org/fx v1.23.0 h1:lIr/gYWQGfTwGcSXWXu4vP5Ws6iqnNEIY+F/aFzCKTg= @@ -60,8 +64,6 @@ go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ= go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo= go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so= -golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc= -golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc= golang.org/x/crypto v0.34.0 h1:+/C6tk6rf/+t5DhUketUbD1aNGqiSX3j15Z6xuIDlBA= golang.org/x/crypto v0.34.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ= golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0= @@ -71,8 +73,6 @@ golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= -golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM= golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/openapi.yml b/openapi.yml index c410cf8..822475b 100644 --- a/openapi.yml +++ b/openapi.yml @@ -1,4 +1,4 @@ -openapi: 3.0.0 +openapi: 3.1.0 info: title: Staff and User API version: 1.0.0 From da5b65b58217b7b04abff84fc782b4c46f0bba00 Mon Sep 17 00:00:00 2001 From: Ardeman Date: Thu, 27 Feb 2025 07:25:25 +0800 Subject: [PATCH 2/4] refactor: update module name and adjust import paths to legalgo-BE-go --- cmd/gorm/main.go | 7 ++++--- cmd/legalgo/main.go | 13 +++++++------ config/conf.go | 2 +- database/new_db.go | 3 ++- go.mod | 2 +- internal/accessor/module.go | 11 ++++++----- internal/accessor/staff/create.go | 2 +- internal/accessor/staff/get_all.go | 3 ++- internal/accessor/staff/impl.go | 4 ++-- internal/accessor/subscribe/create.go | 3 ++- internal/accessor/subscribe/impl.go | 2 +- internal/accessor/subscribeplan/create.go | 3 ++- internal/accessor/subscribeplan/get_all.go | 2 +- internal/accessor/subscribeplan/get_default.go | 3 ++- internal/accessor/subscribeplan/impl.go | 4 ++-- internal/accessor/user_repository/create_user.go | 2 +- internal/accessor/user_repository/get_user.go | 3 ++- internal/accessor/user_repository/impl.go | 4 ++-- internal/api/http/auth/login.go | 9 +++++---- internal/api/http/auth/register.go | 9 +++++---- internal/api/http/middleware/auth/authorize.go | 10 +++++----- internal/api/http/router.go | 5 +++-- internal/api/http/subscribe_plan/create.go | 9 +++++---- internal/api/http/subscribe_plan/get_all.go | 5 +++-- internal/config/chi_router.go | 3 ++- internal/services/auth/impl.go | 10 +++++----- internal/services/auth/login_as_staff.go | 4 ++-- internal/services/auth/login_as_user.go | 4 ++-- internal/services/auth/register_staff.go | 5 +++-- internal/services/auth/register_user.go | 5 +++-- internal/services/caching/impl.go | 3 ++- internal/services/caching/set.go | 5 +++-- internal/services/module.go | 7 ++++--- internal/services/subscribe/impl.go | 2 +- internal/services/subscribe_plan/create_plan.go | 2 +- internal/services/subscribe_plan/get_all_plan.go | 2 +- internal/services/subscribe_plan/impl.go | 4 ++-- internal/utilities/utils/jwt.go | 3 ++- 38 files changed, 100 insertions(+), 79 deletions(-) diff --git a/cmd/gorm/main.go b/cmd/gorm/main.go index d1387de..c00b717 100644 --- a/cmd/gorm/main.go +++ b/cmd/gorm/main.go @@ -3,9 +3,10 @@ package main import ( "log" - "github.com/ardeman/project-legalgo-go/config" - "github.com/ardeman/project-legalgo-go/database" - subscribeplandomain "github.com/ardeman/project-legalgo-go/internal/domain/subscribe_plan" + "legalgo-BE-go/config" + "legalgo-BE-go/database" + subscribeplandomain "legalgo-BE-go/internal/domain/subscribe_plan" + "github.com/google/uuid" "github.com/joho/godotenv" ) diff --git a/cmd/legalgo/main.go b/cmd/legalgo/main.go index 41e3d87..af22862 100644 --- a/cmd/legalgo/main.go +++ b/cmd/legalgo/main.go @@ -5,12 +5,13 @@ import ( "fmt" "log" - "github.com/ardeman/project-legalgo-go/config" - "github.com/ardeman/project-legalgo-go/database" - repository "github.com/ardeman/project-legalgo-go/internal/accessor" - internalhttp "github.com/ardeman/project-legalgo-go/internal/api/http" - pkgconfig "github.com/ardeman/project-legalgo-go/internal/config" - "github.com/ardeman/project-legalgo-go/internal/services" + "legalgo-BE-go/config" + "legalgo-BE-go/database" + repository "legalgo-BE-go/internal/accessor" + internalhttp "legalgo-BE-go/internal/api/http" + pkgconfig "legalgo-BE-go/internal/config" + "legalgo-BE-go/internal/services" + "github.com/go-chi/chi/v5" "github.com/joho/godotenv" "go.uber.org/fx" diff --git a/config/conf.go b/config/conf.go index c62bec2..d98d6b5 100644 --- a/config/conf.go +++ b/config/conf.go @@ -1,7 +1,7 @@ package config import ( - "github.com/ardeman/project-legalgo-go/internal/utilities/utils" + "legalgo-BE-go/internal/utilities/utils" ) var ( diff --git a/database/new_db.go b/database/new_db.go index 45d1a71..522b423 100644 --- a/database/new_db.go +++ b/database/new_db.go @@ -3,7 +3,8 @@ package database import ( "fmt" - "github.com/ardeman/project-legalgo-go/config" + "legalgo-BE-go/config" + "gorm.io/driver/postgres" "gorm.io/gorm" ) diff --git a/go.mod b/go.mod index 4859c5c..00986c9 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/ardeman/project-legalgo-go +module legalgo-BE-go go 1.24.0 diff --git a/internal/accessor/module.go b/internal/accessor/module.go index 3be5a3e..6eee042 100644 --- a/internal/accessor/module.go +++ b/internal/accessor/module.go @@ -1,11 +1,12 @@ package repository import ( - redisaccessor "github.com/ardeman/project-legalgo-go/internal/accessor/redis" - staffrepository "github.com/ardeman/project-legalgo-go/internal/accessor/staff" - subscriberepository "github.com/ardeman/project-legalgo-go/internal/accessor/subscribe" - subscribeplanrepository "github.com/ardeman/project-legalgo-go/internal/accessor/subscribeplan" - userrepository "github.com/ardeman/project-legalgo-go/internal/accessor/user_repository" + redisaccessor "legalgo-BE-go/internal/accessor/redis" + staffrepository "legalgo-BE-go/internal/accessor/staff" + subscriberepository "legalgo-BE-go/internal/accessor/subscribe" + subscribeplanrepository "legalgo-BE-go/internal/accessor/subscribeplan" + userrepository "legalgo-BE-go/internal/accessor/user_repository" + "go.uber.org/fx" ) diff --git a/internal/accessor/staff/create.go b/internal/accessor/staff/create.go index 2b416d6..857fc4d 100644 --- a/internal/accessor/staff/create.go +++ b/internal/accessor/staff/create.go @@ -1,6 +1,6 @@ package staffrepository -import authdomain "github.com/ardeman/project-legalgo-go/internal/domain/auth" +import authdomain "legalgo-BE-go/internal/domain/auth" func (ur *StaffRepository) Create(spec *authdomain.Staff) (*authdomain.Staff, error) { if err := ur.DB.Create(&spec).Error; err != nil { diff --git a/internal/accessor/staff/get_all.go b/internal/accessor/staff/get_all.go index bb87ee0..c21df0c 100644 --- a/internal/accessor/staff/get_all.go +++ b/internal/accessor/staff/get_all.go @@ -3,7 +3,8 @@ package staffrepository import ( "errors" - authdomain "github.com/ardeman/project-legalgo-go/internal/domain/auth" + authdomain "legalgo-BE-go/internal/domain/auth" + "gorm.io/gorm" ) diff --git a/internal/accessor/staff/impl.go b/internal/accessor/staff/impl.go index b7c8573..1e3ef6e 100644 --- a/internal/accessor/staff/impl.go +++ b/internal/accessor/staff/impl.go @@ -1,8 +1,8 @@ package staffrepository import ( - "github.com/ardeman/project-legalgo-go/database" - authdomain "github.com/ardeman/project-legalgo-go/internal/domain/auth" + "legalgo-BE-go/database" + authdomain "legalgo-BE-go/internal/domain/auth" ) type StaffRepository struct { diff --git a/internal/accessor/subscribe/create.go b/internal/accessor/subscribe/create.go index a413893..f0867f3 100644 --- a/internal/accessor/subscribe/create.go +++ b/internal/accessor/subscribe/create.go @@ -1,7 +1,8 @@ package subscriberepository import ( - subscribedomain "github.com/ardeman/project-legalgo-go/internal/domain/subscribe" + subscribedomain "legalgo-BE-go/internal/domain/subscribe" + "github.com/google/uuid" ) diff --git a/internal/accessor/subscribe/impl.go b/internal/accessor/subscribe/impl.go index e0bc4c5..6a34b32 100644 --- a/internal/accessor/subscribe/impl.go +++ b/internal/accessor/subscribe/impl.go @@ -1,6 +1,6 @@ package subscriberepository -import "github.com/ardeman/project-legalgo-go/database" +import "legalgo-BE-go/database" type SubsAccs struct { DB *database.DB diff --git a/internal/accessor/subscribeplan/create.go b/internal/accessor/subscribeplan/create.go index 0266133..7ec1b6d 100644 --- a/internal/accessor/subscribeplan/create.go +++ b/internal/accessor/subscribeplan/create.go @@ -1,7 +1,8 @@ package subscribeplanrepository import ( - subscribeplandomain "github.com/ardeman/project-legalgo-go/internal/domain/subscribe_plan" + subscribeplandomain "legalgo-BE-go/internal/domain/subscribe_plan" + "github.com/google/uuid" ) diff --git a/internal/accessor/subscribeplan/get_all.go b/internal/accessor/subscribeplan/get_all.go index 11c1475..c9bf978 100644 --- a/internal/accessor/subscribeplan/get_all.go +++ b/internal/accessor/subscribeplan/get_all.go @@ -1,7 +1,7 @@ package subscribeplanrepository import ( - subscribeplandomain "github.com/ardeman/project-legalgo-go/internal/domain/subscribe_plan" + subscribeplandomain "legalgo-BE-go/internal/domain/subscribe_plan" ) func (s *SubsPlan) GetAll() ([]subscribeplandomain.SubscribePlan, error) { diff --git a/internal/accessor/subscribeplan/get_default.go b/internal/accessor/subscribeplan/get_default.go index 74349cf..5eb8cbf 100644 --- a/internal/accessor/subscribeplan/get_default.go +++ b/internal/accessor/subscribeplan/get_default.go @@ -1,7 +1,8 @@ package subscribeplanrepository import ( - subscribeplandomain "github.com/ardeman/project-legalgo-go/internal/domain/subscribe_plan" + subscribeplandomain "legalgo-BE-go/internal/domain/subscribe_plan" + "github.com/google/uuid" ) diff --git a/internal/accessor/subscribeplan/impl.go b/internal/accessor/subscribeplan/impl.go index f91feeb..6d3dc6c 100644 --- a/internal/accessor/subscribeplan/impl.go +++ b/internal/accessor/subscribeplan/impl.go @@ -1,8 +1,8 @@ package subscribeplanrepository import ( - "github.com/ardeman/project-legalgo-go/database" - subscribeplandomain "github.com/ardeman/project-legalgo-go/internal/domain/subscribe_plan" + "legalgo-BE-go/database" + subscribeplandomain "legalgo-BE-go/internal/domain/subscribe_plan" ) type SubsPlan struct { diff --git a/internal/accessor/user_repository/create_user.go b/internal/accessor/user_repository/create_user.go index d472d27..4a4166c 100644 --- a/internal/accessor/user_repository/create_user.go +++ b/internal/accessor/user_repository/create_user.go @@ -1,7 +1,7 @@ package userrepository import ( - authdomain "github.com/ardeman/project-legalgo-go/internal/domain/auth" + authdomain "legalgo-BE-go/internal/domain/auth" ) func (ur *UserRepository) CreateUser(spec *authdomain.User) (*authdomain.User, error) { diff --git a/internal/accessor/user_repository/get_user.go b/internal/accessor/user_repository/get_user.go index 2c080b5..522c395 100644 --- a/internal/accessor/user_repository/get_user.go +++ b/internal/accessor/user_repository/get_user.go @@ -3,7 +3,8 @@ package userrepository import ( "errors" - authdomain "github.com/ardeman/project-legalgo-go/internal/domain/auth" + authdomain "legalgo-BE-go/internal/domain/auth" + "gorm.io/gorm" ) diff --git a/internal/accessor/user_repository/impl.go b/internal/accessor/user_repository/impl.go index 3a1edbd..8ae5a93 100644 --- a/internal/accessor/user_repository/impl.go +++ b/internal/accessor/user_repository/impl.go @@ -1,8 +1,8 @@ package userrepository import ( - "github.com/ardeman/project-legalgo-go/database" - authdomain "github.com/ardeman/project-legalgo-go/internal/domain/auth" + "legalgo-BE-go/database" + authdomain "legalgo-BE-go/internal/domain/auth" ) type UserRepository struct { diff --git a/internal/api/http/auth/login.go b/internal/api/http/auth/login.go index b8d1146..189dd01 100644 --- a/internal/api/http/auth/login.go +++ b/internal/api/http/auth/login.go @@ -3,10 +3,11 @@ package authhttp import ( "net/http" - authdomain "github.com/ardeman/project-legalgo-go/internal/domain/auth" - authsvc "github.com/ardeman/project-legalgo-go/internal/services/auth" - "github.com/ardeman/project-legalgo-go/internal/utilities/response" - "github.com/ardeman/project-legalgo-go/internal/utilities/utils" + authdomain "legalgo-BE-go/internal/domain/auth" + authsvc "legalgo-BE-go/internal/services/auth" + "legalgo-BE-go/internal/utilities/response" + "legalgo-BE-go/internal/utilities/utils" + "github.com/go-chi/chi/v5" "github.com/go-playground/validator/v10" ) diff --git a/internal/api/http/auth/register.go b/internal/api/http/auth/register.go index fe75cac..58d2201 100644 --- a/internal/api/http/auth/register.go +++ b/internal/api/http/auth/register.go @@ -3,10 +3,11 @@ package authhttp import ( "net/http" - authdomain "github.com/ardeman/project-legalgo-go/internal/domain/auth" - authsvc "github.com/ardeman/project-legalgo-go/internal/services/auth" - "github.com/ardeman/project-legalgo-go/internal/utilities/response" - "github.com/ardeman/project-legalgo-go/internal/utilities/utils" + authdomain "legalgo-BE-go/internal/domain/auth" + authsvc "legalgo-BE-go/internal/services/auth" + "legalgo-BE-go/internal/utilities/response" + "legalgo-BE-go/internal/utilities/utils" + "github.com/go-chi/chi/v5" "github.com/go-playground/validator/v10" ) diff --git a/internal/api/http/middleware/auth/authorize.go b/internal/api/http/middleware/auth/authorize.go index d612a62..3dc5320 100644 --- a/internal/api/http/middleware/auth/authorize.go +++ b/internal/api/http/middleware/auth/authorize.go @@ -6,11 +6,11 @@ package authmiddleware // "net/http" // "strings" -// redisaccessor "github.com/ardeman/project-legalgo-go/internal/accessor/redis" -// contextkeyenum "github.com/ardeman/project-legalgo-go/internal/enums/context_key" -// jwtclaimenum "github.com/ardeman/project-legalgo-go/internal/enums/jwt" -// resourceenum "github.com/ardeman/project-legalgo-go/internal/enums/resource" -// "github.com/ardeman/project-legalgo-go/internal/services/auth" +// redisaccessor "legalgo-BE-go/internal/accessor/redis" +// contextkeyenum "legalgo-BE-go/internal/enums/context_key" +// jwtclaimenum "legalgo-BE-go/internal/enums/jwt" +// resourceenum "legalgo-BE-go/internal/enums/resource" +// "legalgo-BE-go/internal/services/auth" // "github.com/golang-jwt/jwt/v5" // ) diff --git a/internal/api/http/router.go b/internal/api/http/router.go index 79e4617..b98dfc1 100644 --- a/internal/api/http/router.go +++ b/internal/api/http/router.go @@ -1,8 +1,9 @@ package internalhttp import ( - authhttp "github.com/ardeman/project-legalgo-go/internal/api/http/auth" - subscribeplanhttp "github.com/ardeman/project-legalgo-go/internal/api/http/subscribe_plan" + authhttp "legalgo-BE-go/internal/api/http/auth" + subscribeplanhttp "legalgo-BE-go/internal/api/http/subscribe_plan" + "github.com/go-chi/chi/v5" "github.com/go-chi/cors" "github.com/go-playground/validator/v10" diff --git a/internal/api/http/subscribe_plan/create.go b/internal/api/http/subscribe_plan/create.go index e55fa97..dc0f4e4 100644 --- a/internal/api/http/subscribe_plan/create.go +++ b/internal/api/http/subscribe_plan/create.go @@ -3,10 +3,11 @@ package subscribeplanhttp import ( "net/http" - subscribeplandomain "github.com/ardeman/project-legalgo-go/internal/domain/subscribe_plan" - subscribeplansvc "github.com/ardeman/project-legalgo-go/internal/services/subscribe_plan" - "github.com/ardeman/project-legalgo-go/internal/utilities/response" - "github.com/ardeman/project-legalgo-go/internal/utilities/utils" + subscribeplandomain "legalgo-BE-go/internal/domain/subscribe_plan" + subscribeplansvc "legalgo-BE-go/internal/services/subscribe_plan" + "legalgo-BE-go/internal/utilities/response" + "legalgo-BE-go/internal/utilities/utils" + "github.com/go-chi/chi/v5" "github.com/go-playground/validator/v10" ) diff --git a/internal/api/http/subscribe_plan/get_all.go b/internal/api/http/subscribe_plan/get_all.go index 6fcaa3e..d1c5b93 100644 --- a/internal/api/http/subscribe_plan/get_all.go +++ b/internal/api/http/subscribe_plan/get_all.go @@ -3,8 +3,9 @@ package subscribeplanhttp import ( "net/http" - subscribeplansvc "github.com/ardeman/project-legalgo-go/internal/services/subscribe_plan" - "github.com/ardeman/project-legalgo-go/internal/utilities/response" + subscribeplansvc "legalgo-BE-go/internal/services/subscribe_plan" + "legalgo-BE-go/internal/utilities/response" + "github.com/go-chi/chi/v5" ) diff --git a/internal/config/chi_router.go b/internal/config/chi_router.go index d8464bf..7b34bc6 100644 --- a/internal/config/chi_router.go +++ b/internal/config/chi_router.go @@ -8,7 +8,8 @@ import ( "syscall" "time" - "github.com/ardeman/project-legalgo-go/config" + "legalgo-BE-go/config" + "github.com/go-chi/chi/v5" "github.com/sirupsen/logrus" "golang.org/x/sync/errgroup" diff --git a/internal/services/auth/impl.go b/internal/services/auth/impl.go index 419061a..d7c1647 100644 --- a/internal/services/auth/impl.go +++ b/internal/services/auth/impl.go @@ -1,11 +1,11 @@ package authsvc import ( - staffrepository "github.com/ardeman/project-legalgo-go/internal/accessor/staff" - subscriberepository "github.com/ardeman/project-legalgo-go/internal/accessor/subscribe" - subscribeplanrepository "github.com/ardeman/project-legalgo-go/internal/accessor/subscribeplan" - userrepository "github.com/ardeman/project-legalgo-go/internal/accessor/user_repository" - authdomain "github.com/ardeman/project-legalgo-go/internal/domain/auth" + staffrepository "legalgo-BE-go/internal/accessor/staff" + subscriberepository "legalgo-BE-go/internal/accessor/subscribe" + subscribeplanrepository "legalgo-BE-go/internal/accessor/subscribeplan" + userrepository "legalgo-BE-go/internal/accessor/user_repository" + authdomain "legalgo-BE-go/internal/domain/auth" ) type AuthSvc struct { diff --git a/internal/services/auth/login_as_staff.go b/internal/services/auth/login_as_staff.go index ea0c7d3..6ba97fa 100644 --- a/internal/services/auth/login_as_staff.go +++ b/internal/services/auth/login_as_staff.go @@ -3,8 +3,8 @@ package authsvc import ( "errors" - authdomain "github.com/ardeman/project-legalgo-go/internal/domain/auth" - "github.com/ardeman/project-legalgo-go/internal/utilities/utils" + authdomain "legalgo-BE-go/internal/domain/auth" + "legalgo-BE-go/internal/utilities/utils" ) func (sv *AuthSvc) LoginAsStaff(spec authdomain.LoginReq) (string, error) { diff --git a/internal/services/auth/login_as_user.go b/internal/services/auth/login_as_user.go index 8939115..0c23bbb 100644 --- a/internal/services/auth/login_as_user.go +++ b/internal/services/auth/login_as_user.go @@ -3,8 +3,8 @@ package authsvc import ( "errors" - authdomain "github.com/ardeman/project-legalgo-go/internal/domain/auth" - "github.com/ardeman/project-legalgo-go/internal/utilities/utils" + authdomain "legalgo-BE-go/internal/domain/auth" + "legalgo-BE-go/internal/utilities/utils" ) func (a *AuthSvc) LoginAsUser(spec authdomain.LoginReq) (string, error) { diff --git a/internal/services/auth/register_staff.go b/internal/services/auth/register_staff.go index bc40417..3122f0e 100644 --- a/internal/services/auth/register_staff.go +++ b/internal/services/auth/register_staff.go @@ -3,8 +3,9 @@ package authsvc import ( "errors" - authdomain "github.com/ardeman/project-legalgo-go/internal/domain/auth" - "github.com/ardeman/project-legalgo-go/internal/utilities/utils" + authdomain "legalgo-BE-go/internal/domain/auth" + "legalgo-BE-go/internal/utilities/utils" + "github.com/google/uuid" ) diff --git a/internal/services/auth/register_user.go b/internal/services/auth/register_user.go index a48f793..f5f3372 100644 --- a/internal/services/auth/register_user.go +++ b/internal/services/auth/register_user.go @@ -3,8 +3,9 @@ package authsvc import ( "errors" - authdomain "github.com/ardeman/project-legalgo-go/internal/domain/auth" - "github.com/ardeman/project-legalgo-go/internal/utilities/utils" + authdomain "legalgo-BE-go/internal/domain/auth" + "legalgo-BE-go/internal/utilities/utils" + "github.com/google/uuid" ) diff --git a/internal/services/caching/impl.go b/internal/services/caching/impl.go index 45633d6..3dfe73e 100644 --- a/internal/services/caching/impl.go +++ b/internal/services/caching/impl.go @@ -3,7 +3,8 @@ package cachingsvc import ( "context" - cachingdomain "github.com/ardeman/project-legalgo-go/internal/domain/caching" + cachingdomain "legalgo-BE-go/internal/domain/caching" + "github.com/redis/go-redis/v9" ) diff --git a/internal/services/caching/set.go b/internal/services/caching/set.go index 894c1c7..73ea836 100644 --- a/internal/services/caching/set.go +++ b/internal/services/caching/set.go @@ -4,8 +4,9 @@ import ( "context" "encoding/json" - cachingdomain "github.com/ardeman/project-legalgo-go/internal/domain/caching" - "github.com/ardeman/project-legalgo-go/internal/utilities/response" + cachingdomain "legalgo-BE-go/internal/domain/caching" + "legalgo-BE-go/internal/utilities/response" + "github.com/sirupsen/logrus" ) diff --git a/internal/services/module.go b/internal/services/module.go index ee2acf7..db66a28 100644 --- a/internal/services/module.go +++ b/internal/services/module.go @@ -1,9 +1,10 @@ package services import ( - serviceauth "github.com/ardeman/project-legalgo-go/internal/services/auth" - subscribesvc "github.com/ardeman/project-legalgo-go/internal/services/subscribe" - subscribeplansvc "github.com/ardeman/project-legalgo-go/internal/services/subscribe_plan" + serviceauth "legalgo-BE-go/internal/services/auth" + subscribesvc "legalgo-BE-go/internal/services/subscribe" + subscribeplansvc "legalgo-BE-go/internal/services/subscribe_plan" + "go.uber.org/fx" ) diff --git a/internal/services/subscribe/impl.go b/internal/services/subscribe/impl.go index 2a1881a..413003b 100644 --- a/internal/services/subscribe/impl.go +++ b/internal/services/subscribe/impl.go @@ -1,6 +1,6 @@ package subscribesvc -import subscriberepository "github.com/ardeman/project-legalgo-go/internal/accessor/subscribe" +import subscriberepository "legalgo-BE-go/internal/accessor/subscribe" type SubsSvc struct { subsRepo subscriberepository.SubsIntf diff --git a/internal/services/subscribe_plan/create_plan.go b/internal/services/subscribe_plan/create_plan.go index 013da13..5185f87 100644 --- a/internal/services/subscribe_plan/create_plan.go +++ b/internal/services/subscribe_plan/create_plan.go @@ -1,6 +1,6 @@ package subscribeplansvc -import subscribeplandomain "github.com/ardeman/project-legalgo-go/internal/domain/subscribe_plan" +import subscribeplandomain "legalgo-BE-go/internal/domain/subscribe_plan" func (sb *SubsPlanSvc) CreatePlan(spec subscribeplandomain.SubscribePlanReq) error { return sb.subsAccs.Create(spec) diff --git a/internal/services/subscribe_plan/get_all_plan.go b/internal/services/subscribe_plan/get_all_plan.go index b55daad..8d2cfe8 100644 --- a/internal/services/subscribe_plan/get_all_plan.go +++ b/internal/services/subscribe_plan/get_all_plan.go @@ -1,7 +1,7 @@ package subscribeplansvc import ( - subscribeplandomain "github.com/ardeman/project-legalgo-go/internal/domain/subscribe_plan" + subscribeplandomain "legalgo-BE-go/internal/domain/subscribe_plan" ) func (s *SubsPlanSvc) GetAllPlan() ([]subscribeplandomain.SubscribePlan, error) { diff --git a/internal/services/subscribe_plan/impl.go b/internal/services/subscribe_plan/impl.go index 4f1b0b3..a63f4a3 100644 --- a/internal/services/subscribe_plan/impl.go +++ b/internal/services/subscribe_plan/impl.go @@ -1,8 +1,8 @@ package subscribeplansvc import ( - subscribeplanrepository "github.com/ardeman/project-legalgo-go/internal/accessor/subscribeplan" - subscribeplandomain "github.com/ardeman/project-legalgo-go/internal/domain/subscribe_plan" + subscribeplanrepository "legalgo-BE-go/internal/accessor/subscribeplan" + subscribeplandomain "legalgo-BE-go/internal/domain/subscribe_plan" ) type SubsPlanSvc struct { diff --git a/internal/utilities/utils/jwt.go b/internal/utilities/utils/jwt.go index 22787ec..399834d 100644 --- a/internal/utilities/utils/jwt.go +++ b/internal/utilities/utils/jwt.go @@ -3,7 +3,8 @@ package utils import ( "time" - timeutils "github.com/ardeman/project-legalgo-go/internal/utilities/time_utils" + timeutils "legalgo-BE-go/internal/utilities/time_utils" + "github.com/golang-jwt/jwt/v5" ) From 14f38b792dc3243bb9914ad7ec3d867ee5b50d0d Mon Sep 17 00:00:00 2001 From: Ardeman Date: Thu, 27 Feb 2025 10:20:55 +0800 Subject: [PATCH 3/4] chore: add markdownlint configuration and update README for installation instructions --- .markdownlint.json | 8 ++++++++ README.md | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 .markdownlint.json diff --git a/.markdownlint.json b/.markdownlint.json new file mode 100644 index 0000000..f817d8f --- /dev/null +++ b/.markdownlint.json @@ -0,0 +1,8 @@ +{ + "default": true, + "MD013": false, + "MD026": false, + "MD033": false, + "MD040": false, + "MD041": false +} diff --git a/README.md b/README.md index 2d40cfe..0ebab3b 100644 --- a/README.md +++ b/README.md @@ -10,31 +10,40 @@ Before proceeding, make sure you have the following installed on your computer: ## Steps to Install Go 1.24.0 ### For Windows: + 1. Download the installer from [official Go website](https://golang.org/dl/). 2. Run the downloaded `.msi` file and follow the installation wizard. 3. During installation, you may be prompted to set the `GOPATH` and `GOROOT`. Choose the appropriate settings based on your preference or keep the default values. ### For macOS: + 1. Open Terminal. 2. Download the package using Homebrew (if not installed, visit [Homebrew website](https://brew.sh/) for installation instructions): + ```bash brew install go@1.24 ``` + 3. Link the installed version to your PATH: + ```bash brew link --overwrite --force go@1.24 ``` ### For Linux: + 1. Open Terminal. 2. Download the appropriate tarball from [official Go website](https://golang.org/dl/). 3. Extract the downloaded archive: + ```bash tar -C /usr/local -xzf go1.24.linux-amd64.tar.gz ``` + 4. Add Go to your PATH by editing your shell configuration file (e.g., `.bashrc`, `.zshrc`): + ```bash echo 'export PATH=$PATH:/usr/local/go/bin' >> ~/.bashrc source ~/.bashrc @@ -43,18 +52,22 @@ installation instructions): ## Verify Installation After installation, verify that Go 1.24.0 is installed correctly by running: + ```bash go version ``` + You should see an output like `go version go1.24 darwin/amd64` (or similar, depending on your OS). ## Install Make (if not already installed) ### For Windows: + - Download and install [Make for Windows](http://gnuwin32.sourceforge.net/packages/make.htm). - Add the installation directory to your PATH. ### For macOS: + 1. Open Terminal. 2. Install Make using Homebrew: ```bash @@ -62,6 +75,7 @@ You should see an output like `go version go1.24 darwin/amd64` (or similar, depe ``` ### For Linux: + Make is usually pre-installed on most Linux distributions. If it's not installed, you can install it using your package manager (e.g., `sudo apt-get install make` for Ubuntu). @@ -72,6 +86,7 @@ Open Terminal and navigate to the root directory of your Go project. ## Resolve Dependencies with `go mod tidy` Run the following command to download and resolve all dependencies specified in your `go.mod` file: + ```bash go mod tidy ``` @@ -79,6 +94,7 @@ go mod tidy ## Setup Database In your Go application, you'll need to set the following environment variables to connect to your database: + ```bash DB_HOST: The hostname or IP address of your database server (e.g., localhost, 127.0.0.1, or the actual DB server URL). DB_USER: The username for your database connection. @@ -103,6 +119,7 @@ Make sure to replace the values with your actual database details. ## Build the Binary Using `make build` Run the following command to build your project. The binary will be placed in the `bin` folder. + ```bash make build ``` @@ -110,6 +127,7 @@ make build ## Run the Program Using `make run` Finally, you can run your program using: + ```bash make run ``` @@ -120,6 +138,7 @@ This command will compile and execute your Go application. **Note:** Ensure that your `Makefile` is correctly set up to handle these commands. If not, you may need to create or adjust it accordingly. + ``` Please follow the above instructions to set up Go version 1.24.0, manage dependencies using `go mod tidy`, build a From 802692f6c11b307c92c47d8f4cb2dade32e8c919 Mon Sep 17 00:00:00 2001 From: Ardeman Date: Thu, 27 Feb 2025 10:23:24 +0800 Subject: [PATCH 4/4] docs: update installation instructions for Go and Make across platforms --- README.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 0ebab3b..5f0e21e 100644 --- a/README.md +++ b/README.md @@ -9,14 +9,14 @@ Before proceeding, make sure you have the following installed on your computer: ## Steps to Install Go 1.24.0 -### For Windows: +### `go` For Windows: 1. Download the installer from [official Go website](https://golang.org/dl/). 2. Run the downloaded `.msi` file and follow the installation wizard. 3. During installation, you may be prompted to set the `GOPATH` and `GOROOT`. Choose the appropriate settings based on your preference or keep the default values. -### For macOS: +### `go` For macOS: 1. Open Terminal. 2. Download the package using Homebrew (if not installed, visit [Homebrew website](https://brew.sh/) for @@ -32,7 +32,7 @@ installation instructions): brew link --overwrite --force go@1.24 ``` -### For Linux: +### `go` For Linux: 1. Open Terminal. 2. Download the appropriate tarball from [official Go website](https://golang.org/dl/). @@ -61,20 +61,21 @@ You should see an output like `go version go1.24 darwin/amd64` (or similar, depe ## Install Make (if not already installed) -### For Windows: +### `make` For Windows: - Download and install [Make for Windows](http://gnuwin32.sourceforge.net/packages/make.htm). - Add the installation directory to your PATH. -### For macOS: +### `make` For macOS: 1. Open Terminal. 2. Install Make using Homebrew: + ```bash brew install make ``` -### For Linux: +### `make` For Linux: Make is usually pre-installed on most Linux distributions. If it's not installed, you can install it using your package manager (e.g., `sudo apt-get install make` for Ubuntu).