Dev/refactor 2

.github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go-version: ["1.19.x", "1.20.x", "1.21.x"]
+        go-version: ["1.20.x", "1.21.x"]
 
     steps:
       - uses: actions/checkout@v3

.github/workflows/test.yml

@@ -60,6 +60,7 @@ jobs:
       - name: Run migration
         run: |
           go run database/migration/main.go
+          sleep 3s
 
       - name: Run Test
         run: go test -race ./...

README.md

@@ -40,3 +40,7 @@ Techs and tools were used in this project:
 This project is under license from MIT. For more details, see the [LICENSE](LICENSE) file.
 
  
+
+## Todo
+
+- Add password and password confirm at DeleteProfile (permanent) by User

application/app.go

@@ -1,17 +1,12 @@
-// 📌 Origin Github Repository: https://github.com/Lukmanern<slash>gost
-
-// 🔍 README
-// Application package configures middleware, error management, and
-// handles OS signals for gracefully stopping the server when receiving
-// an interrupt signal. This package provides routes related to user
-// management and role-based access control (RBAC). And so on.
+// 📌 Origin Github Repository: https://github.com/Lukmanern
 
 package application
 
 import (
 	"errors"
 	"fmt"
 	"log"
+	"net"
 	"os"
 	"os/signal"
 	"time"
@@ -73,8 +68,17 @@ func setup() {
 	connector.LoadRedisCache()
 }
 
+func checkLocalPort(port int) {
+	listener, err := net.Listen("tcp", fmt.Sprintf(":%d", port))
+	if err != nil {
+		log.Fatal("port is being used by other process")
+	}
+	defer listener.Close()
+}
+
 func RunApp() {
 	setup()
+	checkLocalPort(port)
 	router.Use(cors.New(cors.Config{
 		AllowCredentials: true,
 	}))
@@ -109,10 +113,8 @@ func RunApp() {
 		close(idleConnsClosed)
 	}()
 
-	getUserManagementRoutes(router) // user CRUD without auth ⚠️
-	getDevopmentRouter(router)      // experimental without auth ⚠️
-	getUserRoutes(router)           // user with auth
-	getRolePermissionRoutes(router) // RBAC CRUD with auth
+	getUserRoutes(router)
+	getRolePermissionRoutes(router)
 
 	if err := router.Listen(fmt.Sprintf(":%d", port)); err != nil {
 		log.Printf("Oops... Server is not running! Reason: %v", err)

application/role_router.go

@@ -0,0 +1,32 @@
+// 📌 Origin Github Repository: https://github.com/Lukmanern
+
+package application
+
+import (
+	"github.com/gofiber/fiber/v2"
+
+	"github.com/Lukmanern/gost/internal/middleware"
+	"github.com/Lukmanern/gost/internal/role"
+
+	controller "github.com/Lukmanern/gost/controller/role"
+	service "github.com/Lukmanern/gost/service/role"
+)
+
+var (
+	roleService    service.RoleService
+	roleController controller.RoleController
+)
+
+func getRolePermissionRoutes(router fiber.Router) {
+	jwtHandler := middleware.NewJWTHandler()
+
+	roleService = service.NewRoleService()
+	roleController = controller.NewRoleController(roleService)
+
+	roleRouter := router.Group("role").Use(jwtHandler.IsAuthenticated)
+	roleRouter.Post("", jwtHandler.HasOneRole(role.RoleSuperAdmin, role.RoleAdmin), roleController.Create)
+	roleRouter.Get("", jwtHandler.HasOneRole(role.RoleSuperAdmin, role.RoleAdmin), roleController.GetAll)
+	roleRouter.Get(":id", jwtHandler.HasOneRole(role.RoleSuperAdmin, role.RoleAdmin), roleController.Get)
+	roleRouter.Put(":id", jwtHandler.HasOneRole(role.RoleSuperAdmin, role.RoleAdmin), roleController.Update)
+	roleRouter.Delete(":id", jwtHandler.HasOneRole(role.RoleSuperAdmin, role.RoleAdmin), roleController.Delete)
+}

application/user_router.go

@@ -1,50 +1,43 @@
-// 📌 Origin Github Repository: https://github.com/Lukmanern<slash>gost
-
-// 🔍 README
-// User Routes provides some features and action that user can use.
-// User Routes provide the typical web application authentication flow,
-// such as registration, sending verification codes, and verifying accounts
-// with a verification code.
+// 📌 Origin Github Repository: https://github.com/Lukmanern
 
 package application
 
 import (
 	"github.com/gofiber/fiber/v2"
 
 	"github.com/Lukmanern/gost/internal/middleware"
+	"github.com/Lukmanern/gost/internal/role"
 
 	controller "github.com/Lukmanern/gost/controller/user"
 	service "github.com/Lukmanern/gost/service/user"
-
-	permSvc "github.com/Lukmanern/gost/service/permission"
-	roleSvc "github.com/Lukmanern/gost/service/role"
 )
 
 var (
-	userPermService permSvc.PermissionService
-	userRoleService roleSvc.RoleService
-	userService     service.UserService
-	userController  controller.UserController
+	userService    service.UserService
+	userController controller.UserController
 )
 
 func getUserRoutes(router fiber.Router) {
-	userPermService = permSvc.NewPermissionService()
-	userRoleService = roleSvc.NewRoleService(userPermService)
-	userService = service.NewUserService(userRoleService)
-	userController = controller.NewUserController(userService)
 	jwtHandler := middleware.NewJWTHandler()
 
+	userService = service.NewUserService()
+	userController = controller.NewUserController(userService)
+
 	userRoute := router.Group("user")
+	userRoute.Post("register", userController.Register) // send email
+	userRoute.Post("account-activation", userController.AccountActivation)
 	userRoute.Post("login", userController.Login)
-	userRoute.Post("register", userController.Register)
-	userRoute.Post("verification", userController.AccountActivation)
-	userRoute.Post("request-delete", userController.DeleteAccountActivation)
-	userRoute.Post("forget-password", userController.ForgetPassword)
+	userRoute.Post("forget-password", userController.ForgetPassword) // send email
 	userRoute.Post("reset-password", userController.ResetPassword)
 
 	userRouteAuth := userRoute.Use(jwtHandler.IsAuthenticated)
-	userRouteAuth.Post("logout", userController.Logout)
 	userRouteAuth.Get("my-profile", userController.MyProfile)
+	userRouteAuth.Post("logout", userController.Logout)
 	userRouteAuth.Put("profile-update", userController.UpdateProfile)
 	userRouteAuth.Post("update-password", userController.UpdatePassword)
+	userRouteAuth.Delete("delete-account", userController.DeleteAccount)
+
+	// for admin
+	userRouteAuth.Get("", jwtHandler.HasOneRole(role.RoleSuperAdmin, role.RoleAdmin), userController.GetAll)
+	userRouteAuth.Put("ban-user/:id", jwtHandler.HasOneRole(role.RoleSuperAdmin, role.RoleAdmin), userController.BanAccount)
 }