Added email and company to user

camba1 · May 31, 2020 · c3ae8ee · c3ae8ee
1 parent 75fb0c0
commit c3ae8ee
Show file tree

Hide file tree

Showing 7 changed files with 401 additions and 103 deletions.
diff --git a/user/client/userClient.go b/user/client/userClient.go
@@ -30,6 +30,8 @@ func CreateUser(srvClient pb.UserSrvService) (*pb.User, error) {
  ValidThru: validThru,
  Active: true,
  Pwd: "1234",
+ Email: "[email protected]",
+ Company: "Tiny",
  }
 
  //if serverAddress != "" {
@@ -57,6 +59,8 @@ func UpdateUser(srvClient pb.UserSrvService, user *pb.User) (*pb.User, error) {
  user.ValidThru = validThru
  user.Active = false
  user.Pwd = "5678"
+ user.Email = "[email protected]"
+ user.Company = "Tiny"
 
  //if serverAddress != "" {
  //outUser, err = srvClient.UpdateUser(context.Background(), user, client.WithAddress(serverAddress))
@@ -120,6 +124,7 @@ func GetUsers(srvClient pb.UserSrvService) (*pb.Users, error) {
  Fisrtname: "Super",
  Lastname: "Duck",
  ValidDate: searchDate,
+ Email: "[email protected]",
  }
 
  var outUsers *pb.Users

diff --git a/user/proto/user.pb.go b/user/proto/user.pb.go
diff --git a/user/proto/user.pb.micro.go b/user/proto/user.pb.micro.go
diff --git a/user/proto/user.proto b/user/proto/user.proto
@@ -9,6 +9,7 @@ import "google/protobuf/timestamp.proto";
 service userSrv {
  rpc GetUserById(SearchId) returns (user) {}
  rpc GetUsers(SearchParams) returns (users) {}
+ rpc GetUsersByEmail(SearchString) returns (users) {}
  rpc CreateUser(user) returns (user) {}
  rpc UpdateUser(user) returns (user) {}
  rpc DeleteUser(SearchId) returns (affectedCount) {}
@@ -18,6 +19,7 @@ service userSrv {
  rpc AfterCreateUser(user) returns (AfterFuncErr) {}
  rpc AfterUpdateUser(user) returns (AfterFuncErr) {}
  rpc AfterDeleteUser(user) returns (AfterFuncErr) {}
+ rpc Auth(user) returns (Token) {}
 }
 
 
@@ -43,6 +45,13 @@ message SearchParams {
  string fisrtname = 2;
  string lastname = 3;
  google.protobuf.Timestamp validDate = 5;
+ string email =9;
+ string company =10;
+ string pwd =11;
+}
+
+message SearchString {
+ string value = 1;
 }
 
 message SearchId {
@@ -59,4 +68,9 @@ message validationErr {
 
 message AfterFuncErr {
  repeated string failureDesc = 1;
+}
+
+message Token {
+ string token = 1;
+ bool valid = 2;
 }
diff --git a/user/server/handler.go b/user/server/handler.go
@@ -40,6 +40,8 @@ func (u *User) GetUserById(ctx context.Context, searchId *pb.SearchId, outUser *
  &outUser.Active,
  &outUser.Pwd,
  &outUser.Name,
+ &outUser.Email,
+ &outUser.Company,
  )
 
  if err != nil {
@@ -65,14 +67,11 @@ func (u *User) GetUsers(ctx context.Context, searchParms *pb.SearchParams, users
 
  _ = ctx
 
- sqlStatement := statements.SqlSelectAll.String()
- sqlWhereClause, values, err2 := u.buildSearchWhereClause(searchParms)
+ values, sqlStatement, err2 := u.getSQLForSearch(searchParms)
  if err2 != nil {
  return err2
  }
 
- sqlStatement += sqlWhereClause
-
  //log.Printf("sql: %s\n values: %v", sqlStatement, values)
 
  rows, err := conn.Query(context.Background(), sqlStatement, values...)
@@ -96,6 +95,8 @@ func (u *User) GetUsers(ctx context.Context, searchParms *pb.SearchParams, users
  &user.Active,
  &user.Pwd,
  &user.Name,
+ &user.Email,
+ &user.Company,
  )
  if err != nil {
  log.Printf(userErr.SelectScanError(err))
@@ -114,6 +115,17 @@ func (u *User) GetUsers(ctx context.Context, searchParms *pb.SearchParams, users
  return nil
 }
 
+func (u *User) getSQLForSearch(searchParms *pb.SearchParams) ([]interface{}, string, error) {
+ sql := statements.SqlSelectAll.String()
+ sqlWhereClause, values, err := u.buildSearchWhereClause(searchParms)
+ if err != nil {
+ return nil, "", err
+ }
+
+ sqlStatement := fmt.Sprintf(sql, sqlWhereClause, statements.MaxRowsToFetch)
+ return values, sqlStatement, nil
+}
+
 //buildSearchWhereClause: Builds a sql string to be used as the where clause in a sql statement. It also returns an interface
 //slice with the values to be used as replacements in the sql statement. Currently only handles equality constraints, except
 //for the date lookup which is done as a contains clause
@@ -137,6 +149,16 @@ func (u *User) buildSearchWhereClause(searchParms *pb.SearchParams) (string, []i
  values = append(values, searchParms.GetLastname())
  i++
  }
+ if searchParms.GetEmail() != "" {
+ sqlWhereClause += fmt.Sprintf(" AND appuser.email = $%d", i)
+ values = append(values, searchParms.GetEmail())
+ i++
+ }
+ if searchParms.GetCompany() != "" {
+ sqlWhereClause += fmt.Sprintf(" AND appuser.company = $%d", i)
+ values = append(values, searchParms.GetCompany())
+ i++
+ }
  if searchParms.GetValidDate() != nil {
  convertedDates, err := globalUtils.TimeStampPPBToTime(searchParms.GetValidDate())
  if err != nil {
@@ -173,6 +195,8 @@ func (u *User) CreateUser(ctx context.Context, inUser *pb.User, outUser *pb.User
  validThru,
  inUser.GetActive(),
  inUser.GetPwd(),
+ inUser.GetEmail(),
+ inUser.GetCompany(),
  ).
  Scan(
  &outUser.Id,
@@ -183,6 +207,8 @@ func (u *User) CreateUser(ctx context.Context, inUser *pb.User, outUser *pb.User
  &outUser.Active,
  &outUser.Pwd,
  &outUser.Name,
+ &outUser.Email,
+ &outUser.Company,
  )
 
  if errIns != nil {
@@ -225,6 +251,8 @@ func (u *User) UpdateUser(ctx context.Context, inUser *pb.User, outUser *pb.User
  validThru,
  inUser.GetActive(),
  inUser.GetPwd(),
+ inUser.GetEmail(),
+ inUser.GetCompany(),
  inUser.GetId(),
  ).Scan(
  &outUser.Id,
@@ -235,6 +263,8 @@ func (u *User) UpdateUser(ctx context.Context, inUser *pb.User, outUser *pb.User
  &outUser.Active,
  &outUser.Pwd,
  &outUser.Name,
+ &outUser.Email,
+ &outUser.Company,
  )
  if err != nil {
  log.Printf(userErr.UpdateError(err))
@@ -283,3 +313,33 @@ func (u *User) DeleteUser(ctx context.Context, searchid *pb.SearchId, affectedCo
 
  return nil
 }
+
+func (u *User) Auth(ctx context.Context, user *pb.User, token *pb.Token) error {
+ _ = ctx
+
+ searchParams := pb.SearchParams{
+ Email: user.Email,
+ Pwd: user.Pwd,
+ }
+ outUsers := pb.Users{}
+ if err := u.GetUsers(ctx, &searchParams, &outUsers); err != nil {
+ return err
+ }
+
+ // TODO: Change this
+ token.Token = "CHANGEME"
+ token.Valid = false
+
+ return nil
+}
+
+func (u *User) GetUsersByEmail(ctx context.Context, searchString *pb.SearchString, outUsers *pb.Users) error {
+ searchParams := pb.SearchParams{
+ Email: searchString.Value,
+ }
+ err := u.GetUsers(ctx, &searchParams, outUsers)
+ if err != nil {
+ return err
+ }
+ return nil
+}
diff --git a/user/server/handler_test.go b/user/server/handler_test.go
@@ -19,13 +19,13 @@ func TestUser_buildSearchWhereClause(t *testing.T) {
  sqlFullSearch := sqlEmptyWhereClause + " AND appuser.id = $1 AND appuser.firstname = $2 AND appuser.lastname = $3 AND appuser.validfrom <= $4 AND appuser.validthru >= $4"
  sqlOnlyDateSearch := sqlEmptyWhereClause + " AND appuser.validfrom <= $1 AND appuser.validthru >= $1"
  sqlOnlyFirstNameSearch := sqlEmptyWhereClause + " AND appuser.firstname = $1"
- sqlTestSearch := sqlEmptyWhereClause + " AND appuser.id = $1 AND appuser.firstname = $2 AND appuser.lastname = $3 AND appuser.validfrom <= $4 AND appuser.validthru >= $4"
+ sqlTestSearch := sqlEmptyWhereClause + " AND appuser.id = $1 AND appuser.firstname = $2 AND appuser.lastname = $3 AND appuser.email = $4 AND appuser.company = $5 AND appuser.validfrom <= $6 AND appuser.validthru >= $6"
 
  var intEmptySearch []interface{}
  intFullSearch := []interface{}{int64(1), "Super", "Duck", convertedDates[0]}
  intOnlyDateSearch := []interface{}{convertedDates[0]}
  intOnlyFirstNameSearch := []interface{}{"Super"}
- intTestSearch := []interface{}{int64(1234), "Incredible", "Green Guy", convertedDates[0]}
+ intTestSearch := []interface{}{int64(1234), "Incredible", "Green Guy", "[email protected]", "igg & Associates", convertedDates[0]}
 
  emptySearch := pb.SearchParams{}
  fullSearch := pb.SearchParams{
@@ -43,6 +43,8 @@ func TestUser_buildSearchWhereClause(t *testing.T) {
  Fisrtname: "Incredible",
  Lastname: "Green Guy",
  ValidDate: dtForSearch,
+ Email: "[email protected]",
+ Company: "igg & Associates",
  }
 
  tests := []struct {

diff --git a/user/server/statements/errorstatements.go b/user/server/statements/errorstatements.go
@@ -17,7 +17,9 @@ type UserErr string
 var errTxtEn = map[string]UserErr{
  "internalError": "Internal error. Error: %v\n",
  "insertError": "Unable to create user. Error: %v\n",
+ "insertDupEmail": "Email address already exists in the system\v",
  "updateError": "Unable to update user. Error: %v \n",
+ "updateDupEmail": "This email address is already associated with another user in the system\v",
  "deleteError": "Unable to delete user %v. Error: %v\n",
  "deleteRowNotFoundError": "row with id %d not found. Unable to delete the row",
  "selectReadError": "Unable to get rows from the DB. Error: %v \n",
@@ -29,7 +31,9 @@ var errTxtEn = map[string]UserErr{
 var errTxtES = map[string]UserErr{
  "internalError": "Error interno. Error: %v\n",
  "insertError": "No se pudo crear el usuario. Error: %v\n",
+ "insertDupEmail": "Correo electornico ya existe en la base de datos\v",
  "updateError": "No se pudo actualizar el usuario. Error: %v \n",
+ "updateDupEmail": "Este correo electornico ya esta associado con un usuario en el systema\v",
  "deleteError": "No se pudo borrar el usuario %v. Error: %v\n",
  "deleteRowNotFoundError": "usuario %d no se pudo encontrar. No se pudo borrar el usuario",
  "selectReadError": "No su pudo leer datos de la base de datos. Error: %v \n",
@@ -88,3 +92,11 @@ func (ge *UserErr) SelectRowReadError(err error) string {
 func (ge *UserErr) DelUserActive() string {
  return fmt.Sprintf(ge.getSqlTxt("delUserActive", language))
 }
+
+func (ge *UserErr) UpdateDupEmail() string {
+ return fmt.Sprintf(ge.getSqlTxt("updateDupEmail", language))
+}
+
+func (ge *UserErr) InsertDupEmail() string {
+ return fmt.Sprintf(ge.getSqlTxt("insertDupEmail", language))
+}