improve structure of campaign & adding interfaces

domain/campaign/entity/entitty.go

@@ -1,4 +1,4 @@
-package domain
+package entity
 
 import "time"
 

domain/campaign/repository/mysql/db.go

@@ -0,0 +1,57 @@
+package mysql
+
+import (
+	"context"
+	"git.gocasts.ir/ebhomengo/niki/domain/campaign/entity"
+	richerror "git.gocasts.ir/ebhomengo/niki/pkg/rich_error"
+	"git.gocasts.ir/ebhomengo/niki/repository/mysql"
+	"git.gocasts.ir/ebhomengo/niki/types"
+)
+
+type DB struct {
+	conn *mysql.DB
+}
+
+func New(db *mysql.DB) *DB {
+	return &DB{conn: db}
+}
+
+// CreateCampaign creates a new campaign
+func (d *DB) CreateAndSave(ctx context.Context, campaign entity.Campaign) (types.ID, error) {
+	const Op = "repository.mysql.campaign.create"
+
+	tx, err := d.conn.Conn().BeginTx(ctx, nil)
+	if err != nil {
+		return 0, richerror.New(Op).WithErr(err)
+	}
+	defer tx.Rollback()
+
+	query := `INSERT INTO campaigns (title, description, goal_amount, raised_amount,
+        status, deadline_at ,admin_id , created_at ) 
+        VALUES (?, ?, ?, ?, ?, ?, ? , NOW() )`
+
+	result, err := tx.ExecContext(ctx, query,
+		campaign.Title,
+		campaign.Description,
+		campaign.GoalAmount,
+		campaign.RaisedAmount,
+		campaign.Status,
+		campaign.DeadlineAt,
+		campaign.AdminID,
+		campaign.CreatedAt,
+	)
+	if err != nil {
+		return 0, richerror.New(Op).WithErr(err)
+	}
+
+	campaignID, err := result.LastInsertId()
+	if err != nil {
+		return 0, richerror.New(Op).WithErr(err)
+	}
+
+	if err := tx.Commit(); err != nil {
+		return 0, richerror.New(Op).WithErr(err)
+	}
+
+	return types.ID(campaignID), nil
+}

domain/campaign/repository/repo.go

@@ -1,29 +0,0 @@
-package mysql
-
-import (
-	"context"
-	"git.gocasts.ir/ebhomengo/niki/campaign/entity"
-	richerror "git.gocasts.ir/ebhomengo/niki/pkg/rich_error"
-	"git.gocasts.ir/ebhomengo/niki/repository/mysql"
-	"git.gocasts.ir/ebhomengo/niki/types"
-)
-
-
-
-type CampaignRepository interface {
-	CreateAndSave(ctx context.Context, campaign *Campaign) error
-	FindByID(ctx context.Context, id ID) (*Campaign, error)
-	List(ctx context.Context, status CampaignStatus, limit, offset int) ([]*Campaign, error)
-	Delete(ctx context.Context, id ID) error
-	Update(ctx context.Context, campaign *Campaign) error
-}
-
-
-
-
-
-
-
-
-
-

domain/campaign/service/Interfaces.go

@@ -1,7 +0,0 @@
-package domain
-
-import (
-	"context"
-	"time"
-)
-

domain/campaign/service/createCampaign.go

@@ -1,48 +1,50 @@
-package campaign
+package service
 
 import (
 	"context"
-	"errors" // For standard errors
+	"fmt"
+	"git.gocasts.ir/ebhomengo/niki/domain/campaign/entity"
+	richerror "git.gocasts.ir/ebhomengo/niki/pkg/rich_error"
+	"git.gocasts.ir/ebhomengo/niki/types"
 	"time"
-
-	"your_project/domain"
-	"your_project/pkg/richerror"
-	"your_project/repository"
 )
 
-type ID = unit64
+// CreateCampaign handles creation of a new campaign.
-type EntityCampaign = domain.Campaign 
+func (s *CampaignService) CreateCampaign(ctx context.Context, req entity.Campaign) (types.ID, error) {
+	const op = "service.campaign.create_campaign"
 
-
+	if err := validateCreateCampaignRequest(req); err != nil {
-type CampaignServiceImp interface {
+		return 0, richerror.New(op).WithErr(err)
-    CreateCampaign(ctx context.Context, req CampaignRepository) (types.ID, error)
 	}
 
-
+	campaign := entity.Campaign{
-type CampaignService struct {
+		Title:        req.Title,
-	repo       repository.CampaignRepository
+		Description:  req.Description,
+		GoalAmount:   req.GoalAmount,
+		RaisedAmount: 0,
+		Status:       req.Status,
+		DeadlineAt:   req.DeadlineAt,
+		AdminID:      req.AdminID,
+		CreatedAt:    time.Now(),
 	}
 
-func NewCampaignService(
+	id, err := s.repo.Create(ctx, campaign)
-	campaignRepo repository.CampaignRepository,
+	if err != nil {
-) *CampaignService {
+		return 0, richerror.New(op).WithErr(err)
-	return &CampaignService{
-		repo:      campaignRepo,
-	}
 	}
 
+	return id, nil
+}
 
-func (s *CampaignService) CreateCampaign(ctx context.Context, req CreateCampaignRequest) (ID, error) {
+func validateCreateCampaignRequest(req entity.Campaign) error {
-	const Op = "service.campaign.create_campaign"
-
 	if req.Title == "" {
-		return 0, richerror.New(Op).WithMessage("title is required")
+		return errRequired("title")
 	}
 	if req.GoalAmount <= 0 {
-		return 0, richerror.New(Op).WithMessage("goal_amount must be greater than 0")
+		return errInvalid("goal_amount must be greater than 0")
 	}
 	if req.AdminID == 0 {
-		return 0, richerror.New(Op).WithMessage("admin_id is required")
+		return errRequired("admin_id")
 	}
 
 	validStatuses := map[string]bool{
@@ -50,32 +52,20 @@ func (s *CampaignService) CreateCampaign(ctx context.Context, req CreateCampaign
 		"active":    true,
 		"completed": true,
 		"cancelled": true,
-		"paused":   true
+		"paused":    true,
 	}
-	if !validStatuses[req.Status] {
+	if !validStatuses[string(req.Status)] {
-		return 0, richerror.New(Op).WithMessage("invalid status provided")
+		return errInvalid("invalid status provided")
 	}
 
-	
+	return nil
-	newCampaign := &EntityCampaign{
-		Title:        req.Title,
-		Description:  req.Description,
-		GoalAmount:   req.GoalAmount,
-		RaisedAmount: 0, // Initially 0
-		Status:       EntityCampaign.Status(req.Status),
-		DeadlineAt:   req.DeadlineAt,
-		AdminID:      req.AdminID,
-		CreatedAt:    time.Now(),
 }
 
-	createdCampaignID, err := s.repo.CreateAndSave(ctx, newCampaign)
+// --- Helpers ---
-	if err != nil {
+func errRequired(field string) error {
-		return 0, richerror.New(Op).WithErr(err)
+	return fmt.Errorf("%s is required", field)
 }
 
-	return createdCampaignID, nil
+func errInvalid(msg string) error {
+	return fmt.Errorf(msg)
 }
-
-
-
-

domain/campaign/service/services.go

@@ -0,0 +1,35 @@
+package service
+
+import (
+	"context"
+	_ "fmt"
+	"git.gocasts.ir/ebhomengo/niki/domain/campaign/entity"
+	"git.gocasts.ir/ebhomengo/niki/types"
+)
+
+type CampaignFilterParam struct {
+	AdminID types.ID
+	Status  string
+	//nil true false
+	IsArchived *bool
+}
+
+type CampaignStorage interface {
+	Create(ctx context.Context, c entity.Campaign) (types.ID, error) // باید ID برگرداند
+	Update(ctx context.Context, c entity.Campaign) error
+	FindByID(ctx context.Context, id types.ID) (entity.Campaign, error)
+	FindAll(ctx context.Context, filter CampaignFilterParam) ([]entity.Campaign, error)
+	Archive(ctx context.Context, id types.ID) error // instead Delete
+	TotalDonations(ctx context.Context, campaignID types.ID) (int64, error)
+}
+
+type CampaignService struct {
+	repo CampaignStorage
+}
+
+// NewCampaignService constructs a new CampaignService.
+func NewCampaignService(storage CampaignStorage) *CampaignService {
+	return &CampaignService{
+		repo: storage,
+	}
+}

donate_app/repository/mysql/db.go

@@ -2,7 +2,7 @@ package mysql
 
 import (
 	"context"
-	"git.gocasts.ir/ebhomengo/niki/campaign/entity"
+	"git.gocasts.ir/ebhomengo/niki/donate_app/service/entity"
 	richerror "git.gocasts.ir/ebhomengo/niki/pkg/rich_error"
 	"git.gocasts.ir/ebhomengo/niki/repository/mysql"
 	"git.gocasts.ir/ebhomengo/niki/types"
@@ -16,11 +16,9 @@ func New(db *mysql.DB) *DB {
 	return &DB{conn: db}
 }
 
-
+// Create adds a new participant to a campaign
-
+func (d *DB) CreateCampaignParticipants(ctx context.Context, participant entity.CampaignParticipant) (types.ID, error) {
-// CreateCampaign creates a new campaign
+	const Op = "repository.mysql.campaign_participant.create"
-func (d *DB) CreateAndSave(ctx context.Context, campaign entity.Campaign) (types.ID, error) {
-	const Op = "repository.mysql.campaign.create"
 
 	tx, err := d.conn.Conn().BeginTx(ctx, nil)
 	if err != nil {
@@ -28,54 +26,17 @@ func (d *DB) CreateAndSave(ctx context.Context, campaign entity.Campaign) (types
 	}
 	defer tx.Rollback()
 
-	query := `INSERT INTO campaigns (title, description, goal_amount, raised_amount,
-        status, deadline_at ,admin_id , created_at ) 
-        VALUES (?, ?, ?, ?, ?, ?, ? , NOW() )`
-
-	result, err := tx.ExecContext(ctx, query,
-		campaign.Title,
-		campaign.Description,
-		campaign.GoalAmount,
-		campaign.RaisedAmount,
-		campaign.Status,
-		campaign.DeadlineAt,
-		campaign.AdminID,
-		campaign.CreatedAt,
-		
-
-	)
-	if err != nil {
-		return 0, richerror.New(Op).WithErr(err)
-	}
-
-	campaignID, err := result.LastInsertId()
-	if err != nil {
-		return 0, richerror.New(Op).WithErr(err)
-	}
-
-	if err := tx.Commit(); err != nil {
-		return 0, richerror.New(Op).WithErr(err)
-	}
-
-	return types.ID(campaignID), nil
-}
-
-
-
-// Create adds a new participant to a campaign
-func (d *DB) CreateCampaignParticipants(ctx context.Context, participant entity.CampaignParticipant) (types.ID, error) {
-    const Op = "repository.mysql.campaign_participant.create"
-
 	query := `INSERT INTO campaign_participants (id,campaign_id, user_id, amount , created_at) 
               VALUES (?, ?, ? , ? , NOW())`
 
-    result, err := d.conn.ExecContext(ctx, query,
+	result, err := tx.ExecContext(ctx, query,
 		participant.ID,
 		participant.CampaignID,
 		participant.UserID,
 		participant.Amount,
-		participant.CreatedAt
+		participant.CreatedAt,
 	)
+
 	if err != nil {
 		return 0, richerror.New(Op).WithErr(err)
 	}
@@ -84,11 +45,10 @@ func (d *DB) CreateCampaignParticipants(ctx context.Context, participant entity.
 	if err != nil {
 		return 0, richerror.New(Op).WithErr(err)
 	}
-
+	if err := tx.Commit(); err != nil {
-    return types.ID(id), nil
+		return 0, richerror.New(Op).WithErr(err)
 	}
 
+	return types.ID(id), nil
 
-
+}
-
-

donate_app/service/entity/campaignParticipant.go

@@ -1,14 +1,13 @@
-package service
+package entity
 
+import "time"
 
 type ID uint64
 
-
 type CampaignParticipant struct {
 	ID         ID        `json:"id"`
 	CampaignID ID        `json:"campaign_id"`
 	UserID     ID        `json:"user_id"`
 	Amount     float64   `json:"amount"`
 	CreatedAt  time.Time `json:"created_at"`
-
 }