refactor: Move mocks to their respective packages

This commit moves the mock structures and methods from the test package
to their respective packages. This change makes the codebase more
organized and easier to navigate. The MockEntryCrypto was moved to the
services package and the MockEntryModel was moved to the models package.

internal/test/mocks.go → internal/models/mock.go

@@ -1,28 +1,13 @@
-package test
+package models
 
 import (
 	"context"
 	"database/sql"
 	"time"
 
-	"github.com/Ajnasz/sekret.link/internal/models"
 	"github.com/stretchr/testify/mock"
 )
 
-type MockEntryCrypto struct {
-	mock.Mock
-}
-
-func (m *MockEntryCrypto) Encrypt(data []byte) ([]byte, error) {
-	args := m.Called(data)
-	return args.Get(0).([]byte), args.Error(1)
-}
-
-func (m *MockEntryCrypto) Decrypt(data []byte) ([]byte, error) {
-	args := m.Called(data)
-	return args.Get(0).([]byte), args.Error(1)
-}
-
 type MockEntryModel struct {
 	mock.Mock
 }
@@ -33,14 +18,14 @@ func (m *MockEntryModel) CreateEntry(
 	UUID string,
 	data []byte,
 	remainingReads int,
-	expire time.Duration) (*models.EntryMeta, error) {
+	expire time.Duration) (*EntryMeta, error) {
 	args := m.Called(ctx, tx, UUID, data, remainingReads, expire)
-	return args.Get(0).(*models.EntryMeta), args.Error(1)
+	return args.Get(0).(*EntryMeta), args.Error(1)
 }
 
-func (m *MockEntryModel) ReadEntry(ctx context.Context, tx *sql.Tx, UUID string) (*models.Entry, error) {
+func (m *MockEntryModel) ReadEntry(ctx context.Context, tx *sql.Tx, UUID string) (*Entry, error) {
 	args := m.Called(ctx, tx, UUID)
-	return args.Get(0).(*models.Entry), args.Error(1)
+	return args.Get(0).(*Entry), args.Error(1)
 }
 
 func (m *MockEntryModel) UpdateAccessed(ctx context.Context, tx *sql.Tx, UUID string) error {

internal/services/entrymanager_test.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/Ajnasz/sekret.link/internal/key"
 	"github.com/Ajnasz/sekret.link/internal/models"
-	"github.com/Ajnasz/sekret.link/internal/test"
 	"github.com/DATA-DOG/go-sqlmock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
@@ -32,7 +31,7 @@ func Test_EntryService_Create(t *testing.T) {
 
 	data := []byte("data")
 	encryptedData := []byte("encrypted")
-	entryModel := new(test.MockEntryModel)
+	entryModel := new(models.MockEntryModel)
 	entryModel.
 		On("CreateEntry", ctx, mock.Anything, mock.Anything, encryptedData, 1, mock.Anything).
 		Return(&models.EntryMeta{
@@ -43,7 +42,7 @@ func Test_EntryService_Create(t *testing.T) {
 			Expire:         timenow.Add(time.Minute),
 		}, nil)
 
-	entryCrypto := new(test.MockEntryCrypto)
+	entryCrypto := new(MockEntryCrypto)
 	entryCrypto.On("Encrypt", data).Return(encryptedData, nil)
 	crypto := func(key []byte) Encrypter {
 		return entryCrypto
@@ -100,12 +99,12 @@ func TestCreateError(t *testing.T) {
 	data := []byte("data")
 	encryptedData := []byte("encrypted")
 
-	entryModel := new(test.MockEntryModel)
+	entryModel := new(models.MockEntryModel)
 	entryModel.
 		On("CreateEntry", ctx, mock.Anything, mock.Anything, encryptedData, 1, mock.Anything).
 		Return(&models.EntryMeta{}, fmt.Errorf("error"))
 
-	entryCrypto := new(test.MockEntryCrypto)
+	entryCrypto := new(MockEntryCrypto)
 	entryCrypto.On("Encrypt", data).Return(encryptedData, nil)
 	crypto := func(key []byte) Encrypter {
 		return entryCrypto
@@ -148,7 +147,7 @@ func TestReadEntry(t *testing.T) {
 		Data: []byte("encrypted"),
 	}
 
-	entryModel := new(test.MockEntryModel)
+	entryModel := new(models.MockEntryModel)
 	entryModel.
 		On("ReadEntry", ctx, mock.Anything, "uuid").
 		Return(&entry, nil)
@@ -157,7 +156,7 @@ func TestReadEntry(t *testing.T) {
 		Return(nil)
 
 	key := []byte("key")
-	entryCrypto := new(test.MockEntryCrypto)
+	entryCrypto := new(MockEntryCrypto)
 	entryCrypto.On("Decrypt", []byte("encrypted")).Return([]byte("data"), nil)
 
 	crypto := func(key []byte) Encrypter {
@@ -198,12 +197,12 @@ func TestReadEntryError(t *testing.T) {
 
 	ctx := context.Background()
 
-	entryModel := new(test.MockEntryModel)
+	entryModel := new(models.MockEntryModel)
 	entryModel.
 		On("ReadEntry", ctx, mock.Anything, "uuid").
 		Return(&models.Entry{}, fmt.Errorf("error"))
 
-	entryCrypto := new(test.MockEntryCrypto)
+	entryCrypto := new(MockEntryCrypto)
 	crypto := func(key []byte) Encrypter {
 		return entryCrypto
 	}
@@ -234,12 +233,12 @@ func TestDeleteEntry(t *testing.T) {
 
 	ctx := context.Background()
 
-	entryModel := new(test.MockEntryModel)
+	entryModel := new(models.MockEntryModel)
 	entryModel.
 		On("DeleteEntry", ctx, mock.Anything, "uuid", "delete_key").
 		Return(nil)
 
-	entryCrypto := new(test.MockEntryCrypto)
+	entryCrypto := new(MockEntryCrypto)
 	crypto := func(key []byte) Encrypter {
 		return entryCrypto
 	}
@@ -269,12 +268,12 @@ func TestDeleteEntryError(t *testing.T) {
 
 	ctx := context.Background()
 
-	entryModel := new(test.MockEntryModel)
+	entryModel := new(models.MockEntryModel)
 	entryModel.
 		On("DeleteEntry", ctx, mock.Anything, "uuid", "delete_key").
 		Return(fmt.Errorf("error"))
 
-	entryCrypto := new(test.MockEntryCrypto)
+	entryCrypto := new(MockEntryCrypto)
 	crypto := func(key []byte) Encrypter {
 		return entryCrypto
 	}
@@ -305,12 +304,12 @@ func TestDeleteEntryInvalidDeleteKey(t *testing.T) {
 
 	ctx := context.Background()
 
-	entryModel := new(test.MockEntryModel)
+	entryModel := new(models.MockEntryModel)
 	entryModel.
 		On("DeleteEntry", ctx, mock.Anything, "uuid", "delete_key").
 		Return(models.ErrEntryNotFound)
 
-	entryCrypto := new(test.MockEntryCrypto)
+	entryCrypto := new(MockEntryCrypto)
 	crypto := func(key []byte) Encrypter {
 		return entryCrypto
 	}

internal/services/mocks.go

@@ -37,3 +37,17 @@ func (m *MockEntryKeyer) GenerateEncryptionKey(ctx context.Context, entryUUID st
 	args := m.Called(ctx, entryUUID, existingKey, expire, maxRead)
 	return args.Get(0).(*EntryKey), args.Get(1).(*key.Key), args.Error(2)
 }
+
+type MockEntryCrypto struct {
+	mock.Mock
+}
+
+func (m *MockEntryCrypto) Encrypt(data []byte) ([]byte, error) {
+	args := m.Called(data)
+	return args.Get(0).([]byte), args.Error(1)
+}
+
+func (m *MockEntryCrypto) Decrypt(data []byte) ([]byte, error) {
+	args := m.Called(data)
+	return args.Get(0).([]byte), args.Error(1)
+}