[merge] pull request #9 from akrck02/dev

v0.0.2

services/device.go → services/device/device.go

@@ -1,4 +1,4 @@
-package services
+package devicedal
 
 import (
 	"context"

services/project.go → services/project/project.go

@@ -1,4 +1,4 @@
-package services
+package projectdal
 
 import (
 	"context"

services/role.go → services/role/role.go

@@ -1,4 +1,4 @@
-package services
+package roledal
 
 import (
 	"context"

services/team.go → services/team/team.go

@@ -1,4 +1,4 @@
-package services
+package teamdal
 
 import (
 	"context"

services/user.go → services/user/user.go

@@ -1,15 +1,17 @@
-package services
+package userdal
 
 import (
 	"context"
 
 	"github.com/akrck02/valhalla-core-dal/configuration"
 	"github.com/akrck02/valhalla-core-dal/database"
+	devicedal "github.com/akrck02/valhalla-core-dal/services/device"
 	"github.com/akrck02/valhalla-core-sdk/error"
 	"github.com/akrck02/valhalla-core-sdk/http"
 	"github.com/akrck02/valhalla-core-sdk/log"
 	"github.com/akrck02/valhalla-core-sdk/models"
 	"github.com/akrck02/valhalla-core-sdk/utils"
+
 	"github.com/golang-jwt/jwt/v5"
 
 	"go.mongodb.org/mongo-driver/bson"
@@ -138,7 +140,7 @@ func Login(conn context.Context, client *mongo.Client, user *models.User, ip str
 	}
 
 	device := &models.Device{Address: ip, UserAgent: address}
-	token, err := AddUserDevice(conn, client, found, device)
+	token, err := devicedal.AddUserDevice(conn, client, found, device)
 
 	if err != nil {
 		return "", &models.Error{
@@ -173,7 +175,7 @@ func LoginAuth(conn context.Context, client *mongo.Client, auth *models.AuthLogi
 	}
 
 	var devices = client.Database(database.CurrentDatabase).Collection(database.DEVICE)
-	device, deviceFindingError := FindDeviceByAuthToken(conn, devices, &filter)
+	device, deviceFindingError := devicedal.FindDeviceByAuthToken(conn, devices, &filter)
 
 	if deviceFindingError != nil || device == nil {
 		return &models.Error{

services/device_test.go → tests/device_test.go

@@ -1,11 +1,13 @@
-package services
+package tests
 
 import (
 	"log"
 	"testing"
 
 	"github.com/akrck02/valhalla-core-dal/database"
 	"github.com/akrck02/valhalla-core-dal/mock"
+	devicedal "github.com/akrck02/valhalla-core-dal/services/device"
+	userdal "github.com/akrck02/valhalla-core-dal/services/user"
 	"github.com/akrck02/valhalla-core-sdk/models"
 )
 
@@ -23,7 +25,7 @@ func TestDeviceExists(t *testing.T) {
 		Password: mock.Password(),
 	}
 
-	err := Register(conn, client, &user)
+	err := userdal.Register(conn, client, &user)
 
 	if err != nil {
 		t.Error(err)
@@ -37,15 +39,15 @@ func TestDeviceExists(t *testing.T) {
 		UserAgent: mock.Platform(),
 	}
 
-	_, error := AddUserDevice(conn, client, &user, &expected)
+	_, error := devicedal.AddUserDevice(conn, client, &user, &expected)
 
 	if error != nil {
 		t.Error(err)
 	}
 
 	// check if device exists
 	coll := client.Database(database.CurrentDatabase).Collection(database.DEVICE)
-	obtained, error := FindDevice(conn, coll, &expected)
+	obtained, error := devicedal.FindDevice(conn, coll, &expected)
 
 	if error != nil {
 		t.Error(err)
@@ -59,14 +61,14 @@ func TestDeviceExists(t *testing.T) {
 	log.Print("Device found: ", obtained)
 
 	// delete device
-	error = DeleteDevice(conn, client, &expected)
+	error = devicedal.DeleteDevice(conn, client, &expected)
 
 	if error != nil {
 		t.Error(err)
 	}
 
 	// delete user
-	err = DeleteUser(conn, client, &user)
+	err = userdal.DeleteUser(conn, client, &user)
 
 	if err != nil {
 		t.Error(err)
@@ -88,7 +90,7 @@ func TestDeviceNotExists(t *testing.T) {
 		Password: mock.Password(),
 	}
 
-	err := Register(conn, client, &user)
+	err := userdal.Register(conn, client, &user)
 
 	if err != nil {
 		t.Error(err)
@@ -102,15 +104,15 @@ func TestDeviceNotExists(t *testing.T) {
 		UserAgent: mock.Platform(),
 	}
 
-	_, error := AddUserDevice(conn, client, &user, &expected)
+	_, error := devicedal.AddUserDevice(conn, client, &user, &expected)
 
 	if error != nil {
 		t.Error(err)
 	}
 
 	// check if device exists
 	coll := client.Database(database.CurrentDatabase).Collection(database.DEVICE)
-	obtained, error := FindDevice(conn, coll, &models.Device{
+	obtained, error := devicedal.FindDevice(conn, coll, &models.Device{
 		Token: mock.Token(),
 	})
 
@@ -122,14 +124,14 @@ func TestDeviceNotExists(t *testing.T) {
 	log.Print("Device not found: ", obtained)
 
 	// delete device
-	error = DeleteDevice(conn, client, &expected)
+	error = devicedal.DeleteDevice(conn, client, &expected)
 
 	if error != nil {
 		t.Error(err)
 	}
 
 	// delete user
-	err = DeleteUser(conn, client, &user)
+	err = userdal.DeleteUser(conn, client, &user)
 
 	if err != nil {
 		t.Error(err)

services/project_test.go → tests/project_test.go

@@ -1,11 +1,12 @@
-package services
+package tests
 
 import (
 	"testing"
 
 	"github.com/akrck02/valhalla-api-common/http"
 	"github.com/akrck02/valhalla-core-dal/database"
 	"github.com/akrck02/valhalla-core-dal/mock"
+	projectdal "github.com/akrck02/valhalla-core-dal/services/project"
 	"github.com/akrck02/valhalla-core-sdk/error"
 	"github.com/akrck02/valhalla-core-sdk/models"
 )
@@ -85,7 +86,7 @@ func TestGetUserProjects(t *testing.T) {
 	project := CreateMockTestProjectWithUser(t, conn, client, user)
 	project2 := CreateMockTestProjectWithUser(t, conn, client, user)
 
-	projects := GetUserProjects(conn, client, user.Email)
+	projects := projectdal.GetUserProjects(conn, client, user.Email)
 
 	if len(projects) == 0 {
 		t.Errorf("No projects found for user: %v", user.Email)

services/project_test_utils.go → tests/project_test_utils.go

@@ -1,10 +1,11 @@
-package services
+package tests
 
 import (
 	"context"
 	"testing"
 
 	"github.com/akrck02/valhalla-core-dal/mock"
+	projectdal "github.com/akrck02/valhalla-core-dal/services/project"
 	"github.com/akrck02/valhalla-core-sdk/log"
 	"github.com/akrck02/valhalla-core-sdk/models"
 	"go.mongodb.org/mongo-driver/mongo"
@@ -39,7 +40,7 @@ func CreateMockTestProjectWithUser(t *testing.T, conn context.Context, client *m
 func CreateTestProjectWithUser(t *testing.T, conn context.Context, client *mongo.Client, project *models.Project, user *models.User) *models.Project {
 
 	log.FormattedInfo("Creating project: ${0}", project.Name)
-	err := CreateProject(conn, client, project)
+	err := projectdal.CreateProject(conn, client, project)
 
 	if err != nil {
 		t.Errorf("Error creating project: %v", err)
@@ -58,7 +59,7 @@ func CreateTestProjectWithUser(t *testing.T, conn context.Context, client *mongo
 func CreateTestProjectWithError(t *testing.T, conn context.Context, client *mongo.Client, project *models.Project, status int, errorcode int) {
 
 	log.FormattedInfo("Creating project: ${0}", project.Name)
-	err := CreateProject(conn, client, project)
+	err := projectdal.CreateProject(conn, client, project)
 
 	if err == nil {
 		t.Error("Project created successfully")
@@ -83,7 +84,7 @@ func CreateTestProjectWithError(t *testing.T, conn context.Context, client *mong
 func DeleteTestProject(t *testing.T, conn context.Context, client *mongo.Client, project *models.Project) {
 
 	log.FormattedInfo("Deleting project: ${0}", project.Name)
-	err := DeleteProject(conn, client, project)
+	err := projectdal.DeleteProject(conn, client, project)
 
 	if err != nil {
 		t.Errorf("Error deleting project: %v", err)

tests/role_test.go

@@ -0,0 +1 @@
+package tests

tests/team_test.go

@@ -0,0 +1 @@
+package tests

services/user_test.go → tests/user_test.go

@@ -1,9 +1,10 @@
-package services
+package tests
 
 import (
 	"testing"
 
 	"github.com/akrck02/valhalla-core-dal/database"
+	userdal "github.com/akrck02/valhalla-core-dal/services/user"
 	"github.com/akrck02/valhalla-core-sdk/error"
 	"github.com/akrck02/valhalla-core-sdk/http"
 	"github.com/akrck02/valhalla-core-sdk/log"
@@ -218,7 +219,7 @@ func TestLoginWrongEmail(t *testing.T) {
 	LoginTestUserWithError(t, conn, client, user, mock.Ip(), mock.Platform(), http.HTTP_STATUS_FORBIDDEN, error.USER_NOT_AUTHORIZED)
 
 	user.Email = realEmail
-	DeleteUser(conn, client, user)
+	userdal.DeleteUser(conn, client, user)
 }
 
 func TestLoginAuth(t *testing.T) {
@@ -295,7 +296,7 @@ func TestEditUserEmail(t *testing.T) {
 
 	// Change the user email
 	log.Info("Changing user email")
-	emailChangeRequest := EmailChangeRequest{
+	emailChangeRequest := userdal.EmailChangeRequest{
 		Email:    email,
 		NewEmail: newEmail,
 	}
@@ -313,7 +314,7 @@ func TestEditUserEmailNoEmail(t *testing.T) {
 	conn := database.Connect(*client)
 	defer database.Disconnect(*client, conn)
 
-	emailChangeRequest := EmailChangeRequest{}
+	emailChangeRequest := userdal.EmailChangeRequest{}
 	EditTestUserEmailWithError(t, conn, client, &emailChangeRequest, http.HTTP_STATUS_BAD_REQUEST, error.EMPTY_EMAIL)
 
 }
@@ -327,7 +328,7 @@ func TestEditUserEmailNoDotEmail(t *testing.T) {
 	email := mock.Email()
 	newEmail := mock.EmailNotDot()
 
-	emailChangeRequest := EmailChangeRequest{
+	emailChangeRequest := userdal.EmailChangeRequest{
 		Email:    email,
 		NewEmail: newEmail,
 	}
@@ -345,7 +346,7 @@ func TestEditUserEmailNoAtEmail(t *testing.T) {
 	email := mock.Email()
 	newEmail := mock.EmailNotAt()
 
-	emailChangeRequest := EmailChangeRequest{
+	emailChangeRequest := userdal.EmailChangeRequest{
 		Email:    email,
 		NewEmail: newEmail,
 	}
@@ -363,7 +364,7 @@ func TestEditUserEmailShortEmail(t *testing.T) {
 	email := mock.Email()
 	newEmail := mock.EmailShort()
 
-	emailChangeRequest := EmailChangeRequest{
+	emailChangeRequest := userdal.EmailChangeRequest{
 		Email:    email,
 		NewEmail: newEmail,
 	}
@@ -381,7 +382,7 @@ func TestEditUserEmailNotFound(t *testing.T) {
 	email := mock.Email()
 	newEmail := "xXx" + mock.Email()
 
-	emailChangeRequest := EmailChangeRequest{
+	emailChangeRequest := userdal.EmailChangeRequest{
 		Email:    email,
 		NewEmail: newEmail,
 	}
@@ -419,7 +420,7 @@ func TestEditUserEmailExists(t *testing.T) {
 	log.Jump()
 
 	// Change the email
-	emailChangeRequest := EmailChangeRequest{
+	emailChangeRequest := userdal.EmailChangeRequest{
 		Email:    email,
 		NewEmail: newEmail,
 	}
@@ -439,7 +440,7 @@ func TestEditUserSameEmail(t *testing.T) {
 	defer database.Disconnect(*client, conn)
 
 	email := mock.Email()
-	emailChangeRequest := EmailChangeRequest{
+	emailChangeRequest := userdal.EmailChangeRequest{
 		Email:    email,
 		NewEmail: email,
 	}
@@ -631,15 +632,15 @@ func TestValidationCode(t *testing.T) {
 	user := RegisterMockTestUser(t, conn, client)
 
 	// get the user
-	user, err := GetUser(conn, client, user, true)
+	user, err := userdal.GetUser(conn, client, user, true)
 
 	if err != nil {
 		t.Error("The user was not found", err)
 		return
 	}
 
 	// validate the user
-	err = ValidateUser(conn, client, user.ValidationCode)
+	err = userdal.ValidateUser(conn, client, user.ValidationCode)
 
 	if err != nil {
 		t.Error("The user was not validated", err)