From ff445db1a6c864b77f828964cc53acd9213d44f2 Mon Sep 17 00:00:00 2001
From: Pavel <pashamullin202@gmail.com>
Date: Wed, 29 May 2024 11:28:25 +0300
Subject: [PATCH] separate for to servers user and admin controllers

---
 internal/app/app_verification.go   |  20 ++++++++++++++++----
 internal/app/shutdown.go           |   8 +++++---
 internal/config/config.go          |   3 ++-
 recover.bolt                       | Bin 65536 -> 0 bytes
 test.env                           |   3 ++-
 tests/e2e/get_verify_admin_test.go |   4 ++--
 6 files changed, 27 insertions(+), 11 deletions(-)
 delete mode 100644 recover.bolt

diff --git a/internal/app/app_verification.go b/internal/app/app_verification.go
index a29e0c0..f626364 100644
--- a/internal/app/app_verification.go
+++ b/internal/app/app_verification.go
@@ -98,17 +98,29 @@ func Run(cfg *config.Config, build Build) {
 		CustomerServiceHost: cfg.CustomerRPCHost,
 	}))
 
-	httpSrv := server.NewHTTP(server.ServerConfig{
+	userSrv := server.NewHTTP(server.ServerConfig{
 		Logger:      logger,
-		Controllers: []server.Controller{cons.VerificationUser, cons.VerificationAdmin},
+		Controllers: []server.Controller{cons.VerificationUser},
+		HLogger:     loggerHlog,
+	})
+
+	adminSrv := server.NewHTTP(server.ServerConfig{
+		Logger:      logger,
+		Controllers: []server.Controller{cons.VerificationAdmin},
 		HLogger:     loggerHlog,
 	})
 
 	go func() {
-		if err := httpSrv.Start(cfg.HttpAddress); err != nil {
+		if err := userSrv.Start(cfg.HttpAddressUser); err != nil {
 			logger.Fatal("Server startup error", zap.Error(err))
 		}
 	}()
 
-	gracefulShutdown(ctx, logger, httpSrv, mongoDB)
+	go func() {
+		if err := adminSrv.Start(cfg.HttpAddressAdmin); err != nil {
+			logger.Fatal("Server startup error", zap.Error(err))
+		}
+	}()
+
+	gracefulShutdown(ctx, logger, []*server.Server{userSrv, adminSrv}, mongoDB)
 }
diff --git a/internal/app/shutdown.go b/internal/app/shutdown.go
index 0764770..dd76d4f 100644
--- a/internal/app/shutdown.go
+++ b/internal/app/shutdown.go
@@ -10,7 +10,7 @@ import (
 	"syscall"
 )
 
-func gracefulShutdown(ctx context.Context, logger *zap.Logger, httpSrv *server.Server, mongoDB *mongo.Database) {
+func gracefulShutdown(ctx context.Context, logger *zap.Logger, httpSrvs []*server.Server, mongoDB *mongo.Database) {
 	interrupt := make(chan os.Signal, 1)
 	signal.Notify(interrupt, os.Interrupt, syscall.SIGTERM)
 	killSignal := <-interrupt
@@ -21,8 +21,10 @@ func gracefulShutdown(ctx context.Context, logger *zap.Logger, httpSrv *server.S
 		logger.Info("AppTerminated")
 	}
 
-	if err := httpSrv.Shutdown(ctx); err != nil {
-		logger.Error("HttpServerShutdown", zap.Error(err))
+	for _, srv := range httpSrvs {
+		if err := srv.Shutdown(ctx); err != nil {
+			logger.Error("HttpServerShutdown", zap.Error(err))
+		}
 	}
 
 	if err := mongoDB.Client().Disconnect(ctx); err != nil {
diff --git a/internal/config/config.go b/internal/config/config.go
index 3aadbd2..c39555f 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -8,7 +8,8 @@ import (
 type Config struct {
 	TelegramToken      string `env:"TELEGRAM_TOKEN,required"`
 	TelegramChannelID  int64  `env:"TELEGRAM_CHANNEL_ID,required"`
-	HttpAddress        string `env:"HTTP_ADDRESS,required"`
+	HttpAddressUser    string `env:"HTTP_ADDRESS_USER,required"`
+	HttpAddressAdmin   string `env:"HTTP_ADDRESS_ADMIN,required"`
 	MongoHost          string `env:"MONGO_HOST,required"`
 	MongoPort          string `env:"MONGO_PORT,required"`
 	MongoUser          string `env:"MONGO_USER,required"`
diff --git a/recover.bolt b/recover.bolt
deleted file mode 100644
index 0187664970b423dc777dc9567c8bc8b8a7abdc15..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 65536
zcmeI)J#X7a7{Kv6*^;7|X+1STr)-&Ql8PnSL58#j0;Eos+ARtM9w_o85fVv(JQ+5E
zAnpqSq(Htyzd?Y^{R|xov{OGojgIY5R6R;Opo4<~nGE|cLAqCx4}Y?U({r{E%g1U}
zp8e{a)yn$%vSU%N#>!%)s$Z+h@2hgu`~9~+&VFfDO$r1MKmY**5I_I{1Q0*~0R#}Z
zKmxLg<z4H4+iydzR~5Vde^s^jzB=~PS9`9VM~MIe2q1s}0tg_000IagfB*s)N5JOy
zYhw9LK>1##{>w!EZS%@im>sFy)Xsg_!_OV069EJeKmY**5I_I{1Q0*~0R%3FfZfl(
zE|!^ooA0-I{zerh8~ZQD=S36<Ab<b@2q1s}0tg_000IcSkAPk8pO^pt(Pa1kH~(+{
zfMB_8z%enLn!^SMKOO%3^8TG4{tVyF-@I6nvhlguNsvc!ek!CR>yOounn*{;+QGhT
z2-$q1iXs@Qva9hVi)Irg=idl<eP0LRSm!~w7;5dQlZUaIM1`DxCuD0^AOEN6>>q`n
z&f-aQ5GSfU>vhxdrOJyqOUo0tOmjC&l316mrfEHl&2_5!<2Wr365^xz*EK1xJv}UR
z9;d@a9OlOE%)ecg@@5iDpDqUu<5a7BU_!h7?D--dN1DA8|H#+#Q@I+agG~NiLdaW>
zOx?s058^P;CYVpcP))Upq;$;Yig<9cG0DPUQd?<_)k&cPJu4c^YdCeWl8&>oKgyCI
zPHq3X_+W9&C@b{6ZExFankmyjkL-jG#SM3H^6Hv$buHA#vqI(5EZ25cQ`Eb6yS?qY
z8H*#^`?0vy?RK`pp4thbp6~VB!Hz#r-A<?+Gf@Y}=`881+|Iut);!PKs9vq=I`Pzw
zuZfo5?rnPJ>6a#dy{t7m+g;D^cje*kJ@*R}RpCy9VidT;%$<&hZjwdrFxI14e>2Py
zSC3Q@jLTW0Nj7|NRG!M)XnX#S-}XBGmbcUHY_#uol&7}(K@<&KGi`I2$<N;Bw}N93
zKmY**5I_I{1Q0*~fy*ag^ZYjdZ#VSYeF5bEFW+a*9U*`K0tg_000IagfB*srTs;B1
zzF)8Yv%lRBV80h&-~ZM7nc$8QKmY**5I_I{1Q0*~0R%3efL-6)_5Zu_|CjI1xg!J+
zKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~
z0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**
z5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0
Y009ILKmY**5I_I{1Q0*~fvY6&FBC)H4gdfE

diff --git a/test.env b/test.env
index 83ebd06..6a89eaf 100644
--- a/test.env
+++ b/test.env
@@ -1,6 +1,7 @@
 TELEGRAM_TOKEN=6712573453:AAFbioUuXf0Te73MUCqa0_h09qEQ1iQREas
 TELEGRAM_CHANNEL_ID=542073142
-HTTP_ADDRESS=0.0.0.0:8080
+HTTP_ADDRESS_USER=0.0.0.0:8080
+HTTP_ADDRESS_ADMIN=0.0.0.0:8081
 MONGO_HOST=localhost
 MONGO_PORT=27020
 MONGO_USER=test
diff --git a/tests/e2e/get_verify_admin_test.go b/tests/e2e/get_verify_admin_test.go
index e353111..4e3eca8 100644
--- a/tests/e2e/get_verify_admin_test.go
+++ b/tests/e2e/get_verify_admin_test.go
@@ -11,7 +11,7 @@ import (
 )
 
 func Test_GetVerifyAdmin(t *testing.T) {
-	url := "http://localhost:8080/verification/64e53ed187392e122e5d3d50"
+	url := "http://localhost:8081/verification/64e53ed187392e122e5d3d50"
 	client := fiber.AcquireClient()
 
 	token, err := helpers.CreateJwt("64e53ed187392e122e5d3d51")
@@ -31,7 +31,7 @@ func Test_GetVerifyAdmin(t *testing.T) {
 	assert.NoError(t, err)
 	fmt.Println(resp)
 
-	url = "http://localhost:8080/verification"
+	url = "http://localhost:8081/verification"
 	client2 := fiber.AcquireClient()
 
 	req := models.ReqSetVerification{