feat: excel export for primitive fields

internal/services/comment.go

@@ -29,6 +29,7 @@ func (service *CommentService) GetAll() ([]*Comment, error) {
 	comments, err := dal.Comment.Preload(field.Associations).Find()
 	return comments, err
 }
+
 func (service *CommentService) GetById(id uint) (*Comment, error) {
 	item, err := dal.Comment.Preload(field.Associations).Where(dal.Comment.Id.Eq(id)).First()
 	if err != nil {
@@ -40,6 +41,7 @@ func (service *CommentService) GetById(id uint) (*Comment, error) {
 	}
 	return item, nil
 }
+
 func (service *CommentService) Update(item Comment) (Comment, error) {
 	ReplaceEmptySlicesWithNil(&item)
 	err := dal.Comment.Preload(field.Associations).Save(&item)
@@ -55,6 +57,7 @@ func (service *CommentService) Update(item Comment) (Comment, error) {
 
 	return item, err
 }
+
 func (service *CommentService) Delete(id uint) error {
 	_, err := dal.Comment.Unscoped().Where(dal.Comment.Id.Eq(id)).Delete()
 	return err

internal/services/post.go

@@ -4,7 +4,7 @@ import (
 	"app/internal/dal"
 	"app/internal/database"
 	"app/internal/dialogs"
-	excel "app/internal/extras/excel"
+	"app/internal/extras/excel"
 	"app/internal/models"
 	"errors"
 	"fmt"
@@ -64,7 +64,12 @@ func (service *PostService) Count() (int64, error) {
 	return amount, err
 }
 func (service *PostService) ExportToExcel() {
-	err := excel.ExportEntityToSpreadsheet("report.xlsx", "Посты", Post{}, service.GetAll)
+	exporter := excel.Exporter[Post]{
+		SheetName: "Посты",
+		Entity:    Post{},
+		Provider:  service.GetAll,
+	}
+	err := excel.ExportEntitiesToSpreadsheet("report.xlsx", exporter)
 	if err != nil {
 		dialogs.ErrorDialog("Ошибка экспорта", fmt.Sprintf("Ошибка при экспорте данных: %s", err))
 	}

internal/services/posttype.go

@@ -7,12 +7,9 @@ import (
 	"app/internal/extras/excel"
 	"app/internal/models"
 	"errors"
-	"os/signal"
-	"strconv"
-	"syscall"
-
 	"gorm.io/gen/field"
 	"gorm.io/gorm"
+	"strconv"
 )
 
 type PostTypeService struct {
@@ -66,7 +63,6 @@ func (service *PostTypeService) Count() (int64, error) {
 }
 
 func (service *PostTypeService) ImportFromExcel() error {
-	signal.Ignore(syscall.SIGSEGV)
 	filepath, err := dialogs.OpenFileDialog("Импорт данных")
 	if err != nil {
 		return err
@@ -79,10 +75,13 @@ func (service *PostTypeService) ImportFromExcel() error {
 				return err
 			}
 
-			service.Create(PostType{
+			_, err = service.Create(PostType{
 				Id:   uint(id),
 				Name: row[1],
 			})
+			if err != nil {
+				return err
+			}
 			return nil
 		},
 	})