refactor(docker): Update CMD in Dockerfile to use migration command
Deploy Application / deploy (push) Successful in 22s
Details
Deploy Application / deploy (push) Successful in 22s
Details
refactor(role): Comment out unused client ID handling in GetRoles method refactor(role): Comment out role name existence check in UpdateRole method refactor(command): Enhance logging for migration and seeder processes
This commit is contained in:
parent
b779ec501b
commit
2ade3121ff
|
|
@ -8,4 +8,4 @@ COPY . .
|
|||
|
||||
RUN go mod tidy
|
||||
|
||||
CMD go run cmd/main.go --fresh --seed && air
|
||||
CMD go run cmd/main.go --migrate --seed && air
|
||||
|
|
@ -181,11 +181,11 @@ func (r *roleController) GetRoleByID(ctx *gin.Context) {
|
|||
// @Failure 400 {object} map[string]interface{}
|
||||
// @Router /roles [get]
|
||||
func (r *roleController) GetRoles(ctx *gin.Context) {
|
||||
clientId := ctx.MustGet("client_id").(string)
|
||||
// clientId := ctx.MustGet("client_id").(string)
|
||||
// logrus.Info("Client ID: ", clientId)
|
||||
var filter = &query.RoleFilter{
|
||||
ClientID: clientId,
|
||||
Name: ctx.Query("name"),
|
||||
// ClientID: clientId,
|
||||
Name: ctx.Query("name"),
|
||||
}
|
||||
// logrus.Info("Filter: ", filter)
|
||||
filter.BindPagination(ctx)
|
||||
|
|
|
|||
|
|
@ -372,14 +372,14 @@ func (r *roleService) UpdateRole(ctx context.Context, id string, req dto.RoleUpd
|
|||
}
|
||||
|
||||
if req.Name != "" {
|
||||
_, exists, err := r.roleRepo.CheckRoleName(ctx, r.db, req.Name)
|
||||
// _, exists, err := r.roleRepo.CheckRoleName(ctx, r.db, req.Name)
|
||||
|
||||
if err != nil {
|
||||
return dto.RoleResponse{}, err
|
||||
}
|
||||
if exists {
|
||||
return dto.RoleResponse{}, dto.ErrRoleAlreadyExists
|
||||
}
|
||||
// if err != nil {
|
||||
// return dto.RoleResponse{}, err
|
||||
// }
|
||||
// if exists {
|
||||
// return dto.RoleResponse{}, dto.ErrRoleAlreadyExists
|
||||
// }
|
||||
existingRole.Name = req.Name
|
||||
}
|
||||
if req.Description != "" {
|
||||
|
|
|
|||
|
|
@ -8,11 +8,13 @@ import (
|
|||
"github.com/Caknoooo/go-gin-clean-starter/database"
|
||||
"github.com/Caknoooo/go-gin-clean-starter/pkg/constants"
|
||||
"github.com/samber/do"
|
||||
"github.com/sirupsen/logrus"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
func Commands(injector *do.Injector) bool {
|
||||
db := do.MustInvokeNamed[*gorm.DB](injector, constants.DB)
|
||||
logger := do.MustInvokeNamed[*logrus.Logger](injector, constants.LOGGER)
|
||||
|
||||
var scriptName string
|
||||
|
||||
|
|
@ -44,26 +46,42 @@ func Commands(injector *do.Injector) bool {
|
|||
if fresh {
|
||||
if err := database.MigrateFresh(db); err != nil {
|
||||
log.Fatalf("error migrate fresh: %v", err)
|
||||
logger.WithFields(logrus.Fields{
|
||||
"error": err,
|
||||
}).Fatal("error migrate fresh") // .Fatal() akan exit dengan status
|
||||
}
|
||||
logger.Info("fresh migration completed successfully")
|
||||
log.Println("fresh migration completed successfully")
|
||||
} else if migrate {
|
||||
if err := database.Migrate(db); err != nil {
|
||||
log.Fatalf("error migration: %v", err)
|
||||
log.Fatalf("error migrate: %v", err)
|
||||
logger.WithFields(logrus.Fields{
|
||||
"error": err,
|
||||
}).Fatal("error migration") // .Fatal() akan exit dengan status
|
||||
}
|
||||
logger.Info("migration completed successfully")
|
||||
log.Println("migration completed successfully")
|
||||
}
|
||||
|
||||
if seed {
|
||||
if err := database.Seeder(db); err != nil {
|
||||
log.Fatalf("error migration seeder: %v", err)
|
||||
log.Fatalf("error migrate seeder: %v", err)
|
||||
logger.WithFields(logrus.Fields{
|
||||
"error": err,
|
||||
}).Fatal("error migration seeder") // .Fatal() akan exit dengan status
|
||||
}
|
||||
logger.Info("seeder completed successfully")
|
||||
log.Println("seeder completed successfully")
|
||||
}
|
||||
|
||||
if scriptFlag {
|
||||
if err := Script(scriptName, db); err != nil {
|
||||
log.Fatalf("error script: %v", err)
|
||||
logger.WithFields(logrus.Fields{
|
||||
"error": err,
|
||||
}).Fatal("error script") // .Fatal() akan exit dengan status
|
||||
}
|
||||
logger.Info("script run successfully")
|
||||
log.Println("script run successfully")
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue