Using textsender-models now

internal/handler/login.go

@@ -7,6 +7,7 @@ import (
 	"git.kundeng.us/phoenix/textsender-auth/internal/config"
 	"git.kundeng.us/phoenix/textsender-auth/internal/model"
 	"git.kundeng.us/phoenix/textsender-auth/internal/utility"
+	"git.kundeng.us/phoenix/textsender-models/pkg/token"
 )
 
 type LoginAccount struct {
@@ -16,7 +17,7 @@ type LoginAccount struct {
 
 type LoginResponse struct {
 	Message string        `json:"message"`
-	Data    []model.Login `json:"data"`
+	Data    []token.Login `json:"data"`
 }
 
 type LoginHandler struct {
@@ -62,13 +63,13 @@ func (l *LoginHandler) Login(w http.ResponseWriter, r *http.Request) {
 					var tokGen utility.TokenGenerator
 					secretKey := config.GetSecretKey()
 					tokGen.SetSecretKey(secretKey)
-					if token, err := tokGen.GenerateToken(*user); err != nil {
+					if myToken, err := tokGen.GenerateToken(*user); err != nil {
 						fmt.Println(err.Error())
 						statusCode = http.StatusInternalServerError
 						resp.Message = "Error generating token"
 					} else {
 						statusCode = http.StatusOK
-						resp.Data = append(resp.Data, *token)
+						resp.Data = append(resp.Data, *myToken)
 						resp.Message = "Successful"
 					}
 				} else {

internal/handler/mock_store.go

@@ -7,24 +7,24 @@ import (
 
 	"github.com/google/uuid"
 
-	"git.kundeng.us/phoenix/textsender-auth/internal/model"
+	"git.kundeng.us/phoenix/textsender-models/pkg/user"
 )
 
 type MockUserStore struct {
-	Users           map[uuid.UUID]*model.User
-	UsersByUsername map[string]*model.User
+	Users           map[uuid.UUID]*user.User
+	UsersByUsername map[string]*user.User
 	mu              sync.RWMutex
 	Error           error // Optional: simulate errors
 }
 
 func NewMockUserStore() *MockUserStore {
 	return &MockUserStore{
-		Users:           make(map[uuid.UUID]*model.User),
-		UsersByUsername: make(map[string]*model.User),
+		Users:           make(map[uuid.UUID]*user.User),
+		UsersByUsername: make(map[string]*user.User),
 	}
 }
 
-func (m *MockUserStore) CreateUser(ctx context.Context, user *model.User) error {
+func (m *MockUserStore) CreateUser(ctx context.Context, user *user.User) error {
 	m.mu.Lock()
 	defer m.mu.Unlock()
 
@@ -45,7 +45,7 @@ func (m *MockUserStore) CreateUser(ctx context.Context, user *model.User) error
 	return nil
 }
 
-func (m *MockUserStore) GetUserByID(ctx context.Context, id uuid.UUID) (*model.User, error) {
+func (m *MockUserStore) GetUserByID(ctx context.Context, id uuid.UUID) (*user.User, error) {
 	m.mu.Lock()
 	defer m.mu.Unlock()
 
@@ -65,7 +65,7 @@ func (m *MockUserStore) GetUserByID(ctx context.Context, id uuid.UUID) (*model.U
 	return user, nil
 }
 
-func (m *MockUserStore) GetUserByUsername(ctx context.Context, username string) (*model.User, error) {
+func (m *MockUserStore) GetUserByUsername(ctx context.Context, username string) (*user.User, error) {
 	m.mu.Lock()
 	defer m.mu.Unlock()
 
@@ -81,7 +81,7 @@ func (m *MockUserStore) GetUserByUsername(ctx context.Context, username string)
 	return user, nil
 }
 
-func (m *MockUserStore) GetAllUsers(ctx context.Context) ([]*model.User, error) {
+func (m *MockUserStore) GetAllUsers(ctx context.Context) ([]*user.User, error) {
 	m.mu.Lock()
 	defer m.mu.Unlock()
 
@@ -89,7 +89,7 @@ func (m *MockUserStore) GetAllUsers(ctx context.Context) ([]*model.User, error)
 		return nil, m.Error
 	}
 
-	users := make([]*model.User, 0, len(m.Users))
+	users := make([]*user.User, 0, len(m.Users))
 	for _, user := range m.Users {
 		users = append(users, user)
 	}

internal/handler/register.go

@@ -7,6 +7,7 @@ import (
 
 	"git.kundeng.us/phoenix/textsender-auth/internal/model"
 	"git.kundeng.us/phoenix/textsender-auth/internal/utility"
+	"git.kundeng.us/phoenix/textsender-models/pkg/user"
 )
 
 type RegisterUser struct {
@@ -49,7 +50,7 @@ func (h *UserHandler) Register(w http.ResponseWriter, r *http.Request) {
 
 	defer r.Body.Close()
 
-	user := model.User{Username: req.Username, Password: req.Password, PhoneNumber: req.PhoneNumber}
+	user := user.User{Username: req.Username, Password: req.Password, PhoneNumber: req.PhoneNumber}
 
 	var statusCode int
 	resp := RegisterResponse{}

internal/handler/utility_test.go

@@ -1,9 +1,9 @@
 package handler
 
 import (
-	"git.kundeng.us/phoenix/textsender-auth/internal/model"
+	"git.kundeng.us/phoenix/textsender-models/pkg/user"
 )
 
-func GetTestUser() model.User {
-	return model.User{Username: "ghost", PhoneNumber: "+1234567890", Password: "dfgdffddfd"}
+func GetTestUser() user.User {
+	return user.User{Username: "ghost", PhoneNumber: "+1234567890", Password: "dfgdffddfd"}
 }