diff --git a/e2e/cypress/e2e/users/register.cy.js b/e2e/cypress/e2e/users/register.cy.js index 1a61c7da..dff8c83a 100644 --- a/e2e/cypress/e2e/users/register.cy.js +++ b/e2e/cypress/e2e/users/register.cy.js @@ -61,7 +61,7 @@ describe("user auth and registration flow", () => { cy.visit("http://localhost:3200/users"); cy.get("tbody tr").should("have.length", 2); - cy.get("tbody tr").should("contain.text", "TestNew UserNew"); + cy.get("tbody tr").should("contain.text", "TestNew UserNew MidNew"); cy.get("tbody tr").should("contain.text", "test1new@gmail.com"); cy.visit("http://localhost:3200/logout"); diff --git a/modules/core/domain/aggregates/user/user_dto.go b/modules/core/domain/aggregates/user/user_dto.go index aee69c92..b6be1fd9 100644 --- a/modules/core/domain/aggregates/user/user_dto.go +++ b/modules/core/domain/aggregates/user/user_dto.go @@ -3,9 +3,10 @@ package user import ( "context" "fmt" - "github.com/nicksnyder/go-i18n/v2/i18n" "time" + "github.com/nicksnyder/go-i18n/v2/i18n" + "github.com/go-playground/validator/v10" "github.com/iota-uz/iota-sdk/modules/core/domain/aggregates/role" "github.com/iota-uz/iota-sdk/pkg/constants" @@ -14,6 +15,7 @@ import ( type CreateDTO struct { FirstName string `validate:"required"` LastName string `validate:"required"` + MiddleName string `validate:"required"` Email string `validate:"required,email"` Password string RoleIDs []uint `validate:"required"` @@ -24,6 +26,7 @@ type CreateDTO struct { type UpdateDTO struct { FirstName string `validate:"required"` LastName string `validate:"required"` + MiddleName string `validate:"required"` Email string `validate:"required,email"` Password string RoleIDs []uint @@ -95,6 +98,7 @@ func (u *CreateDTO) ToEntity() (User, error) { return &user{ firstName: u.FirstName, lastName: u.LastName, + middleName: u.MiddleName, email: u.Email, roles: roles, password: u.Password, @@ -120,6 +124,7 @@ func (u *UpdateDTO) ToEntity(id uint) (User, error) { return &user{ id: id, firstName: u.FirstName, + middleName: u.MiddleName, lastName: u.LastName, email: u.Email, roles: roles,