From 9fe2d0edc38239c3d59fd6c5819bee005cfc406b Mon Sep 17 00:00:00 2001
From: SoXX <soxx@fenpa.ws>
Date: Sun, 11 Aug 2024 00:24:02 +0200
Subject: [PATCH] fix(database): make function more coherent with the rest

---
 pkg/database/tag.go      | 10 +++++-----
 pkg/database/tagAlias.go | 14 +++++++-------
 pkg/database/tagGroup.go | 14 +++++++-------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/pkg/database/tag.go b/pkg/database/tag.go
index 50fe70a..b2a011d 100644
--- a/pkg/database/tag.go
+++ b/pkg/database/tag.go
@@ -8,10 +8,10 @@ import (
 	"gorm.io/gorm"
 )
 
-func CreateTag(ctx context.Context, tagName models.TagName, tagType models.TagType) error {
+func CreateTag(ctx context.Context, tagName models.TagName, tagType models.TagType) (models.Tag, error) {
 
 	if client == nil {
-		return &otterError.Database{Reason: otterError.DatabaseIsNotConnected}
+		return models.Tag{}, &otterError.Database{Reason: otterError.DatabaseIsNotConnected}
 	}
 
 	tag := models.Tag{
@@ -22,12 +22,12 @@ func CreateTag(ctx context.Context, tagName models.TagName, tagType models.TagTy
 	result := client.WithContext(ctx).Create(&tag)
 	if result.Error != nil {
 		if errors.Is(result.Error, gorm.ErrDuplicatedKey) {
-			return &otterError.Database{Reason: otterError.DuplicateKey}
+			return models.Tag{}, &otterError.Database{Reason: otterError.DuplicateKey}
 		}
-		return result.Error
+		return models.Tag{}, result.Error
 	}
 
-	return nil
+	return tag, nil
 }
 
 func CreateTagInBatch(ctx context.Context, tags []models.Tag, batchSize int) error {
diff --git a/pkg/database/tagAlias.go b/pkg/database/tagAlias.go
index 58d231b..b77879d 100644
--- a/pkg/database/tagAlias.go
+++ b/pkg/database/tagAlias.go
@@ -8,25 +8,25 @@ import (
 	"gorm.io/gorm"
 )
 
-func CreateTagAlias(ctx context.Context, tagAliasName models.TagAliasName, tagName models.TagName) error {
+func CreateTagAlias(ctx context.Context, tagAliasName models.TagAliasName, tagName models.TagName) (models.TagAlias, error) {
 	if client == nil {
-		return &otterError.Database{Reason: otterError.DatabaseIsNotConnected}
+		return models.TagAlias{}, &otterError.Database{Reason: otterError.DatabaseIsNotConnected}
 	}
 
-	tag := models.TagAlias{
+	tagAlias := models.TagAlias{
 		Name:  tagAliasName,
 		TagID: tagName,
 	}
 
-	result := client.WithContext(ctx).Create(&tag)
+	result := client.WithContext(ctx).Create(&tagAlias)
 	if result.Error != nil {
 		if errors.Is(result.Error, gorm.ErrDuplicatedKey) {
-			return &otterError.Database{Reason: otterError.DuplicateKey}
+			return models.TagAlias{}, &otterError.Database{Reason: otterError.DuplicateKey}
 		}
-		return result.Error
+		return models.TagAlias{}, result.Error
 	}
 
-	return nil
+	return tagAlias, nil
 }
 
 func CreateTagAliasInBatch(ctx context.Context, tagsAliases []models.TagAlias, batchSize int) error {
diff --git a/pkg/database/tagGroup.go b/pkg/database/tagGroup.go
index 287cb60..cf155fe 100644
--- a/pkg/database/tagGroup.go
+++ b/pkg/database/tagGroup.go
@@ -8,25 +8,25 @@ import (
 	"gorm.io/gorm"
 )
 
-func CreateTagGroup(ctx context.Context, tagGroupName models.TagGroupName, tagName models.TagName) error {
+func CreateTagGroup(ctx context.Context, tagGroupName models.TagGroupName, tagName models.TagName) (models.TagGroup, error) {
 	if client == nil {
-		return &otterError.Database{Reason: otterError.DatabaseIsNotConnected}
+		return models.TagGroup{}, &otterError.Database{Reason: otterError.DatabaseIsNotConnected}
 	}
 
-	tag := models.TagGroup{
+	tagGroup := models.TagGroup{
 		Name:  tagGroupName,
 		TagID: tagName,
 	}
 
-	result := client.WithContext(ctx).Create(&tag)
+	result := client.WithContext(ctx).Create(&tagGroup)
 	if result.Error != nil {
 		if errors.Is(result.Error, gorm.ErrDuplicatedKey) {
-			return &otterError.Database{Reason: otterError.DuplicateKey}
+			return models.TagGroup{}, &otterError.Database{Reason: otterError.DuplicateKey}
 		}
-		return result.Error
+		return models.TagGroup{}, result.Error
 	}
 
-	return nil
+	return tagGroup, nil
 }
 
 func CreateTagGroupInBatch(ctx context.Context, tagsGroups []models.TagGroup, batchSize int) error {