Update .gitlab-ci.yml file

.gitlab-ci.yml

@@ -85,6 +85,7 @@ deploy-dev:
 
   only:
     - development
+    - devops-ec2
 
   environment:
     name: development

go.mod

@@ -4,16 +4,11 @@ go 1.23
 
 require (
 	github.com/MicahParks/keyfunc/v2 v2.1.0
-	github.com/aws/aws-sdk-go-v2 v1.40.0
-	github.com/aws/aws-sdk-go-v2/config v1.32.2
-	github.com/aws/aws-sdk-go-v2/credentials v1.19.2
-	github.com/aws/aws-sdk-go-v2/service/s3 v1.92.1
 	github.com/bytedance/sonic v1.12.1
 	github.com/go-playground/validator/v10 v10.27.0
 	github.com/gofiber/contrib/jwt v1.0.10
 	github.com/gofiber/fiber/v2 v2.52.5
 	github.com/golang-jwt/jwt/v5 v5.2.1
-	github.com/google/uuid v1.6.0
 	github.com/jackc/pgconn v1.14.1
 	github.com/redis/go-redis/v9 v9.14.0
 	github.com/sirupsen/logrus v1.9.3
@@ -25,21 +20,6 @@ require (
 
 require (
 	github.com/andybalholm/brotli v1.1.0 // indirect
-	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.3 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.14 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.14 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.14 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.14 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.3 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.5 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.14 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.14 // indirect
-	github.com/aws/aws-sdk-go-v2/service/signin v1.0.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.30.5 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.10 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.41.2 // indirect
-	github.com/aws/smithy-go v1.23.2 // indirect
 	github.com/bytedance/sonic/loader v0.2.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/cloudwego/base64x v0.1.4 // indirect
@@ -50,6 +30,7 @@ require (
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
 	github.com/jackc/pgio v1.0.0 // indirect

go.sum

@@ -2,44 +2,6 @@ github.com/MicahParks/keyfunc/v2 v2.1.0 h1:6ZXKb9Rp6qp1bDbJefnG7cTH8yMN1IC/4nf+G
 github.com/MicahParks/keyfunc/v2 v2.1.0/go.mod h1:rW42fi+xgLJ2FRRXAfNx9ZA8WpD4OeE/yHVMteCkw9k=
 github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M=
 github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY=
-github.com/aws/aws-sdk-go-v2 v1.40.0 h1:/WMUA0kjhZExjOQN2z3oLALDREea1A7TobfuiBrKlwc=
-github.com/aws/aws-sdk-go-v2 v1.40.0/go.mod h1:c9pm7VwuW0UPxAEYGyTmyurVcNrbF6Rt/wixFqDhcjE=
-github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.3 h1:DHctwEM8P8iTXFxC/QK0MRjwEpWQeM9yzidCRjldUz0=
-github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.3/go.mod h1:xdCzcZEtnSTKVDOmUZs4l/j3pSV6rpo1WXl5ugNsL8Y=
-github.com/aws/aws-sdk-go-v2/config v1.32.2 h1:4liUsdEpUUPZs5WVapsJLx5NPmQhQdez7nYFcovrytk=
-github.com/aws/aws-sdk-go-v2/config v1.32.2/go.mod h1:l0hs06IFz1eCT+jTacU/qZtC33nvcnLADAPL/XyrkZI=
-github.com/aws/aws-sdk-go-v2/credentials v1.19.2 h1:qZry8VUyTK4VIo5aEdUcBjPZHL2v4FyQ3QEOaWcFLu4=
-github.com/aws/aws-sdk-go-v2/credentials v1.19.2/go.mod h1:YUqm5a1/kBnoK+/NY5WEiMocZihKSo15/tJdmdXnM5g=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.14 h1:WZVR5DbDgxzA0BJeudId89Kmgy6DIU4ORpxwsVHz0qA=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.14/go.mod h1:Dadl9QO0kHgbrH1GRqGiZdYtW5w+IXXaBNCHTIaheM4=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.14 h1:PZHqQACxYb8mYgms4RZbhZG0a7dPW06xOjmaH0EJC/I=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.14/go.mod h1:VymhrMJUWs69D8u0/lZ7jSB6WgaG/NqHi3gX0aYf6U0=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.14 h1:bOS19y6zlJwagBfHxs0ESzr1XCOU2KXJCWcq3E2vfjY=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.14/go.mod h1:1ipeGBMAxZ0xcTm6y6paC2C/J6f6OO7LBODV9afuAyM=
-github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 h1:WKuaxf++XKWlHWu9ECbMlha8WOEGm0OUEZqm4K/Gcfk=
-github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4/go.mod h1:ZWy7j6v1vWGmPReu0iSGvRiise4YI5SkR3OHKTZ6Wuc=
-github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.14 h1:ITi7qiDSv/mSGDSWNpZ4k4Ve0DQR6Ug2SJQ8zEHoDXg=
-github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.14/go.mod h1:k1xtME53H1b6YpZt74YmwlONMWf4ecM+lut1WQLAF/U=
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.3 h1:x2Ibm/Af8Fi+BH+Hsn9TXGdT+hKbDd5XOTZxTMxDk7o=
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.3/go.mod h1:IW1jwyrQgMdhisceG8fQLmQIydcT/jWY21rFhzgaKwo=
-github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.5 h1:Hjkh7kE6D81PgrHlE/m9gx+4TyyeLHuY8xJs7yXN5C4=
-github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.5/go.mod h1:nPRXgyCfAurhyaTMoBMwRBYBhaHI4lNPAnJmjM0Tslc=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.14 h1:FIouAnCE46kyYqyhs0XEBDFFSREtdnr8HQuLPQPLCrY=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.14/go.mod h1:UTwDc5COa5+guonQU8qBikJo1ZJ4ln2r1MkF7Dqag1E=
-github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.14 h1:FzQE21lNtUor0Fb7QNgnEyiRCBlolLTX/Z1j65S7teM=
-github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.14/go.mod h1:s1ydyWG9pm3ZwmmYN21HKyG9WzAZhYVW85wMHs5FV6w=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.92.1 h1:OgQy/+0+Kc3khtqiEOk23xQAglXi3Tj0y5doOxbi5tg=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.92.1/go.mod h1:wYNqY3L02Z3IgRYxOBPH9I1zD9Cjh9hI5QOy/eOjQvw=
-github.com/aws/aws-sdk-go-v2/service/signin v1.0.2 h1:MxMBdKTYBjPQChlJhi4qlEueqB1p1KcbTEa7tD5aqPs=
-github.com/aws/aws-sdk-go-v2/service/signin v1.0.2/go.mod h1:iS6EPmNeqCsGo+xQmXv0jIMjyYtQfnwg36zl2FwEouk=
-github.com/aws/aws-sdk-go-v2/service/sso v1.30.5 h1:ksUT5KtgpZd3SAiFJNJ0AFEJVva3gjBmN7eXUZjzUwQ=
-github.com/aws/aws-sdk-go-v2/service/sso v1.30.5/go.mod h1:av+ArJpoYf3pgyrj6tcehSFW+y9/QvAY8kMooR9bZCw=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.10 h1:GtsxyiF3Nd3JahRBJbxLCCdYW9ltGQYrFWg8XdkGDd8=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.10/go.mod h1:/j67Z5XBVDx8nZVp9EuFM9/BS5dvBznbqILGuu73hug=
-github.com/aws/aws-sdk-go-v2/service/sts v1.41.2 h1:a5UTtD4mHBU3t0o6aHQZFJTNKVfxFWfPX7J0Lr7G+uY=
-github.com/aws/aws-sdk-go-v2/service/sts v1.41.2/go.mod h1:6TxbXoDSgBQ225Qd8Q+MbxUxUh6TtNKwbRt/EPS9xso=
-github.com/aws/smithy-go v1.23.2 h1:Crv0eatJUQhaManss33hS5r40CG3ZFH+21XSkqMrIUM=
-github.com/aws/smithy-go v1.23.2/go.mod h1:LEj2LM3rBRQJxPZTB4KuzZkaZYnZPnvgIhb4pu07mx0=
 github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
 github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
 github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=

internal/common/repository/common.document.repository.go

@@ -1,62 +0,0 @@
-package repository
-
-import (
-	"context"
-
-	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	"gorm.io/gorm"
-)
-
-type DocumentRepository interface {
-	BaseRepository[entity.Document]
-	ListByTarget(ctx context.Context, documentableType string, documentableID uint64, modifier func(*gorm.DB) *gorm.DB) ([]entity.Document, error)
-	DeleteByTarget(ctx context.Context, documentableType string, documentableID uint64, modifier func(*gorm.DB) *gorm.DB) error
-}
-
-type documentRepositoryImpl struct {
-	*BaseRepositoryImpl[entity.Document]
-}
-
-func NewDocumentRepository(db *gorm.DB) DocumentRepository {
-	return &documentRepositoryImpl{
-		BaseRepositoryImpl: NewBaseRepository[entity.Document](db),
-	}
-}
-
-func (r *documentRepositoryImpl) ListByTarget(
-	ctx context.Context,
-	documentableType string,
-	documentableID uint64,
-	modifier func(*gorm.DB) *gorm.DB,
-) ([]entity.Document, error) {
-	var documents []entity.Document
-
-	q := r.DB().WithContext(ctx).
-		Where("documentable_type = ? AND documentable_id = ?", documentableType, documentableID)
-
-	if modifier != nil {
-		q = modifier(q)
-	}
-
-	if err := q.Order("created_at ASC").Find(&documents).Error; err != nil {
-		return nil, err
-	}
-
-	return documents, nil
-}
-
-func (r *documentRepositoryImpl) DeleteByTarget(
-	ctx context.Context,
-	documentableType string,
-	documentableID uint64,
-	modifier func(*gorm.DB) *gorm.DB,
-) error {
-	q := r.DB().WithContext(ctx).
-		Where("documentable_type = ? AND documentable_id = ?", documentableType, documentableID)
-
-	if modifier != nil {
-		q = modifier(q)
-	}
-
-	return q.Delete(&entity.Document{}).Error
-}

internal/common/repository/common.stock_allocation.repository.go

@@ -1,75 +0,0 @@
-package repository
-
-import (
-	"context"
-	"time"
-
-	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	"gorm.io/gorm"
-)
-
-type StockAllocationRepository interface {
-	BaseRepository[entity.StockAllocation]
-	FindActiveByUsable(ctx context.Context, usableType string, usableID uint, modifier func(*gorm.DB) *gorm.DB) ([]entity.StockAllocation, error)
-	ReleaseByUsable(ctx context.Context, usableType string, usableID uint, note *string, modifier func(*gorm.DB) *gorm.DB) error
-}
-
-type StockAllocationRepositoryImpl struct {
-	*BaseRepositoryImpl[entity.StockAllocation]
-}
-
-func NewStockAllocationRepository(db *gorm.DB) StockAllocationRepository {
-	return &StockAllocationRepositoryImpl{
-		BaseRepositoryImpl: NewBaseRepository[entity.StockAllocation](db),
-	}
-}
-
-func (r *StockAllocationRepositoryImpl) FindActiveByUsable(
-	ctx context.Context,
-	usableType string,
-	usableID uint,
-	modifier func(*gorm.DB) *gorm.DB,
-) ([]entity.StockAllocation, error) {
-	var allocations []entity.StockAllocation
-
-	q := r.DB().WithContext(ctx).
-		Where("usable_type = ? AND usable_id = ? AND status = ?", usableType, usableID, entity.StockAllocationStatusActive)
-
-	if modifier != nil {
-		q = modifier(q)
-	}
-
-	if err := q.Order("created_at ASC").Find(&allocations).Error; err != nil {
-		return nil, err
-	}
-
-	return allocations, nil
-}
-
-func (r *StockAllocationRepositoryImpl) ReleaseByUsable(
-	ctx context.Context,
-	usableType string,
-	usableID uint,
-	note *string,
-	modifier func(*gorm.DB) *gorm.DB,
-) error {
-	now := time.Now()
-
-	updates := map[string]any{
-		"status":      entity.StockAllocationStatusReleased,
-		"released_at": now,
-	}
-	if note != nil {
-		updates["note"] = *note
-	}
-
-	q := r.DB().WithContext(ctx).
-		Model(&entity.StockAllocation{}).
-		Where("usable_type = ? AND usable_id = ? AND status = ?", usableType, usableID, entity.StockAllocationStatusActive)
-
-	if modifier != nil {
-		q = modifier(q)
-	}
-
-	return q.Updates(updates).Error
-}

internal/common/service/common.document.service.go

@@ -1,411 +0,0 @@
-package service
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"mime"
-	"mime/multipart"
-	"path/filepath"
-	"strings"
-
-	commonRepo "gitlab.com/mbugroup/lti-api.git/internal/common/repository"
-	"gitlab.com/mbugroup/lti-api.git/internal/config"
-	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	"gitlab.com/mbugroup/lti-api.git/internal/utils"
-
-	"github.com/google/uuid"
-)
-
-const (
-	defaultDocumentPathLimit = 50
-	defaultDocumentKeyPrefix = "docs"
-	maxDocumentNameLength    = 50
-)
-
-type DocumentService interface {
-	UploadDocuments(ctx context.Context, req DocumentUploadRequest) ([]DocumentUploadResult, error)
-	ListByTarget(ctx context.Context, documentableType string, documentableID uint64) ([]entity.Document, error)
-	DeleteDocuments(ctx context.Context, ids []uint, removeFromStorage bool) error
-	DeleteByTarget(ctx context.Context, documentableType string, documentableID uint64, removeFromStorage bool) error
-	PublicURL(document entity.Document) string
-}
-
-type DocumentUploadRequest struct {
-	DocumentableType string
-	DocumentableID   uint64
-	CreatedBy        *uint
-	Files            []DocumentFile
-}
-
-type DocumentFile struct {
-	File  *multipart.FileHeader
-	Type  string
-	Index *int
-}
-
-type DocumentUploadResult struct {
-	Document entity.Document
-	URL      string
-	Index    *int
-}
-
-type DocumentServiceOption func(*documentService)
-
-type documentService struct {
-	repo          commonRepo.DocumentRepository
-	storage       DocumentStorage
-	keyPrefix     string
-	maxPathLength int
-}
-
-func NewDocumentService(repo commonRepo.DocumentRepository, storage DocumentStorage, opts ...DocumentServiceOption) DocumentService {
-	svc := &documentService{
-		repo:          repo,
-		storage:       storage,
-		keyPrefix:     defaultDocumentKeyPrefix,
-		maxPathLength: defaultDocumentPathLimit,
-	}
-
-	for _, opt := range opts {
-		opt(svc)
-	}
-
-	return svc
-}
-
-func NewDocumentServiceFromConfig(ctx context.Context, repo commonRepo.DocumentRepository) (DocumentService, error) {
-	if repo == nil {
-		return nil, errors.New("document repository is required")
-	}
-	if strings.TrimSpace(config.S3Bucket) == "" {
-		return nil, errors.New("S3_BUCKET is not configured")
-	}
-
-	storage, err := NewS3DocumentStorage(ctx, S3DocumentStorageConfig{
-		Region:         config.S3Region,
-		Bucket:         config.S3Bucket,
-		AccessKey:      config.S3AccessKey,
-		SecretKey:      config.S3SecretKey,
-		Endpoint:       config.S3Endpoint,
-		BaseURL:        config.S3PublicBaseURL,
-		ForcePathStyle: config.S3ForcePathStyle,
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	prefix := config.S3DocumentKeyPrefix
-	if prefix == "" {
-		prefix = defaultDocumentKeyPrefix
-	}
-
-	return NewDocumentService(
-		repo,
-		storage,
-		WithDocumentKeyPrefix(prefix),
-		WithDocumentPathLimit(defaultDocumentPathLimit),
-	), nil
-}
-
-func WithDocumentKeyPrefix(prefix string) DocumentServiceOption {
-	return func(svc *documentService) {
-		prefix = strings.Trim(prefix, "/")
-		if prefix == "" {
-			prefix = defaultDocumentKeyPrefix
-		}
-		svc.keyPrefix = prefix
-	}
-}
-
-func WithDocumentPathLimit(limit int) DocumentServiceOption {
-	return func(svc *documentService) {
-		if limit > 0 {
-			svc.maxPathLength = limit
-		}
-	}
-}
-
-func (s *documentService) UploadDocuments(ctx context.Context, req DocumentUploadRequest) ([]DocumentUploadResult, error) {
-	if s.repo == nil {
-		return nil, errors.New("document repository not configured")
-	}
-	if s.storage == nil {
-		return nil, errors.New("document storage not configured")
-	}
-
-	documentableType := strings.ToUpper(strings.TrimSpace(req.DocumentableType))
-	if documentableType == "" {
-		return nil, errors.New("documentable type is required")
-	}
-	if req.DocumentableID == 0 {
-		return nil, errors.New("documentable id is required")
-	}
-	if len(req.Files) == 0 {
-		return nil, errors.New("no files to upload")
-	}
-
-	var createdBy *uint
-	if req.CreatedBy != nil && *req.CreatedBy != 0 {
-		idCopy := *req.CreatedBy
-		createdBy = &idCopy
-	}
-
-	results := make([]DocumentUploadResult, 0, len(req.Files))
-	createdDocs := make([]entity.Document, 0, len(req.Files))
-
-	for _, file := range req.Files {
-		if file.File == nil {
-			return nil, errors.New("file header is required")
-		}
-
-		originalName := sanitizeDocumentName(file.File.Filename)
-		contentType := detectContentType(file.File, originalName)
-		ext := detectExtension(file.File.Filename, contentType)
-		key, err := s.generateObjectKey(ext)
-		if err != nil {
-			s.rollbackDocuments(ctx, createdDocs)
-			return nil, err
-		}
-
-		reader, err := file.File.Open()
-		if err != nil {
-			s.rollbackDocuments(ctx, createdDocs)
-			return nil, err
-		}
-		uploadRes, err := s.storage.Upload(ctx, key, reader, file.File.Size, contentType)
-		_ = reader.Close()
-		if err != nil {
-			s.rollbackDocuments(ctx, createdDocs)
-			return nil, err
-		}
-
-		docType := resolveDocumentType(file.Type, documentableType)
-		doc := entity.Document{
-			DocumentableType: documentableType,
-			DocumentableId:   req.DocumentableID,
-			Type:             docType,
-			Path:             uploadRes.Key,
-			Name:             originalName,
-			Ext:              strings.TrimPrefix(ext, "."),
-			Size:             float64(file.File.Size),
-			CreatedBy:        createdBy,
-		}
-
-		if err := s.repo.CreateOne(ctx, &doc, nil); err != nil {
-			_ = s.storage.Delete(ctx, uploadRes.Key)
-			s.rollbackDocuments(ctx, createdDocs)
-			return nil, err
-		}
-
-		createdDocs = append(createdDocs, doc)
-		results = append(results, DocumentUploadResult{
-			Document: doc,
-			URL:      uploadRes.URL,
-			Index:    cloneIndex(file.Index),
-		})
-	}
-
-	return results, nil
-}
-
-func (s *documentService) ListByTarget(ctx context.Context, documentableType string, documentableID uint64) ([]entity.Document, error) {
-	if s.repo == nil {
-		return nil, errors.New("document repository not configured")
-	}
-
-	documentableType = strings.ToUpper(strings.TrimSpace(documentableType))
-	if documentableType == "" {
-		return nil, errors.New("documentable type is required")
-	}
-	if documentableID == 0 {
-		return nil, errors.New("documentable id is required")
-	}
-
-	return s.repo.ListByTarget(ctx, documentableType, documentableID, nil)
-}
-
-func (s *documentService) DeleteDocuments(ctx context.Context, ids []uint, removeFromStorage bool) error {
-	if s.repo == nil {
-		return errors.New("document repository not configured")
-	}
-	if len(ids) == 0 {
-		return nil
-	}
-
-	docs, err := s.repo.GetByIDs(ctx, ids, nil)
-	if err != nil {
-		return err
-	}
-
-	for _, doc := range docs {
-		if err := s.repo.DeleteOne(ctx, doc.Id); err != nil {
-			return err
-		}
-		if removeFromStorage && s.storage != nil {
-			if err := s.storage.Delete(ctx, doc.Path); err != nil {
-				utils.Log.WithError(err).Warnf("failed to delete document object %s", doc.Path)
-			}
-		}
-	}
-
-	return nil
-}
-
-func (s *documentService) DeleteByTarget(ctx context.Context, documentableType string, documentableID uint64, removeFromStorage bool) error {
-	if s.repo == nil {
-		return errors.New("document repository not configured")
-	}
-
-	documentableType = strings.ToUpper(strings.TrimSpace(documentableType))
-	if documentableType == "" || documentableID == 0 {
-		return errors.New("documentable type and id are required")
-	}
-
-	var docs []entity.Document
-	if removeFromStorage && s.storage != nil {
-		var err error
-		docs, err = s.repo.ListByTarget(ctx, documentableType, documentableID, nil)
-		if err != nil {
-			return err
-		}
-	}
-
-	if err := s.repo.DeleteByTarget(ctx, documentableType, documentableID, nil); err != nil {
-		return err
-	}
-
-	if removeFromStorage && len(docs) > 0 {
-		for _, doc := range docs {
-			if err := s.storage.Delete(ctx, doc.Path); err != nil {
-				utils.Log.WithError(err).Warnf("failed to delete document object %s", doc.Path)
-			}
-		}
-	}
-
-	return nil
-}
-
-func (s *documentService) PublicURL(document entity.Document) string {
-	if s.storage == nil || strings.TrimSpace(document.Path) == "" {
-		return ""
-	}
-	return s.storage.URL(document.Path)
-}
-
-func (s *documentService) generateObjectKey(ext string) (string, error) {
-	normalizedExt := strings.TrimSpace(ext)
-	if normalizedExt != "" && !strings.HasPrefix(normalizedExt, ".") {
-		normalizedExt = "." + normalizedExt
-	}
-
-	u := uuid.New().String()
-	key := fmt.Sprintf("%s/%s%s", strings.Trim(s.keyPrefix, "/"), u, normalizedExt)
-	if s.keyPrefix == "" {
-		key = fmt.Sprintf("%s%s", u, normalizedExt)
-	}
-
-	if len(key) > s.maxPathLength {
-		key = fmt.Sprintf("%s%s", u, normalizedExt)
-	}
-
-	if len(key) > s.maxPathLength {
-		return "", fmt.Errorf("object key exceeds maximum length (%d)", s.maxPathLength)
-	}
-
-	return key, nil
-}
-
-func (s *documentService) rollbackDocuments(ctx context.Context, docs []entity.Document) {
-	if len(docs) == 0 {
-		return
-	}
-
-	for i := len(docs) - 1; i >= 0; i-- {
-		doc := docs[i]
-		if s.repo != nil && doc.Id != 0 {
-			if err := s.repo.DeleteOne(ctx, doc.Id); err != nil {
-				utils.Log.WithError(err).Warnf("failed to rollback document #%d", doc.Id)
-			}
-		}
-		if s.storage != nil && strings.TrimSpace(doc.Path) != "" {
-			if err := s.storage.Delete(ctx, doc.Path); err != nil {
-				utils.Log.WithError(err).Warnf("failed to rollback document object %s", doc.Path)
-			}
-		}
-	}
-}
-
-func sanitizeDocumentName(name string) string {
-	name = filepath.Base(strings.TrimSpace(name))
-	if name == "." || name == "" {
-		name = "document"
-	}
-	name = strings.Map(func(r rune) rune {
-		if r < 32 {
-			return -1
-		}
-		switch r {
-		case '\\', '/', ':', '*', '?', '"', '<', '>', '|':
-			return '-'
-		default:
-			return r
-		}
-	}, name)
-
-	if len(name) > maxDocumentNameLength {
-		runes := []rune(name)
-		if len(runes) > maxDocumentNameLength {
-			name = string(runes[:maxDocumentNameLength])
-		}
-	}
-	return name
-}
-
-func detectExtension(filename, contentType string) string {
-	ext := strings.ToLower(strings.TrimSpace(filepath.Ext(filename)))
-	if ext == "" && contentType != "" {
-		if exts, _ := mime.ExtensionsByType(contentType); len(exts) > 0 {
-			ext = exts[0]
-		}
-	}
-	if ext == "" {
-		return ".bin"
-	}
-	if !strings.HasPrefix(ext, ".") {
-		ext = "." + ext
-	}
-	return ext
-}
-
-func detectContentType(file *multipart.FileHeader, filename string) string {
-	if file == nil {
-		return "application/octet-stream"
-	}
-	contentType := strings.TrimSpace(file.Header.Get("Content-Type"))
-	if contentType != "" {
-		return contentType
-	}
-	if ext := filepath.Ext(filename); ext != "" {
-		if guess := mime.TypeByExtension(ext); guess != "" {
-			return guess
-		}
-	}
-	return "application/octet-stream"
-}
-
-func resolveDocumentType(fileType, fallback string) string {
-	value := strings.ToUpper(strings.TrimSpace(fileType))
-	if value == "" {
-		return fallback
-	}
-	return value
-}
-
-func cloneIndex(index *int) *int {
-	if index == nil {
-		return nil
-	}
-	value := *index
-	return &value
-}

internal/common/service/common.document.service_test.go

@@ -1,101 +0,0 @@
-package service
-
-import (
-	"bytes"
-	"context"
-	"mime/multipart"
-	"net/http/httptest"
-	"strings"
-	"testing"
-
-	commonRepo "gitlab.com/mbugroup/lti-api.git/internal/common/repository"
-	"gitlab.com/mbugroup/lti-api.git/internal/config"
-	"gitlab.com/mbugroup/lti-api.git/internal/database"
-	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	"gorm.io/gorm"
-)
-
-func TestDocumentServiceUpload(t *testing.T) {
-	if strings.TrimSpace(config.S3Bucket) == "" {
-		t.Fatal("S3 bucket is not configured; set S3_* env vars to run this test")
-	}
-
-	ctx := context.Background()
-	db := setupDocumentTestDB(t)
-	repo := commonRepo.NewDocumentRepository(db)
-
-	svc, err := NewDocumentServiceFromConfig(ctx, repo)
-	if err != nil {
-		t.Fatalf("failed to create document service from config: %v", err)
-	}
-
-	file := newTestFileHeader(t, "integration-proof.txt", "text/plain", []byte("document integration test"))
-	userID := uint(100)
-
-	results, err := svc.UploadDocuments(ctx, DocumentUploadRequest{
-		DocumentableType: "INVENTORY_TRANSFER",
-		DocumentableID:   99,
-		CreatedBy:        &userID,
-		Files: []DocumentFile{
-			{File: file, Type: "integration"},
-		},
-	})
-	if err != nil {
-		t.Fatalf("upload to S3 failed: %v", err)
-	}
-	if len(results) != 1 {
-		t.Fatalf("expected 1 uploaded document, got %d", len(results))
-	}
-
-	doc := results[0].Document
-	if doc.Path == "" {
-		t.Fatalf("expected non-empty storage path")
-	}
-	if results[0].URL == "" {
-		t.Fatalf("expected public URL for uploaded document")
-	}
-
-	t.Logf("uploaded document #%d to %s (path=%s)", doc.Id, results[0].URL, doc.Path)
-}
-
-func setupDocumentTestDB(t *testing.T) *gorm.DB {
-	t.Helper()
-	if strings.TrimSpace(config.DBHost) == "" || strings.TrimSpace(config.DBName) == "" {
-		t.Fatal("database configuration missing; ensure DB_HOST and DB_NAME are set")
-	}
-	db := database.Connect(config.DBHost, config.DBName)
-	if db == nil {
-		t.Fatal("failed to create database connection")
-	}
-	if err := db.AutoMigrate(&entity.Document{}); err != nil {
-		t.Fatalf("failed to migrate document table: %v", err)
-	}
-	return db
-}
-
-func newTestFileHeader(t *testing.T, filename, contentType string, data []byte) *multipart.FileHeader {
-	t.Helper()
-
-	body := &bytes.Buffer{}
-	writer := multipart.NewWriter(body)
-	part, err := writer.CreateFormFile("documents", filename)
-	if err != nil {
-		t.Fatalf("failed to create form file: %v", err)
-	}
-	if _, err := part.Write(data); err != nil {
-		t.Fatalf("failed to write file data: %v", err)
-	}
-	if err := writer.Close(); err != nil {
-		t.Fatalf("failed to close writer: %v", err)
-	}
-
-	req := httptest.NewRequest("POST", "http://example.com/upload", body)
-	req.Header.Set("Content-Type", writer.FormDataContentType())
-
-	_, fileHeader, err := req.FormFile("documents")
-	if err != nil {
-		t.Fatalf("failed to parse form file: %v", err)
-	}
-	fileHeader.Header.Set("Content-Type", contentType)
-	return fileHeader
-}

internal/common/service/common.document.storage.go

@@ -1,160 +0,0 @@
-package service
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"io"
-	"strings"
-
-	"github.com/aws/aws-sdk-go-v2/aws"
-	awsconfig "github.com/aws/aws-sdk-go-v2/config"
-	"github.com/aws/aws-sdk-go-v2/credentials"
-	"github.com/aws/aws-sdk-go-v2/service/s3"
-)
-
-type DocumentStorage interface {
-	Upload(ctx context.Context, key string, body io.Reader, size int64, contentType string) (DocumentStorageUploadResult, error)
-	Delete(ctx context.Context, key string) error
-	URL(key string) string
-}
-
-type DocumentStorageUploadResult struct {
-	Key  string
-	URL  string
-	ETag string
-}
-
-type S3DocumentStorageConfig struct {
-	Region         string
-	Bucket         string
-	AccessKey      string
-	SecretKey      string
-	Endpoint       string
-	BaseURL        string
-	ForcePathStyle bool
-}
-
-type s3DocumentStorage struct {
-	client *s3.Client
-	bucket string
-	base   string
-}
-
-func NewS3DocumentStorage(ctx context.Context, cfg S3DocumentStorageConfig) (DocumentStorage, error) {
-	bucket := strings.TrimSpace(cfg.Bucket)
-	if bucket == "" {
-		return nil, errors.New("s3 bucket is required")
-	}
-	region := strings.TrimSpace(cfg.Region)
-	if region == "" {
-		region = "us-east-1"
-	}
-
-	options := []func(*awsconfig.LoadOptions) error{
-		awsconfig.WithRegion(region),
-	}
-
-	endpoint := strings.TrimSpace(cfg.Endpoint)
-	if endpoint != "" {
-		resolver := aws.EndpointResolverWithOptionsFunc(func(service, region string, _ ...interface{}) (aws.Endpoint, error) {
-			if service == s3.ServiceID {
-				return aws.Endpoint{
-					URL:               endpoint,
-					SigningRegion:     region,
-					HostnameImmutable: true,
-				}, nil
-			}
-			return aws.Endpoint{}, &aws.EndpointNotFoundError{}
-		})
-		options = append(options, awsconfig.WithEndpointResolverWithOptions(resolver))
-	}
-
-	accessKey := strings.TrimSpace(cfg.AccessKey)
-	secretKey := strings.TrimSpace(cfg.SecretKey)
-	if accessKey != "" && secretKey != "" {
-		options = append(options, awsconfig.WithCredentialsProvider(
-			credentials.NewStaticCredentialsProvider(accessKey, secretKey, ""),
-		))
-	}
-
-	awsCfg, err := awsconfig.LoadDefaultConfig(ctx, options...)
-	if err != nil {
-		return nil, err
-	}
-
-	client := s3.NewFromConfig(awsCfg, func(o *s3.Options) {
-		o.UsePathStyle = cfg.ForcePathStyle
-	})
-
-	baseURL := strings.TrimSuffix(strings.TrimSpace(cfg.BaseURL), "/")
-	if baseURL == "" {
-		if endpoint != "" {
-			baseURL = fmt.Sprintf("%s/%s", strings.TrimSuffix(endpoint, "/"), bucket)
-		} else {
-			baseURL = fmt.Sprintf("https://%s.s3.%s.amazonaws.com", bucket, region)
-		}
-	}
-
-	return &s3DocumentStorage{
-		client: client,
-		bucket: bucket,
-		base:   baseURL,
-	}, nil
-}
-
-func (s *s3DocumentStorage) Upload(ctx context.Context, key string, body io.Reader, size int64, contentType string) (DocumentStorageUploadResult, error) {
-	if strings.TrimSpace(key) == "" {
-		return DocumentStorageUploadResult{}, errors.New("storage key is required")
-	}
-	if size < 0 {
-		size = 0
-	}
-	input := &s3.PutObjectInput{
-		Bucket: aws.String(s.bucket),
-		Key:    aws.String(key),
-		Body:   body,
-	}
-	input.ContentLength = aws.Int64(size)
-	if ct := strings.TrimSpace(contentType); ct != "" {
-		input.ContentType = aws.String(ct)
-	}
-
-	out, err := s.client.PutObject(ctx, input)
-	if err != nil {
-		return DocumentStorageUploadResult{}, err
-	}
-
-	var etag string
-	if out.ETag != nil {
-		etag = strings.Trim(*out.ETag, "\"")
-	}
-
-	return DocumentStorageUploadResult{
-		Key:  key,
-		URL:  s.URL(key),
-		ETag: etag,
-	}, nil
-}
-
-func (s *s3DocumentStorage) Delete(ctx context.Context, key string) error {
-	if strings.TrimSpace(key) == "" {
-		return nil
-	}
-	_, err := s.client.DeleteObject(ctx, &s3.DeleteObjectInput{
-		Bucket: aws.String(s.bucket),
-		Key:    aws.String(key),
-	})
-	return err
-}
-
-func (s *s3DocumentStorage) URL(key string) string {
-	key = strings.TrimPrefix(strings.TrimSpace(key), "/")
-	if key == "" {
-		return s.base
-	}
-	if s.base == "" {
-		return key
-	}
-	return fmt.Sprintf("%s/%s", s.base, key)
-}

internal/common/service/common.fifo.service.go

@@ -1,820 +0,0 @@
-package service
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"math"
-	"sort"
-	"strings"
-	"time"
-
-	"github.com/sirupsen/logrus"
-	commonRepo "gitlab.com/mbugroup/lti-api.git/internal/common/repository"
-	"gitlab.com/mbugroup/lti-api.git/internal/entities"
-	productWarehouseRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/repositories"
-	"gitlab.com/mbugroup/lti-api.git/internal/utils/fifo"
-	"gorm.io/gorm"
-	"gorm.io/gorm/clause"
-)
-
-type FifoService interface {
-	RegisterStockable(cfg fifo.StockableConfig) error
-	RegisterUsable(cfg fifo.UsableConfig) error
-
-	Replenish(ctx context.Context, req StockReplenishRequest) (*StockReplenishResult, error)
-	Consume(ctx context.Context, req StockConsumeRequest) (*StockConsumeResult, error)
-	ReleaseUsage(ctx context.Context, req StockReleaseRequest) error
-}
-
-type fifoService struct {
-	db                     *gorm.DB
-	logger                 *logrus.Logger
-	allocations            commonRepo.StockAllocationRepository
-	productWarehouseRepo   productWarehouseRepo.ProductWarehouseRepository
-	defaultOrderBy         []string
-	pendingBatchPerUsable  int
-	maxLotsPerStockable    int
-	defaultAllocationNotes string
-}
-
-func NewFifoService(
-	db *gorm.DB,
-	allocations commonRepo.StockAllocationRepository,
-	productWarehouseRepo productWarehouseRepo.ProductWarehouseRepository,
-	logger *logrus.Logger,
-) FifoService {
-	if logger == nil {
-		logger = logrus.StandardLogger()
-	}
-	return &fifoService{
-		db:                    db,
-		logger:                logger,
-		allocations:           allocations,
-		productWarehouseRepo:  productWarehouseRepo,
-		defaultOrderBy:        []string{"created_at ASC", "id ASC"},
-		pendingBatchPerUsable: 25,
-		maxLotsPerStockable:   50,
-	}
-}
-
-func (s *fifoService) withTransaction(
-	ctx context.Context,
-	tx *gorm.DB,
-	fn func(*gorm.DB) error,
-) error {
-	if tx != nil {
-		return fn(tx.WithContext(ctx))
-	}
-	return s.db.WithContext(ctx).Transaction(func(inner *gorm.DB) error {
-		return fn(inner)
-	})
-}
-
-func (s *fifoService) txOrDB(tx, db *gorm.DB) *gorm.DB {
-	if tx != nil {
-		return tx
-	}
-	return db
-}
-
-func (s *fifoService) RegisterStockable(cfg fifo.StockableConfig) error {
-	return fifo.RegisterStockable(cfg)
-}
-
-func (s *fifoService) RegisterUsable(cfg fifo.UsableConfig) error {
-	return fifo.RegisterUsable(cfg)
-}
-
-type StockReplenishRequest struct {
-	StockableKey       fifo.StockableKey
-	StockableID        uint
-	ProductWarehouseID uint
-	Quantity           float64
-	Note               *string
-	Tx                 *gorm.DB
-}
-
-type PendingResolution struct {
-	UsableKey fifo.UsableKey
-	UsableID  uint
-	Quantity  float64
-}
-
-type StockReplenishResult struct {
-	AddedQuantity    float64
-	PendingResolved  []PendingResolution
-	RemainingPending float64
-}
-
-type StockConsumeRequest struct {
-	UsableKey          fifo.UsableKey
-	UsableID           uint
-	ProductWarehouseID uint
-	Quantity           float64
-	AllowPending       bool
-	Note               *string
-	Tx                 *gorm.DB
-}
-
-type AllocationDetail struct {
-	StockableKey fifo.StockableKey
-	StockableID  uint
-	Quantity     float64
-}
-
-type StockConsumeResult struct {
-	RequestedQuantity float64
-	UsageQuantity     float64
-	PendingQuantity   float64
-	AddedAllocations  []AllocationDetail
-	ReleasedQuantity  float64
-}
-
-type StockReleaseRequest struct {
-	UsableKey fifo.UsableKey
-	UsableID  uint
-	Reason    *string
-	Tx        *gorm.DB
-}
-
-func (s *fifoService) Replenish(ctx context.Context, req StockReplenishRequest) (*StockReplenishResult, error) {
-	if req.StockableID == 0 || strings.TrimSpace(req.StockableKey.String()) == "" {
-		return nil, errors.New("stockable key and id are required")
-	}
-	if req.ProductWarehouseID == 0 {
-		return nil, errors.New("product warehouse id is required")
-	}
-	if req.Quantity <= 0 {
-		return nil, errors.New("quantity must be greater than zero")
-	}
-
-	cfg, ok := fifo.Stockable(req.StockableKey)
-	if !ok {
-		return nil, fmt.Errorf("stockable %q is not registered", req.StockableKey)
-	}
-
-	result := &StockReplenishResult{
-		AddedQuantity: req.Quantity,
-	}
-
-	err := s.withTransaction(ctx, req.Tx, func(tx *gorm.DB) error {
-		if err := s.incrementStockableQty(ctx, tx, cfg, req.StockableID, req.Quantity); err != nil {
-			return err
-		}
-
-		if err := s.productWarehouseRepo.AdjustQuantities(ctx, map[uint]float64{
-			req.ProductWarehouseID: req.Quantity,
-		}, func(db *gorm.DB) *gorm.DB {
-			return s.txOrDB(tx, db)
-		}); err != nil {
-			return err
-		}
-
-		resolved, err := s.resolvePendingForWarehouse(ctx, tx, req.ProductWarehouseID)
-		if err != nil {
-			return err
-		}
-		result.PendingResolved = resolved
-		return nil
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	return result, nil
-}
-
-func (s *fifoService) Consume(ctx context.Context, req StockConsumeRequest) (*StockConsumeResult, error) {
-	if req.UsableID == 0 || strings.TrimSpace(req.UsableKey.String()) == "" {
-		return nil, errors.New("usable key and id are required")
-	}
-	if req.Quantity < 0 {
-		return nil, errors.New("quantity must be zero or greater")
-	}
-
-	cfg, ok := fifo.Usable(req.UsableKey)
-	if !ok {
-		return nil, fmt.Errorf("usable %q is not registered", req.UsableKey)
-	}
-
-	result := &StockConsumeResult{
-		RequestedQuantity: req.Quantity,
-	}
-
-	err := s.withTransaction(ctx, req.Tx, func(tx *gorm.DB) error {
-		ctxRow, err := s.loadUsableContext(ctx, tx, cfg, req.UsableID)
-		if err != nil {
-			return err
-		}
-
-		productWarehouseID := ctxRow.ProductWarehouseID
-		if productWarehouseID == 0 {
-			return fmt.Errorf("usable %q (id: %d) has no product warehouse reference", req.UsableKey, req.UsableID)
-		}
-		if req.ProductWarehouseID != 0 && req.ProductWarehouseID != productWarehouseID {
-			return fmt.Errorf("usable %q (id: %d) references product warehouse %d but %d was provided", req.UsableKey, req.UsableID, productWarehouseID, req.ProductWarehouseID)
-		}
-
-		currentUsage := ctxRow.UsageQty
-		currentPending := ctxRow.PendingQty
-		currentTotal := currentUsage + currentPending
-		delta := req.Quantity - currentTotal
-
-		var (
-			usageDelta     float64
-			pendingDelta   float64
-			addedAlloc     []AllocationDetail
-			releasedAmount float64
-		)
-
-		switch {
-		case delta > 0:
-			allocationRes, err := s.allocateFromStock(ctx, tx, productWarehouseID, req.UsableKey, req.UsableID, delta)
-			if err != nil {
-				return err
-			}
-			if allocationRes.pending > 0 && !req.AllowPending {
-				return fmt.Errorf("insufficient stock: requested %.3f, allocated %.3f", req.Quantity, currentUsage+allocationRes.allocated)
-			}
-
-			usageDelta += allocationRes.allocated
-			pendingDelta += allocationRes.pending
-			addedAlloc = allocationRes.allocations
-
-			if allocationRes.allocated > 0 {
-				if err := s.productWarehouseRepo.AdjustQuantities(ctx, map[uint]float64{
-					productWarehouseID: -allocationRes.allocated,
-				}, func(db *gorm.DB) *gorm.DB {
-					return s.txOrDB(tx, db)
-				}); err != nil {
-					return err
-				}
-			}
-		case delta < 0:
-			reductionTarget := -delta
-
-			if currentPending > 0 {
-				pendingReduction := math.Min(currentPending, reductionTarget)
-				if pendingReduction > 0 {
-					pendingDelta -= pendingReduction
-					reductionTarget -= pendingReduction
-				}
-			}
-
-			if reductionTarget > 0 {
-				released, err := s.releaseUsagePortion(ctx, tx, req.UsableKey, req.UsableID, reductionTarget)
-				if err != nil {
-					return err
-				}
-				if released+1e-6 < reductionTarget {
-					return fmt.Errorf("unable to release %.3f from usable %d, only %.3f available", reductionTarget, req.UsableID, released)
-				}
-				usageDelta -= released
-				releasedAmount = released
-			}
-		default:
-			// no change
-		}
-
-		if err := s.applyUsableDeltas(ctx, tx, cfg, req.UsableID, usageDelta, pendingDelta); err != nil {
-			return err
-		}
-
-		result.AddedAllocations = addedAlloc
-		result.ReleasedQuantity = releasedAmount
-		result.UsageQuantity = currentUsage + usageDelta
-		result.PendingQuantity = currentPending + pendingDelta
-
-		return nil
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	return result, nil
-}
-
-func (s *fifoService) ReleaseUsage(ctx context.Context, req StockReleaseRequest) error {
-	if req.UsableID == 0 || strings.TrimSpace(req.UsableKey.String()) == "" {
-		return errors.New("usable key and id are required")
-	}
-
-	return s.withTransaction(ctx, req.Tx, func(tx *gorm.DB) error {
-		cfg, ok := fifo.Usable(req.UsableKey)
-		if !ok {
-			return fmt.Errorf("usable %q is not registered", req.UsableKey)
-		}
-
-		ctxRow, err := s.loadUsableContext(ctx, tx, cfg, req.UsableID)
-		if err != nil {
-			return err
-		}
-
-		var usageDelta, pendingDelta float64
-		if ctxRow.UsageQty > 0 {
-			if _, err := s.releaseUsagePortion(ctx, tx, req.UsableKey, req.UsableID, ctxRow.UsageQty); err != nil {
-				return err
-			}
-			usageDelta -= ctxRow.UsageQty
-		}
-		if ctxRow.PendingQty > 0 {
-			pendingDelta -= ctxRow.PendingQty
-		}
-
-		if err := s.applyUsableDeltas(ctx, tx, cfg, req.UsableID, usageDelta, pendingDelta); err != nil {
-			return err
-		}
-
-		return s.allocations.ReleaseByUsable(ctx, req.UsableKey.String(), req.UsableID, req.Reason, func(db *gorm.DB) *gorm.DB {
-			return s.txOrDB(tx, db)
-		})
-	})
-}
-
-// --- helpers ---
-
-type usableContextRow struct {
-	ProductWarehouseID uint
-	UsageQty           float64
-	PendingQty         float64
-}
-
-func (s *fifoService) loadUsableContext(ctx context.Context, tx *gorm.DB, cfg fifo.UsableConfig, id uint) (*usableContextRow, error) {
-	var row usableContextRow
-
-	query := tx.Table(cfg.Table).
-		Select(fmt.Sprintf("%s AS product_warehouse_id, COALESCE(%s,0) AS usage_qty, COALESCE(%s,0) AS pending_qty", cfg.Columns.ProductWarehouseID, cfg.Columns.UsageQuantity, cfg.Columns.PendingQuantity)).
-		Where(fmt.Sprintf("%s = ?", cfg.Columns.ID), id).
-		Clauses(clause.Locking{Strength: "UPDATE"})
-
-	if cfg.Scope != nil {
-		query = cfg.Scope(query)
-	}
-
-	if err := query.Take(&row).Error; err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, fmt.Errorf("usable record %d not found", id)
-		}
-		return nil, err
-	}
-
-	return &row, nil
-}
-
-func (s *fifoService) incrementStockableQty(ctx context.Context, tx *gorm.DB, cfg fifo.StockableConfig, id uint, qty float64) error {
-	column := cfg.Columns.TotalQuantity
-
-	query := tx.Table(cfg.Table).
-		Where(fmt.Sprintf("%s = ?", cfg.Columns.ID), id)
-	if cfg.Scope != nil {
-		query = cfg.Scope(query)
-	}
-
-	updates := map[string]any{
-		column: gorm.Expr(fmt.Sprintf("COALESCE(%s,0) + ?", column), qty),
-	}
-	if cfg.Columns.TotalUsedQuantity != "" {
-		updates[cfg.Columns.TotalUsedQuantity] = gorm.Expr(fmt.Sprintf("COALESCE(%s,0)", cfg.Columns.TotalUsedQuantity))
-	}
-
-	return query.Updates(updates).Error
-}
-
-func (s *fifoService) incrementStockableUsage(ctx context.Context, tx *gorm.DB, cfg fifo.StockableConfig, id uint, qty float64) error {
-	if qty == 0 {
-		return nil
-	}
-	column := cfg.Columns.TotalUsedQuantity
-	query := tx.Table(cfg.Table).
-		Where(fmt.Sprintf("%s = ?", cfg.Columns.ID), id)
-	if cfg.Scope != nil {
-		query = cfg.Scope(query)
-	}
-
-	return query.Update(column, gorm.Expr(fmt.Sprintf("COALESCE(%s,0) + ?", column), qty)).Error
-}
-
-type allocationOutcome struct {
-	allocated   float64
-	pending     float64
-	allocations []AllocationDetail
-}
-
-type stockLot struct {
-	StockableKey fifo.StockableKey
-	RecordID     uint
-	AvailableQty float64
-	CreatedAt    time.Time
-}
-
-func (s *fifoService) allocateFromStock(
-	ctx context.Context,
-	tx *gorm.DB,
-	productWarehouseID uint,
-	usableKey fifo.UsableKey,
-	usableID uint,
-	requestQty float64,
-) (*allocationOutcome, error) {
-	lots, err := s.fetchStockLots(ctx, tx, productWarehouseID)
-	if err != nil {
-		return nil, err
-	}
-	if len(lots) == 0 {
-		return &allocationOutcome{pending: requestQty}, nil
-	}
-
-	var (
-		remaining           = requestQty
-		applied             float64
-		allocations         []*entities.StockAllocation
-		allocationSummaries []AllocationDetail
-		usageAdjustments    = make(map[fifo.StockableKey]map[uint]float64)
-	)
-
-	for _, lot := range lots {
-		if remaining <= 0 {
-			break
-		}
-		if lot.AvailableQty <= 0 {
-			continue
-		}
-
-		portion := lot.AvailableQty
-		if portion > remaining {
-			portion = remaining
-		}
-
-		applied += portion
-		remaining -= portion
-
-		allocationSummaries = append(allocationSummaries, AllocationDetail{
-			StockableKey: lot.StockableKey,
-			StockableID:  lot.RecordID,
-			Quantity:     portion,
-		})
-
-		allocations = append(allocations, &entities.StockAllocation{
-			ProductWarehouseId: productWarehouseID,
-			StockableType:      lot.StockableKey.String(),
-			StockableId:        lot.RecordID,
-			UsableType:         usableKey.String(),
-			UsableId:           usableID,
-			Qty:                portion,
-			Status:             entities.StockAllocationStatusActive,
-		})
-
-		if _, ok := usageAdjustments[lot.StockableKey]; !ok {
-			usageAdjustments[lot.StockableKey] = make(map[uint]float64)
-		}
-		usageAdjustments[lot.StockableKey][lot.RecordID] += portion
-	}
-
-	if len(allocations) > 0 {
-		if err := s.allocations.CreateMany(ctx, allocations, func(db *gorm.DB) *gorm.DB {
-			return s.txOrDB(tx, db)
-		}); err != nil {
-			return nil, err
-		}
-
-		for key, deltas := range usageAdjustments {
-			cfg, ok := fifo.Stockable(key)
-			if !ok {
-				continue
-			}
-			for id, qty := range deltas {
-				if err := s.incrementStockableUsage(ctx, tx, cfg, id, qty); err != nil {
-					return nil, err
-				}
-			}
-		}
-	}
-
-	return &allocationOutcome{
-		allocated:   applied,
-		pending:     remaining,
-		allocations: allocationSummaries,
-	}, nil
-}
-
-func (s *fifoService) fetchStockLots(ctx context.Context, tx *gorm.DB, productWarehouseID uint) ([]stockLot, error) {
-	configs := fifo.Stockables()
-	if len(configs) == 0 {
-		return nil, nil
-	}
-
-	var lots []stockLot
-	for key, cfg := range configs {
-		selectStmt := fmt.Sprintf(
-			"%s AS id, %s AS available_qty, %s AS created_at",
-			cfg.Columns.ID,
-			fmt.Sprintf("%s - COALESCE(%s,0)", cfg.Columns.TotalQuantity, cfg.Columns.TotalUsedQuantity),
-			cfg.Columns.CreatedAt,
-		)
-
-		var rows []struct {
-			ID           uint
-			AvailableQty float64
-			CreatedAt    time.Time
-		}
-
-		query := tx.Table(cfg.Table).
-			Select(selectStmt).
-			Where(fmt.Sprintf("%s = ?", cfg.Columns.ProductWarehouseID), productWarehouseID).
-			Where(fmt.Sprintf("%s > %s", cfg.Columns.TotalQuantity, cfg.Columns.TotalUsedQuantity))
-
-		if cfg.Scope != nil {
-			query = cfg.Scope(query)
-		}
-
-		for _, order := range s.orderClauses(cfg.OrderBy) {
-			query = query.Order(order)
-		}
-		query = query.Limit(s.maxLotsPerStockable)
-
-		if err := query.Find(&rows).Error; err != nil {
-			return nil, err
-		}
-
-		for _, row := range rows {
-			if row.AvailableQty <= 0 {
-				continue
-			}
-			lots = append(lots, stockLot{
-				StockableKey: key,
-				RecordID:     row.ID,
-				AvailableQty: row.AvailableQty,
-				CreatedAt:    row.CreatedAt,
-			})
-		}
-	}
-
-	if len(lots) == 0 {
-		return nil, nil
-	}
-
-	sort.SliceStable(lots, func(i, j int) bool {
-		if lots[i].CreatedAt.Equal(lots[j].CreatedAt) {
-			return lots[i].RecordID < lots[j].RecordID
-		}
-		return lots[i].CreatedAt.Before(lots[j].CreatedAt)
-	})
-
-	return lots, nil
-}
-
-func (s *fifoService) applyUsableDeltas(ctx context.Context, tx *gorm.DB, cfg fifo.UsableConfig, id uint, usageDelta, pendingDelta float64) error {
-	if usageDelta == 0 && pendingDelta == 0 {
-		return nil
-	}
-
-	updates := map[string]any{}
-	if usageDelta != 0 {
-		updates[cfg.Columns.UsageQuantity] = gorm.Expr(fmt.Sprintf("COALESCE(%s,0) + ?", cfg.Columns.UsageQuantity), usageDelta)
-	}
-	if pendingDelta != 0 {
-		updates[cfg.Columns.PendingQuantity] = gorm.Expr(fmt.Sprintf("COALESCE(%s,0) + ?", cfg.Columns.PendingQuantity), pendingDelta)
-	}
-
-	query := tx.Table(cfg.Table).Where(fmt.Sprintf("%s = ?", cfg.Columns.ID), id)
-	if cfg.Scope != nil {
-		query = cfg.Scope(query)
-	}
-
-	return query.Updates(updates).Error
-}
-
-type pendingCandidate struct {
-	UsableKey fifo.UsableKey
-	Config    fifo.UsableConfig
-	UsableID  uint
-	Pending   float64
-	CreatedAt time.Time
-}
-
-func (s *fifoService) resolvePendingForWarehouse(ctx context.Context, tx *gorm.DB, productWarehouseID uint) ([]PendingResolution, error) {
-	candidates, err := s.fetchPendingCandidates(ctx, tx, productWarehouseID)
-	if err != nil {
-		return nil, err
-	}
-	if len(candidates) == 0 {
-		return nil, nil
-	}
-
-	var resolutions []PendingResolution
-
-	for _, candidate := range candidates {
-		if candidate.Pending <= 0 {
-			continue
-		}
-
-		outcome, err := s.allocateFromStock(ctx, tx, productWarehouseID, candidate.UsableKey, candidate.UsableID, candidate.Pending)
-		if err != nil {
-			return nil, err
-		}
-		if outcome.allocated <= 0 {
-			break
-		}
-
-		if err := s.applyUsableDeltas(ctx, tx, candidate.Config, candidate.UsableID, outcome.allocated, -outcome.allocated); err != nil {
-			return nil, err
-		}
-
-		if err := s.productWarehouseRepo.AdjustQuantities(ctx, map[uint]float64{
-			productWarehouseID: -outcome.allocated,
-		}, func(db *gorm.DB) *gorm.DB {
-			return s.txOrDB(tx, db)
-		}); err != nil {
-			return nil, err
-		}
-
-		resolutions = append(resolutions, PendingResolution{
-			UsableKey: candidate.UsableKey,
-			UsableID:  candidate.UsableID,
-			Quantity:  outcome.allocated,
-		})
-
-		if outcome.pending > 0 {
-			// No more stock available for this warehouse at the moment.
-			break
-		}
-	}
-
-	return resolutions, nil
-}
-
-func (s *fifoService) releaseUsagePortion(
-	ctx context.Context,
-	tx *gorm.DB,
-	usableKey fifo.UsableKey,
-	usableID uint,
-	target float64,
-) (float64, error) {
-	if target <= 0 {
-		return 0, nil
-	}
-
-	allocations, err := s.allocations.FindActiveByUsable(ctx, usableKey.String(), usableID, func(db *gorm.DB) *gorm.DB {
-		target := s.txOrDB(tx, db)
-		return target.Clauses(clause.Locking{Strength: "UPDATE"})
-	})
-	if err != nil {
-		return 0, err
-	}
-	if len(allocations) == 0 {
-		return 0, nil
-	}
-
-	var (
-		remaining            = target
-		totalReleased        float64
-		warehouseAdjustments = make(map[uint]float64)
-		stockableAdjustments = make(map[fifo.StockableKey]map[uint]float64)
-	)
-
-	now := time.Now()
-
-	for i := len(allocations) - 1; i >= 0 && remaining > 0; i-- {
-		allocation := allocations[i]
-		releaseAmt := allocation.Qty
-		if releaseAmt > remaining {
-			releaseAmt = remaining
-		}
-
-		remaining -= releaseAmt
-		totalReleased += releaseAmt
-		warehouseAdjustments[allocation.ProductWarehouseId] += releaseAmt
-
-		key := fifo.StockableKey(allocation.StockableType)
-		if _, ok := stockableAdjustments[key]; !ok {
-			stockableAdjustments[key] = make(map[uint]float64)
-		}
-		stockableAdjustments[key][allocation.StockableId] += releaseAmt
-
-		if releaseAmt == allocation.Qty {
-			if err := s.allocations.PatchOne(ctx, allocation.Id, map[string]any{
-				"status":      entities.StockAllocationStatusReleased,
-				"released_at": now,
-			}, func(db *gorm.DB) *gorm.DB {
-				return s.txOrDB(tx, db)
-			}); err != nil {
-				return 0, err
-			}
-		} else {
-			if err := s.allocations.PatchOne(ctx, allocation.Id, map[string]any{
-				"quantity": allocation.Qty - releaseAmt,
-			}, func(db *gorm.DB) *gorm.DB {
-				return s.txOrDB(tx, db)
-			}); err != nil {
-				return 0, err
-			}
-		}
-	}
-
-	if totalReleased == 0 {
-		return 0, nil
-	}
-
-	for key, deltas := range stockableAdjustments {
-		cfg, ok := fifo.Stockable(key)
-		if !ok {
-			continue
-		}
-		for id, qty := range deltas {
-			if err := s.incrementStockableUsage(ctx, tx, cfg, id, -qty); err != nil {
-				return 0, err
-			}
-		}
-	}
-
-	if len(warehouseAdjustments) > 0 {
-		if err := s.productWarehouseRepo.AdjustQuantities(ctx, warehouseAdjustments, func(db *gorm.DB) *gorm.DB {
-			return s.txOrDB(tx, db)
-		}); err != nil {
-			return 0, err
-		}
-
-		for warehouseID := range warehouseAdjustments {
-			if _, err := s.resolvePendingForWarehouse(ctx, tx, warehouseID); err != nil {
-				return 0, err
-			}
-		}
-	}
-
-	return totalReleased, nil
-}
-
-func (s *fifoService) fetchPendingCandidates(ctx context.Context, tx *gorm.DB, productWarehouseID uint) ([]pendingCandidate, error) {
-	configs := fifo.Usables()
-	if len(configs) == 0 {
-		return nil, nil
-	}
-
-	var candidates []pendingCandidate
-
-	for key, cfg := range configs {
-		selectStmt := fmt.Sprintf(
-			"%s AS id, %s AS pending_qty, %s AS created_at",
-			cfg.Columns.ID,
-			cfg.Columns.PendingQuantity,
-			cfg.Columns.CreatedAt,
-		)
-
-		var rows []struct {
-			ID        uint
-			Pending   float64
-			CreatedAt time.Time
-		}
-
-		query := tx.Table(cfg.Table).
-			Select(selectStmt).
-			Where(fmt.Sprintf("%s = ?", cfg.Columns.ProductWarehouseID), productWarehouseID).
-			Where(fmt.Sprintf("%s > 0", cfg.Columns.PendingQuantity)).
-			Limit(s.pendingBatchPerUsable)
-
-		if cfg.Scope != nil {
-			query = cfg.Scope(query)
-		}
-
-		for _, order := range s.orderClauses(cfg.OrderBy) {
-			query = query.Order(order)
-		}
-
-		if err := query.Find(&rows).Error; err != nil {
-			return nil, err
-		}
-
-		for _, row := range rows {
-			if row.Pending <= 0 {
-				continue
-			}
-			candidates = append(candidates, pendingCandidate{
-				UsableKey: key,
-				Config:    cfg,
-				UsableID:  row.ID,
-				Pending:   row.Pending,
-				CreatedAt: row.CreatedAt,
-			})
-		}
-	}
-
-	if len(candidates) == 0 {
-		return nil, nil
-	}
-
-	sort.SliceStable(candidates, func(i, j int) bool {
-		if candidates[i].CreatedAt.Equal(candidates[j].CreatedAt) {
-			return candidates[i].UsableID < candidates[j].UsableID
-		}
-		return candidates[i].CreatedAt.Before(candidates[j].CreatedAt)
-	})
-
-	return candidates, nil
-}
-
-func (s *fifoService) orderClauses(custom []string) []string {
-	if len(custom) > 0 {
-		return custom
-	}
-	return s.defaultOrderBy
-}

internal/config/config.go

@@ -65,14 +65,6 @@ var (
 	SSOUserSyncDrift        time.Duration
 	SSOUserSyncNonceTTL     time.Duration
 	SSOUserSyncMaxBodyBytes int
-	S3Endpoint              string
-	S3Region                string
-	S3Bucket                string
-	S3AccessKey             string
-	S3SecretKey             string
-	S3ForcePathStyle        bool
-	S3PublicBaseURL         string
-	S3DocumentKeyPrefix     string
 )
 
 func init() {
@@ -114,16 +106,6 @@ func init() {
 	// Redis
 	RedisURL = viper.GetString("REDIS_URL")
 
-	// Object storage
-	S3Endpoint = strings.TrimSpace(viper.GetString("S3_ENDPOINT"))
-	S3Region = strings.TrimSpace(viper.GetString("S3_REGION"))
-	S3Bucket = strings.TrimSpace(viper.GetString("S3_BUCKET"))
-	S3AccessKey = strings.TrimSpace(viper.GetString("S3_ACCESS_KEY"))
-	S3SecretKey = strings.TrimSpace(viper.GetString("S3_SECRET_KEY"))
-	S3ForcePathStyle = viper.GetBool("S3_FORCE_PATH_STYLE")
-	S3PublicBaseURL = strings.TrimSuffix(strings.TrimSpace(viper.GetString("S3_PUBLIC_BASE_URL")), "/")
-	S3DocumentKeyPrefix = defaultString(strings.Trim(strings.TrimSpace(viper.GetString("S3_DOCUMENT_PREFIX")), "/"), "docs")
-
 	// SSO integration
 	SSOIssuer = viper.GetString("SSO_ISSUER")
 	SSOJWKSURL = viper.GetString("SSO_JWKS_URL")

internal/database/migrations/20250925040409_create_master_tables.up.sql

@@ -2,42 +2,42 @@
 CREATE TABLE users (
     id BIGSERIAL PRIMARY KEY,
     id_user BIGINT NOT NULL,
-    name VARCHAR(50) NOT NULL,
-    email VARCHAR(50) NOT NULL,
-    created_at TIMESTAMPTZ DEFAULT NOW (),
-    updated_at TIMESTAMPTZ DEFAULT NOW (),
+    name VARCHAR NOT NULL,
+    email VARCHAR NOT NULL,
+    created_at TIMESTAMPTZ DEFAULT NOW(),
+    updated_at TIMESTAMPTZ DEFAULT NOW(),
     deleted_at TIMESTAMPTZ
 );
 
-CREATE UNIQUE INDEX users_id_user_unique ON users (id_user)
-WHERE
-    deleted_at IS NULL;
+CREATE UNIQUE INDEX users_id_user_unique ON users (id_user) WHERE deleted_at IS NULL;
 
-CREATE UNIQUE INDEX users_email_unique ON users (email)
-WHERE
-    deleted_at IS NULL;
+CREATE UNIQUE INDEX users_email_unique ON users (email) WHERE deleted_at IS NULL;
 
 -- FLAGS
 CREATE TABLE flags (
     id BIGSERIAL PRIMARY KEY,
-    name VARCHAR(50) NOT NULL,
+    name VARCHAR NOT NULL,
     flagable_id BIGINT NOT NULL,
     flagable_type VARCHAR(50) NOT NULL,
-    created_at TIMESTAMPTZ DEFAULT NOW (),
-    updated_at TIMESTAMPTZ DEFAULT NOW ()
+    created_at TIMESTAMPTZ DEFAULT NOW(),
+    updated_at TIMESTAMPTZ DEFAULT NOW()
 );
 
-CREATE UNIQUE INDEX flags_unique_flagable ON flags (name, flagable_id, flagable_type);
+CREATE UNIQUE INDEX flags_unique_flagable ON flags (
+    name,
+    flagable_id,
+    flagable_type
+);
 
 CREATE INDEX flags_flagable_lookup ON flags (flagable_type, flagable_id);
 
 -- PRODUCT CATEGORIES
 CREATE TABLE product_categories (
     id BIGSERIAL PRIMARY KEY,
-    name VARCHAR(50) NOT NULL,
+    name VARCHAR NOT NULL,
     code VARCHAR(10) NOT NULL,
-    created_at TIMESTAMPTZ DEFAULT NOW (),
-    updated_at TIMESTAMPTZ DEFAULT NOW (),
+    created_at TIMESTAMPTZ DEFAULT NOW(),
+    updated_at TIMESTAMPTZ DEFAULT NOW(),
     deleted_at TIMESTAMPTZ,
     created_by BIGINT REFERENCES users (id) ON DELETE SET NULL ON UPDATE CASCADE
 );
@@ -53,9 +53,9 @@ WHERE
 -- UOM
 CREATE TABLE uoms (
     id BIGSERIAL PRIMARY KEY,
-    name VARCHAR(50) NOT NULL,
-    created_at TIMESTAMPTZ DEFAULT NOW (),
-    updated_at TIMESTAMPTZ DEFAULT NOW (),
+    name VARCHAR NOT NULL,
+    created_at TIMESTAMPTZ DEFAULT NOW(),
+    updated_at TIMESTAMPTZ DEFAULT NOW(),
     deleted_at TIMESTAMPTZ,
     created_by BIGINT REFERENCES users (id) ON DELETE SET NULL ON UPDATE CASCADE
 );
@@ -67,12 +67,12 @@ WHERE
 -- BANKS
 CREATE TABLE banks (
     id BIGSERIAL PRIMARY KEY,
-    name VARCHAR(50) NOT NULL,
+    name VARCHAR NOT NULL,
     alias VARCHAR(5) NOT NULL,
-    owner VARCHAR(50),
+    owner VARCHAR,
     account_number VARCHAR(50) NOT NULL,
-    created_at TIMESTAMPTZ DEFAULT NOW (),
-    updated_at TIMESTAMPTZ DEFAULT NOW (),
+    created_at TIMESTAMPTZ DEFAULT NOW(),
+    updated_at TIMESTAMPTZ DEFAULT NOW(),
     deleted_at TIMESTAMPTZ,
     created_by BIGINT REFERENCES users (id) ON DELETE SET NULL ON UPDATE CASCADE
 );
@@ -84,9 +84,9 @@ WHERE
 -- AREAS
 CREATE TABLE areas (
     id BIGSERIAL PRIMARY KEY,
-    name VARCHAR(50) NOT NULL,
-    created_at TIMESTAMPTZ DEFAULT NOW (),
-    updated_at TIMESTAMPTZ DEFAULT NOW (),
+    name VARCHAR NOT NULL,
+    created_at TIMESTAMPTZ DEFAULT NOW(),
+    updated_at TIMESTAMPTZ DEFAULT NOW(),
     deleted_at TIMESTAMPTZ,
     created_by BIGINT REFERENCES users (id) ON DELETE SET NULL ON UPDATE CASCADE
 );
@@ -98,11 +98,11 @@ WHERE
 -- LOCATIONS
 CREATE TABLE locations (
     id BIGSERIAL PRIMARY KEY,
-    name VARCHAR(50) NOT NULL,
+    name VARCHAR NOT NULL,
     address TEXT NOT NULL,
     area_id BIGINT NOT NULL REFERENCES areas (id) ON DELETE RESTRICT ON UPDATE CASCADE,
-    created_at TIMESTAMPTZ DEFAULT NOW (),
-    updated_at TIMESTAMPTZ DEFAULT NOW (),
+    created_at TIMESTAMPTZ DEFAULT NOW(),
+    updated_at TIMESTAMPTZ DEFAULT NOW(),
     deleted_at TIMESTAMPTZ,
     created_by BIGINT REFERENCES users (id) ON DELETE SET NULL ON UPDATE CASCADE
 );
@@ -114,11 +114,11 @@ WHERE
 -- KANDANG
 CREATE TABLE kandangs (
     id BIGSERIAL PRIMARY KEY,
-    name VARCHAR(50) NOT NULL,
+    name VARCHAR NOT NULL,
     location_id BIGINT NOT NULL REFERENCES locations (id) ON DELETE RESTRICT ON UPDATE CASCADE,
     pic_id BIGINT REFERENCES users (id) ON DELETE SET NULL ON UPDATE CASCADE,
-    created_at TIMESTAMPTZ DEFAULT NOW (),
-    updated_at TIMESTAMPTZ DEFAULT NOW (),
+    created_at TIMESTAMPTZ DEFAULT NOW(),
+    updated_at TIMESTAMPTZ DEFAULT NOW(),
     deleted_at TIMESTAMPTZ,
     created_by BIGINT REFERENCES users (id) ON DELETE SET NULL ON UPDATE CASCADE
 );
@@ -130,13 +130,13 @@ WHERE
 -- WAREHOUSES
 CREATE TABLE warehouses (
     id BIGSERIAL PRIMARY KEY,
-    name VARCHAR(50) NOT NULL,
+    name VARCHAR NOT NULL,
     type VARCHAR(50) NOT NULL,
     area_id BIGINT NOT NULL REFERENCES areas (id) ON DELETE RESTRICT ON UPDATE CASCADE,
     location_id BIGINT REFERENCES locations (id) ON DELETE SET NULL ON UPDATE CASCADE,
     kandang_id BIGINT REFERENCES kandangs (id) ON DELETE SET NULL ON UPDATE CASCADE,
-    created_at TIMESTAMPTZ DEFAULT NOW (),
-    updated_at TIMESTAMPTZ DEFAULT NOW (),
+    created_at TIMESTAMPTZ DEFAULT NOW(),
+    updated_at TIMESTAMPTZ DEFAULT NOW(),
     deleted_at TIMESTAMPTZ,
     created_by BIGINT REFERENCES users (id) ON DELETE SET NULL ON UPDATE CASCADE
 );
@@ -148,16 +148,16 @@ WHERE
 -- CUSTOMERS
 CREATE TABLE customers (
     id BIGSERIAL PRIMARY KEY,
-    name VARCHAR(50) NOT NULL,
+    name VARCHAR NOT NULL,
     pic_id BIGINT REFERENCES users (id) ON DELETE SET NULL ON UPDATE CASCADE,
     type VARCHAR(50) NOT NULL,
     address TEXT NOT NULL,
     phone VARCHAR(20) NOT NULL,
-    email VARCHAR(50) NOT NULL,
+    email VARCHAR NOT NULL,
     account_number VARCHAR(50) NOT NULL,
     balance NUMERIC(15, 3) DEFAULT 0,
-    created_at TIMESTAMPTZ DEFAULT NOW (),
-    updated_at TIMESTAMPTZ DEFAULT NOW (),
+    created_at TIMESTAMPTZ DEFAULT NOW(),
+    updated_at TIMESTAMPTZ DEFAULT NOW(),
     deleted_at TIMESTAMPTZ,
     created_by BIGINT REFERENCES users (id) ON DELETE SET NULL ON UPDATE CASCADE
 );
@@ -169,10 +169,10 @@ WHERE
 -- NONSTOCK
 CREATE TABLE nonstocks (
     id BIGSERIAL PRIMARY KEY,
-    name VARCHAR(50) NOT NULL,
+    name VARCHAR NOT NULL,
     uom_id BIGINT NOT NULL REFERENCES uoms (id) ON DELETE RESTRICT ON UPDATE CASCADE,
-    created_at TIMESTAMPTZ DEFAULT NOW (),
-    updated_at TIMESTAMPTZ DEFAULT NOW (),
+    created_at TIMESTAMPTZ DEFAULT NOW(),
+    updated_at TIMESTAMPTZ DEFAULT NOW(),
     deleted_at TIMESTAMPTZ,
     created_by BIGINT REFERENCES users (id) ON DELETE SET NULL ON UPDATE CASCADE
 );
@@ -184,9 +184,9 @@ WHERE
 -- FCR
 CREATE TABLE fcrs (
     id BIGSERIAL PRIMARY KEY,
-    name VARCHAR(50) NOT NULL,
-    created_at TIMESTAMPTZ DEFAULT NOW (),
-    updated_at TIMESTAMPTZ DEFAULT NOW (),
+    name VARCHAR NOT NULL,
+    created_at TIMESTAMPTZ DEFAULT NOW(),
+    updated_at TIMESTAMPTZ DEFAULT NOW(),
     deleted_at TIMESTAMPTZ,
     created_by BIGINT REFERENCES users (id) ON DELETE SET NULL ON UPDATE CASCADE
 );
@@ -201,29 +201,29 @@ CREATE TABLE fcr_standards (
     weight NUMERIC(15, 3) NOT NULL,
     fcr_number NUMERIC(15, 3) NOT NULL,
     mortality NUMERIC(15, 3) NOT NULL,
-    created_at TIMESTAMPTZ DEFAULT NOW (),
-    updated_at TIMESTAMPTZ DEFAULT NOW (),
+    created_at TIMESTAMPTZ DEFAULT NOW(),
+    updated_at TIMESTAMPTZ DEFAULT NOW(),
     deleted_at TIMESTAMPTZ
 );
 
 -- SUPPLIERS
 CREATE TABLE suppliers (
     id BIGSERIAL PRIMARY KEY,
-    name VARCHAR(50) NOT NULL,
+    name VARCHAR NOT NULL,
     alias VARCHAR(5) NOT NULL,
-    pic VARCHAR(50) NOT NULL,
+    pic VARCHAR NOT NULL,
     type VARCHAR(50) NOT NULL,
     category VARCHAR(20) NOT NULL,
-    hatchery VARCHAR(50),
+    hatchery VARCHAR,
     phone VARCHAR(20) NOT NULL,
-    email VARCHAR(50) NOT NULL,
+    email VARCHAR NOT NULL,
     address TEXT NOT NULL,
     npwp VARCHAR(50),
     account_number VARCHAR(50),
     balance NUMERIC(15, 3) DEFAULT 0,
     due_date INT NOT NULL,
-    created_at TIMESTAMPTZ DEFAULT NOW (),
-    updated_at TIMESTAMPTZ DEFAULT NOW (),
+    created_at TIMESTAMPTZ DEFAULT NOW(),
+    updated_at TIMESTAMPTZ DEFAULT NOW(),
     deleted_at TIMESTAMPTZ,
     created_by BIGINT REFERENCES users (id) ON DELETE SET NULL ON UPDATE CASCADE
 );
@@ -235,15 +235,15 @@ WHERE
 CREATE TABLE nonstock_suppliers (
     nonstock_id BIGINT NOT NULL REFERENCES nonstocks (id) ON DELETE CASCADE ON UPDATE CASCADE,
     supplier_id BIGINT NOT NULL REFERENCES suppliers (id) ON DELETE CASCADE ON UPDATE CASCADE,
-    created_at TIMESTAMPTZ DEFAULT NOW (),
+    created_at TIMESTAMPTZ DEFAULT NOW(),
     PRIMARY KEY (nonstock_id, supplier_id)
 );
 
 -- PRODUCTS
 CREATE TABLE products (
     id BIGSERIAL PRIMARY KEY,
-    name VARCHAR(50) NOT NULL,
-    brand VARCHAR(50) NOT NULL,
+    name VARCHAR NOT NULL,
+    brand VARCHAR NOT NULL,
     sku VARCHAR(100),
     uom_id BIGINT NOT NULL REFERENCES uoms (id) ON DELETE RESTRICT ON UPDATE CASCADE,
     product_category_id BIGINT NOT NULL REFERENCES product_categories (id) ON DELETE RESTRICT ON UPDATE CASCADE,
@@ -251,8 +251,8 @@ CREATE TABLE products (
     selling_price NUMERIC(15, 3),
     tax NUMERIC(15, 3),
     expiry_period INT,
-    created_at TIMESTAMPTZ DEFAULT NOW (),
-    updated_at TIMESTAMPTZ DEFAULT NOW (),
+    created_at TIMESTAMPTZ DEFAULT NOW(),
+    updated_at TIMESTAMPTZ DEFAULT NOW(),
     deleted_at TIMESTAMPTZ,
     created_by BIGINT REFERENCES users (id) ON DELETE SET NULL ON UPDATE CASCADE
 );
@@ -268,15 +268,15 @@ WHERE
 CREATE TABLE product_suppliers (
     product_id BIGINT NOT NULL REFERENCES products (id) ON DELETE CASCADE ON UPDATE CASCADE,
     supplier_id BIGINT NOT NULL REFERENCES suppliers (id) ON DELETE CASCADE ON UPDATE CASCADE,
-    created_at TIMESTAMPTZ DEFAULT NOW (),
+    created_at TIMESTAMPTZ DEFAULT NOW(),
     PRIMARY KEY (product_id, supplier_id)
 );
 
 -- PROJECTS
 CREATE TABLE projects (
     id BIGSERIAL PRIMARY KEY,
-    created_at TIMESTAMPTZ DEFAULT NOW (),
-    updated_at TIMESTAMPTZ DEFAULT NOW (),
+    created_at TIMESTAMPTZ DEFAULT NOW(),
+    updated_at TIMESTAMPTZ DEFAULT NOW(),
     deleted_at TIMESTAMPTZ,
     created_by BIGINT REFERENCES users (id) ON DELETE SET NULL ON UPDATE CASCADE
 );
@@ -288,8 +288,8 @@ CREATE TABLE product_warehouses (
     warehouse_id BIGINT NOT NULL REFERENCES warehouses (id),
     quantity INTEGER NOT NULL DEFAULT 0,
     created_by BIGINT NOT NULL REFERENCES users (id),
-    created_at TIMESTAMPTZ DEFAULT NOW (),
-    updated_at TIMESTAMPTZ DEFAULT NOW (),
+    created_at TIMESTAMPTZ DEFAULT NOW(),
+    updated_at TIMESTAMPTZ DEFAULT NOW(),
     deleted_at TIMESTAMPTZ
 );
 
@@ -316,8 +316,8 @@ CREATE TABLE stock_logs (
     note TEXT,
     product_warehouse_id BIGINT NOT NULL REFERENCES product_warehouses (id) ON DELETE CASCADE ON UPDATE CASCADE,
     created_by BIGINT NOT NULL REFERENCES users (id) ON DELETE SET NULL ON UPDATE CASCADE,
-    created_at TIMESTAMPTZ DEFAULT NOW (),
-    updated_at TIMESTAMPTZ DEFAULT NOW (),
+    created_at TIMESTAMPTZ DEFAULT NOW(),
+    updated_at TIMESTAMPTZ DEFAULT NOW(),
     deleted_at TIMESTAMPTZ
 );
 
@@ -330,4 +330,4 @@ CREATE INDEX stock_logs_created_by_idx ON stock_logs (created_by);
 
 CREATE INDEX stock_logs_created_at_idx ON stock_logs (created_at);
 
-CREATE INDEX stock_logs_deleted_at_idx ON stock_logs (deleted_at);
+CREATE INDEX stock_logs_deleted_at_idx ON stock_logs (deleted_at);

internal/database/migrations/20251110070219_create_stock_allocations_table.down.sql

@@ -1,7 +0,0 @@
-DROP INDEX IF EXISTS stock_allocations_released_at_idx;
-DROP INDEX IF EXISTS stock_allocations_status_idx;
-DROP INDEX IF EXISTS stock_allocations_usage_lookup;
-DROP INDEX IF EXISTS stock_allocations_lookup;
-DROP INDEX IF EXISTS stock_allocations_product_warehouse_id_idx;
-
-DROP TABLE IF EXISTS stock_allocations;

internal/database/migrations/20251110070219_create_stock_allocations_table.up.sql

@@ -1,30 +0,0 @@
-CREATE TABLE IF NOT EXISTS stock_allocations (
-    id BIGSERIAL PRIMARY KEY,
-    product_warehouse_id BIGINT NOT NULL REFERENCES product_warehouses(id),
-    stockable_type VARCHAR(100) NOT NULL,
-    stockable_id BIGINT NOT NULL,
-    usable_type VARCHAR(100) NOT NULL,
-    usable_id BIGINT NOT NULL,
-    qty NUMERIC(15,3) NOT NULL,
-    status VARCHAR(20) NOT NULL DEFAULT 'ACTIVE',
-    note TEXT NULL,
-    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-    updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-    released_at TIMESTAMPTZ NULL,
-    deleted_at TIMESTAMPTZ NULL
-);
-
-CREATE INDEX IF NOT EXISTS stock_allocations_product_warehouse_id_idx
-    ON stock_allocations (product_warehouse_id);
-
-CREATE INDEX IF NOT EXISTS stock_allocations_lookup
-    ON stock_allocations (stockable_type, stockable_id);
-
-CREATE INDEX IF NOT EXISTS stock_allocations_usage_lookup
-    ON stock_allocations (usable_type, usable_id);
-
-CREATE INDEX IF NOT EXISTS stock_allocations_status_idx
-    ON stock_allocations (status);
-
-CREATE INDEX IF NOT EXISTS stock_allocations_released_at_idx
-    ON stock_allocations (released_at);

internal/database/migrations/20251117034511_create_expenses_table.up.sql

@@ -1,7 +1,7 @@
 CREATE TABLE expenses (
     id BIGSERIAL PRIMARY KEY,
     reference_number VARCHAR(50) UNIQUE NOT NULL,
-    supplier_id BIGINT NOT NULL,
+    supplier_id BIGINT NULL,
     category VARCHAR(50) NOT NULL CHECK (
         category IN ('BOP', 'NON-BOP')
     ),

internal/database/migrations/20251125055613_update_expneses_expense_nostock_and_expense_ralization.up.sql

@@ -1,44 +0,0 @@
--- ============================
--- EXPENSES
--- ============================
-ALTER TABLE expenses DROP COLUMN IF EXISTS grand_total;
-
-ALTER TABLE expenses RENAME COLUMN note TO notes;
-
-ALTER TABLE expenses RENAME COLUMN expense_date TO transaction_date;
-
--- ============================
--- EXPENSE_REALIZATIONS
--- ============================
-ALTER TABLE expense_realizations
-RENAME COLUMN realization_qty TO qty;
-
-ALTER TABLE expense_realizations
-RENAME COLUMN realization_unit_price TO price;
-
-ALTER TABLE expense_realizations RENAME COLUMN note TO notes;
-
-ALTER TABLE expense_realizations
-DROP COLUMN IF EXISTS realization_total_price;
-
-ALTER TABLE expense_realizations
-DROP COLUMN IF EXISTS realization_date;
-
-ALTER TABLE expense_realizations DROP COLUMN IF EXISTS created_by;
-
-ALTER TABLE expense_realizations
-ADD COLUMN IF NOT EXISTS created_at TIMESTAMPTZ DEFAULT NOW();
-
--- ============================
--- EXPENSE_NONSTOCKS
--- ============================
-ALTER TABLE expense_nonstocks RENAME COLUMN note TO notes;
-
-ALTER TABLE expense_nonstocks DROP COLUMN IF EXISTS total_price;
-
-ALTER TABLE expense_nonstocks RENAME COLUMN unit_price TO price;
-
-ALTER TABLE expense_nonstocks DROP COLUMN IF EXISTS created_by;
-
-ALTER TABLE expense_nonstocks
-ADD COLUMN IF NOT EXISTS created_at TIMESTAMPTZ DEFAULT NOW();

internal/database/migrations/20251127070744_create_project_budgets.down.sql

@@ -1,2 +0,0 @@
-DROP Table IF EXISTS project_budgets;
-

internal/database/migrations/20251127070744_create_project_budgets.up.sql

@@ -1,31 +0,0 @@
-CREATE TABLE project_budgets (
-    id BIGSERIAL PRIMARY KEY,
-    project_flock_id BIGINT NOT NULL,
-    nonstock_id BIGINT NOT NULL,
-    qty NUMERIC(15, 3) NOT NULL,
-    price NUMERIC(15, 3) NOT NULL,
-    created_at TIMESTAMPTZ DEFAULT now()
-);
-
--- Tambahkan Foreign Key ke project_flocks
-DO $$
-BEGIN
-    IF EXISTS (SELECT 1 FROM pg_tables WHERE tablename = 'project_flocks') THEN
-        ALTER TABLE project_budgets
-            ADD CONSTRAINT fk_project_budgets_project_flock_id 
-            FOREIGN KEY (project_flock_id) REFERENCES project_flocks(id);
-    END IF;
-END $$;
--- Tambahkan Foreign Key ke nonstocks
-DO $$
-BEGIN
-    IF EXISTS (SELECT 1 FROM pg_tables WHERE tablename = 'nonstocks') THEN
-        ALTER TABLE project_budgets
-            ADD CONSTRAINT fk_project_budgets_nonstock_id 
-            FOREIGN KEY (nonstock_id) REFERENCES nonstocks(id);
-    END IF;
-END $$;
--- Index
-CREATE INDEX idx_project_budgets_project_flock_id ON project_budgets (project_flock_id);
-
-CREATE INDEX idx_project_budgets_nonstock_id ON project_budgets (nonstock_id);

internal/database/migrations/20251201140316_add_is_visible_to_products.down.sql

@@ -1,2 +0,0 @@
-ALTER TABLE products
-DROP COLUMN IF EXISTS is_visible;

internal/database/migrations/20251201140316_add_is_visible_to_products.up.sql

@@ -1,2 +0,0 @@
-ALTER TABLE products
-ADD COLUMN IF NOT EXISTS is_visible BOOLEAN NOT NULL DEFAULT TRUE;

internal/database/migrations/20251202103838_create_document_table.down.sql

@@ -1,2 +0,0 @@
-DROP INDEX IF EXISTS documents_documentable_polymorphic;
-DROP TABLE IF EXISTS documents;

internal/database/migrations/20251202103838_create_document_table.up.sql

@@ -1,14 +0,0 @@
-CREATE TABLE documents (
-    id BIGSERIAL PRIMARY KEY,
-    documentable_type VARCHAR(50) NOT NULL,
-    documentable_id BIGINT NOT NULL,
-    type VARCHAR(50) NOT NULL,
-    path VARCHAR(50) NOT NULL,
-    name VARCHAR(50) NOT NULL,
-    ext VARCHAR(50) NOT NULL,
-    size NUMERIC(15, 3) NOT NULL,
-    created_by BIGINT REFERENCES users (id) ON DELETE RESTRICT ON UPDATE CASCADE,
-    created_at TIMESTAMPTZ DEFAULT now()
-);
-
-CREATE INDEX documents_documentable_polymorphic ON documents (documentable_type, documentable_id);

internal/database/migrations/20251203083339_add_project_flock_kandang_to_product_warehouses.down.sql

@@ -1,35 +0,0 @@
-BEGIN;
-
--- Drop new indexes and FK
-DROP INDEX IF EXISTS idx_product_warehouses_project_flock_kandang_id;
-DROP INDEX IF EXISTS idx_product_warehouses_unique;
-
-ALTER TABLE product_warehouses
-    DROP CONSTRAINT IF EXISTS fk_product_warehouses_project_flock_kandang_id,
-    ALTER COLUMN project_flock_kandang_id DROP NOT NULL,
-    DROP COLUMN IF EXISTS project_flock_kandang_id;
-
--- Revert qty to integer quantity
-ALTER TABLE product_warehouses
-    RENAME COLUMN qty TO quantity;
-
-ALTER TABLE product_warehouses
-    ALTER COLUMN quantity TYPE INTEGER USING quantity::integer,
-    ALTER COLUMN quantity SET DEFAULT 0,
-    ALTER COLUMN quantity SET NOT NULL;
-
--- Restore audit/soft-delete columns
-ALTER TABLE product_warehouses
-    ADD COLUMN IF NOT EXISTS created_by BIGINT NOT NULL REFERENCES users (id),
-    ADD COLUMN IF NOT EXISTS created_at TIMESTAMPTZ DEFAULT NOW(),
-    ADD COLUMN IF NOT EXISTS updated_at TIMESTAMPTZ DEFAULT NOW(),
-    ADD COLUMN IF NOT EXISTS deleted_at TIMESTAMPTZ;
-
--- Recreate prior indexes
-CREATE INDEX IF NOT EXISTS idx_product_warehouses_deleted_at ON product_warehouses (deleted_at);
-
-CREATE UNIQUE INDEX IF NOT EXISTS idx_product_warehouses_unique
-    ON product_warehouses (product_id, warehouse_id)
-    WHERE deleted_at IS NULL;
-
-COMMIT;

internal/database/migrations/20251203083339_add_project_flock_kandang_to_product_warehouses.up.sql

@@ -1,41 +0,0 @@
-BEGIN;
-
--- Drop indexes that depend on deleted_at or old uniqueness
-DROP INDEX IF EXISTS idx_product_warehouses_deleted_at;
-DROP INDEX IF EXISTS idx_product_warehouses_unique;
-
--- Add new relation and adjust quantity column
-ALTER TABLE product_warehouses
-    ADD COLUMN IF NOT EXISTS project_flock_kandang_id BIGINT;
-
-ALTER TABLE product_warehouses
-    RENAME COLUMN quantity TO qty;
-
--- Enforce numeric quantity with precision and default
-ALTER TABLE product_warehouses
-    ALTER COLUMN qty TYPE NUMERIC(15, 3) USING qty::numeric(15, 3),
-    ALTER COLUMN qty SET DEFAULT 0,
-    ALTER COLUMN qty SET NOT NULL;
-
--- Remove audit/soft-delete columns no longer used
-ALTER TABLE product_warehouses
-    DROP COLUMN IF EXISTS created_by,
-    DROP COLUMN IF EXISTS created_at,
-    DROP COLUMN IF EXISTS updated_at,
-    DROP COLUMN IF EXISTS deleted_at;
-
--- Enforce FK and not-null for project_flock_kandang_id
-ALTER TABLE product_warehouses
-    ADD CONSTRAINT fk_product_warehouses_project_flock_kandang_id
-        FOREIGN KEY (project_flock_kandang_id)
-        REFERENCES project_flock_kandangs (id)
-        ON DELETE RESTRICT ON UPDATE CASCADE;
-
--- New indexes
-CREATE INDEX IF NOT EXISTS idx_product_warehouses_project_flock_kandang_id
-    ON product_warehouses (project_flock_kandang_id);
-
-CREATE UNIQUE INDEX IF NOT EXISTS idx_product_warehouses_unique
-    ON product_warehouses (product_id, warehouse_id, project_flock_kandang_id);
-
-COMMIT;

internal/database/migrations/20251203103853_update_stock_logs_schema.down.sql

@@ -1,44 +0,0 @@
-BEGIN;
-
--- Drop new indexes
-DROP INDEX IF EXISTS stock_logs_loggable_type_loggable_id_idx;
-DROP INDEX IF EXISTS stock_logs_product_warehouse_id_idx;
-DROP INDEX IF EXISTS stock_logs_created_by_idx;
-DROP INDEX IF EXISTS stock_logs_created_at_idx;
-
--- Restore obsolete columns
-ALTER TABLE stock_logs
-    ADD COLUMN IF NOT EXISTS transaction_type VARCHAR(20) DEFAULT '' NOT NULL,
-    ADD COLUMN IF NOT EXISTS quantity NUMERIC(15, 3) DEFAULT 0 NOT NULL,
-    ADD COLUMN IF NOT EXISTS before_quantity NUMERIC(15, 3) DEFAULT 0 NOT NULL,
-    ADD COLUMN IF NOT EXISTS after_quantity NUMERIC(15, 3) DEFAULT 0 NOT NULL,
-    ADD COLUMN IF NOT EXISTS updated_at TIMESTAMPTZ DEFAULT NOW(),
-    ADD COLUMN IF NOT EXISTS deleted_at TIMESTAMPTZ;
-
--- Rename columns back
-ALTER TABLE stock_logs
-    RENAME COLUMN loggable_type TO log_type;
-
-ALTER TABLE stock_logs
-    RENAME COLUMN loggable_id TO log_id;
-
-ALTER TABLE stock_logs
-    RENAME COLUMN notes TO note;
-
--- Drop new columns
-ALTER TABLE stock_logs
-    DROP COLUMN IF EXISTS increase,
-    DROP COLUMN IF EXISTS decrease;
-
--- Restore indexes for old structure
-CREATE INDEX IF NOT EXISTS stock_logs_product_warehouse_id_idx ON stock_logs (product_warehouse_id);
-
-CREATE INDEX IF NOT EXISTS stock_logs_log_type_log_id_idx ON stock_logs (log_type, log_id);
-
-CREATE INDEX IF NOT EXISTS stock_logs_created_by_idx ON stock_logs (created_by);
-
-CREATE INDEX IF NOT EXISTS stock_logs_created_at_idx ON stock_logs (created_at);
-
-CREATE INDEX IF NOT EXISTS stock_logs_deleted_at_idx ON stock_logs (deleted_at);
-
-COMMIT;

internal/database/migrations/20251203103853_update_stock_logs_schema.up.sql

@@ -1,50 +0,0 @@
-BEGIN;
-
--- Drop old indexes tied to removed columns
-DROP INDEX IF EXISTS stock_logs_log_type_log_id_idx;
-DROP INDEX IF EXISTS stock_logs_deleted_at_idx;
-
--- Rename columns to new naming
-ALTER TABLE stock_logs
-    RENAME COLUMN log_type TO loggable_type;
-
-ALTER TABLE stock_logs
-    RENAME COLUMN log_id TO loggable_id;
-
-ALTER TABLE stock_logs
-    RENAME COLUMN note TO notes;
-
--- Add new increase/decrease columns
-ALTER TABLE stock_logs
-    ADD COLUMN IF NOT EXISTS increase NUMERIC(15, 3) DEFAULT 0,
-    ADD COLUMN IF NOT EXISTS decrease NUMERIC(15, 3) DEFAULT 0;
-
--- Adjust column definitions
-ALTER TABLE stock_logs
-    ALTER COLUMN loggable_type TYPE VARCHAR(50),
-    ALTER COLUMN loggable_type SET NOT NULL,
-    ALTER COLUMN loggable_id SET NOT NULL,
-    ALTER COLUMN increase SET DEFAULT 0,
-    ALTER COLUMN increase SET NOT NULL,
-    ALTER COLUMN decrease SET DEFAULT 0,
-    ALTER COLUMN decrease SET NOT NULL;
-
--- Remove obsolete columns
-ALTER TABLE stock_logs
-    DROP COLUMN IF EXISTS transaction_type,
-    DROP COLUMN IF EXISTS quantity,
-    DROP COLUMN IF EXISTS before_quantity,
-    DROP COLUMN IF EXISTS after_quantity,
-    DROP COLUMN IF EXISTS updated_at,
-    DROP COLUMN IF EXISTS deleted_at;
-
--- Recreate indexes for new structure
-CREATE INDEX IF NOT EXISTS stock_logs_product_warehouse_id_idx ON stock_logs (product_warehouse_id);
-
-CREATE INDEX IF NOT EXISTS stock_logs_loggable_type_loggable_id_idx ON stock_logs (loggable_type, loggable_id);
-
-CREATE INDEX IF NOT EXISTS stock_logs_created_by_idx ON stock_logs (created_by);
-
-CREATE INDEX IF NOT EXISTS stock_logs_created_at_idx ON stock_logs (created_at);
-
-COMMIT;

internal/database/seed/seeder.go

@@ -910,7 +910,7 @@ func seedProductWarehouse(tx *gorm.DB, createdBy uint) error {
 				ProductId:   product.Id,
 				WarehouseId: warehouse.Id,
 				Quantity:    seed.Quantity,
-				// CreatedBy:   createdBy,
+				CreatedBy:   createdBy,
 			}
 			if err := tx.Create(&productWarehouse).Error; err != nil {
 				return err

internal/entities/area.go

@@ -8,7 +8,7 @@ import (
 
 type Area struct {
 	Id        uint           `gorm:"primaryKey"`
-	Name      string         `gorm:"type:varchar(50);not null;uniqueIndex:areas_name_unique,where:deleted_at IS NULL"`
+	Name      string         `gorm:"not null;uniqueIndex:areas_name_unique,where:deleted_at IS NULL"`
 	CreatedBy uint           `gorm:"not null"`
 	CreatedAt time.Time      `gorm:"autoCreateTime"`
 	UpdatedAt time.Time      `gorm:"autoUpdateTime"`

internal/entities/bank.go

@@ -8,9 +8,9 @@ import (
 
 type Bank struct {
 	Id            uint           `gorm:"primaryKey"`
-	Name          string         `gorm:"type:varchar(50);not null;uniqueIndex:banks_name_unique,where:deleted_at IS NULL"`
+	Name          string         `gorm:"not null;uniqueIndex:banks_name_unique,where:deleted_at IS NULL"`
 	Alias         string         `gorm:"not null;size:5"`
-	Owner         *string        `gorm:"type:varchar(50)"`
+	Owner         *string        `gorm:""`
 	AccountNumber string         `gorm:"not null;size:50"`
 	CreatedBy     uint           `gorm:"not null"`
 	CreatedAt     time.Time      `gorm:"autoCreateTime"`

internal/entities/customer.go

@@ -8,12 +8,12 @@ import (
 
 type Customer struct {
 	Id            uint           `gorm:"primaryKey"`
-	Name          string         `gorm:"type:varchar(50);not null;uniqueIndex:customers_name_unique,where:deleted_at IS NULL"`
+	Name          string         `gorm:"not null;uniqueIndex:customers_name_unique,where:deleted_at IS NULL"`
 	PicId         uint           `gorm:"not null"`
 	Type          string         `gorm:"not null;size:50"`
 	Address       string         `gorm:"not null"`
 	Phone         string         `gorm:"not null;size:20"`
-	Email         string         `gorm:"type:varchar(50);not null"`
+	Email         string         `gorm:"not null"`
 	AccountNumber string         `gorm:"not null;size:50"`
 	Balance       float64        `gorm:"default:0"`
 	CreatedBy     uint           `gorm:"not null"`

internal/entities/document.go

@@ -1,18 +0,0 @@
-package entities
-
-import "time"
-
-type Document struct {
-	Id               uint      `gorm:"primaryKey"`
-	DocumentableType string    `gorm:"size:50;not null;index:documents_documentable_polymorphic,priority:1"`
-	DocumentableId   uint64    `gorm:"not null;index:documents_documentable_polymorphic,priority:2"`
-	Type             string    `gorm:"size:50;not null"`
-	Path             string    `gorm:"size:50;not null"`
-	Name             string    `gorm:"size:50;not null"`
-	Ext              string    `gorm:"size:50;not null"`
-	Size             float64   `gorm:"type:numeric(15,3);not null"`
-	CreatedBy        *uint     `gorm:"index"`
-	CreatedAt        time.Time `gorm:"autoCreateTime"`
-
-	CreatedUser *User `gorm:"foreignKey:CreatedBy;references:Id"`
-}

internal/entities/expense.go

@@ -13,16 +13,18 @@ type Expense struct {
 	SupplierId              uint64         `gorm:""`
 	Category                string         `gorm:"type:varchar(50);not null"`
 	PoNumber                string         `gorm:"type:varchar(50)"`
-	DocumentPath            sql.NullString `gorm:"type:json"`
-	RealizationDocumentPath sql.NullString `gorm:"type:json;column:realization_document_path"`
-	RealizationDate         time.Time      `gorm:"type:date;column:realization_date"`
-	TransactionDate         time.Time      `gorm:"type:date;not null"`
-	Notes                   string         `gorm:"type:text;column:notes"`
+	DocumentPath            sql.NullString `gorm:"type:json"`                                  // Dokumen pengajuan
+	RealizationDocumentPath sql.NullString `gorm:"type:json;column:realization_document_path"` // Dokumen realisasi
+	RealizationDate         time.Time      `gorm:"type:date;column:realization_date"`          // Tanggal realisasi
+	ExpenseDate             time.Time      `gorm:"type:date;not null"`
+	GrandTotal              float64        `gorm:"type:numeric(15,3);default:0"`
+	Note                    string         `gorm:"type:text"`
 	CreatedBy               uint64         `gorm:""`
 	CreatedAt               time.Time      `gorm:"autoCreateTime"`
 	UpdatedAt               time.Time      `gorm:"autoUpdateTime"`
 	DeletedAt               gorm.DeletedAt `gorm:"index" json:"-"`
 
+	// Relations
 	Supplier       *Supplier         `gorm:"foreignKey:SupplierId;references:Id"`
 	CreatedUser    *User             `gorm:"foreignKey:CreatedBy;references:Id"`
 	Nonstocks      []ExpenseNonstock `gorm:"foreignKey:ExpenseId;references:Id"`

internal/entities/expense_nonstock.go

@@ -1,23 +1,20 @@
 package entities
 
-import (
-	"time"
-)
-
 type ExpenseNonstock struct {
-	Id                    uint64              `gorm:"primaryKey;autoIncrement"`
-	ExpenseId             *uint64             `gorm:""`
-	ProjectFlockKandangId *uint64             `gorm:""`
-	KandangId             *uint64             `gorm:""`
-	NonstockId            *uint64             `gorm:""`
-	Qty                   float64             `gorm:"type:numeric(15,3);not null"`
-	Price                 float64             `gorm:"type:numeric(15,3);not null;column:price"`
-	Notes                 string              `gorm:"type:text;column:notes"`
-	CreatedAt             time.Time           `gorm:"type:timestamptz;default:CURRENT_TIMESTAMP"`
+	Id                    uint64 `gorm:"primaryKey;autoIncrement"`
+	ExpenseId             *uint64 `gorm:""`
+	ProjectFlockKandangId *uint64 `gorm:""`
+	KandangId             *uint64 `gorm:""`
+	NonstockId            *uint64 `gorm:""`
+	Qty                   float64 `gorm:"type:numeric(15,3);not null"`
+	UnitPrice             float64 `gorm:"type:numeric(15,3);not null"`
+	TotalPrice            float64 `gorm:"type:numeric(15,3);not null"`
+	Note                  string  `gorm:"type:text"`
 
+	// Relations
 	Expense             *Expense             `gorm:"foreignKey:ExpenseId;references:Id"`
 	ProjectFlockKandang *ProjectFlockKandang `gorm:"foreignKey:ProjectFlockKandangId;references:Id"`
 	Kandang             *Kandang             `gorm:"foreignKey:KandangId;references:Id"`
 	Nonstock            *Nonstock            `gorm:"foreignKey:NonstockId;references:Id"`
-	Realization         *ExpenseRealization  `gorm:"foreignKey:Id;references:ExpenseNonstockId"`
+	Realization         *ExpenseRealization  `gorm:"foreignKey:ExpenseNonstockId;references:Id"`
 }

internal/entities/expense_realization.go

@@ -5,12 +5,16 @@ import (
 )
 
 type ExpenseRealization struct {
-	Id                uint64    `gorm:"primaryKey;autoIncrement"`
-	ExpenseNonstockId *uint64   `gorm:""`
-	Qty               float64   `gorm:"type:numeric(15,3);not null;"`
-	Price             float64   `gorm:"type:numeric(15,3);not null;"`
-	Notes             string    `gorm:"type:text;"`
-	CreatedAt         time.Time `gorm:"type:timestamptz;default:CURRENT_TIMESTAMP"`
+	Id                    uint64  `gorm:"primaryKey;autoIncrement"`
+	ExpenseNonstockId     *uint64 `gorm:""`
+	RealizationQty        float64 `gorm:"type:numeric(15,3);not null"`
+	RealizationUnitPrice  float64 `gorm:"type:numeric(15,3);not null"`
+	RealizationTotalPrice float64 `gorm:"type:numeric(15,3);not null"`
+	RealizationDate       time.Time `gorm:"type:date;not null"`
+	Note                  *string  `gorm:"type:text"`
+	CreatedBy             *uint64  `gorm:""`
 
+	// Relations
 	ExpenseNonstock *ExpenseNonstock `gorm:"foreignKey:ExpenseNonstockId;references:Id"`
+	CreatedUser     *User            `gorm:"foreignKey:CreatedBy;references:Id"`
 }

internal/entities/fcr.go

@@ -8,7 +8,7 @@ import (
 
 type Fcr struct {
 	Id        uint           `gorm:"primaryKey"`
-	Name      string         `gorm:"type:varchar(50);not null;uniqueIndex:idx_suppliers_name,where:deleted_at IS NULL"`
+	Name      string         `gorm:"not null;uniqueIndex:idx_suppliers_name,where:deleted_at IS NULL"`
 	CreatedBy uint           `gorm:"not null"`
 	CreatedAt time.Time      `gorm:"autoCreateTime"`
 	UpdatedAt time.Time      `gorm:"autoUpdateTime"`

internal/entities/flag.go

@@ -9,7 +9,7 @@ const (
 
 type Flag struct {
 	Id           uint      `gorm:"primaryKey"`
-	Name         string    `gorm:"type:varchar(50);size:50;not null;uniqueIndex:flags_unique_flagable"`
+	Name         string    `gorm:"not null;uniqueIndex:flags_unique_flagable"`
 	FlagableID   uint      `gorm:"not null;uniqueIndex:flags_unique_flagable;index:flags_flagable_lookup,priority:2"`
 	FlagableType string    `gorm:"size:50;not null;uniqueIndex:flags_unique_flagable;index:flags_flagable_lookup,priority:1"`
 	CreatedAt    time.Time `gorm:"autoCreateTime"`

internal/entities/kandang.go

@@ -8,7 +8,7 @@ import (
 
 type Kandang struct {
 	Id                   uint                  `gorm:"primaryKey"`
-	Name                 string                `gorm:"type:varchar(50);not null;uniqueIndex:kandangs_name_unique,where:deleted_at IS NULL"`
+	Name                 string                `gorm:"not null;uniqueIndex:kandangs_name_unique,where:deleted_at IS NULL"`
 	Status               string                `gorm:"type:varchar(50);not null"`
 	LocationId           uint                  `gorm:"not null"`
 	Capacity             float64               `gorm:"not null"`

internal/entities/location.go

@@ -8,7 +8,7 @@ import (
 
 type Location struct {
 	Id        uint           `gorm:"primaryKey"`
-	Name      string         `gorm:"type:varchar(50);not null;uniqueIndex:locations_name_unique,where:deleted_at IS NULL"`
+	Name      string         `gorm:"not null;uniqueIndex:locations_name_unique,where:deleted_at IS NULL"`
 	Address   string         `gorm:"not null"`
 	AreaId    uint           `gorm:"not null"`
 	CreatedBy uint           `gorm:"not null"`

internal/entities/nonstock.go

@@ -8,7 +8,7 @@ import (
 
 type Nonstock struct {
 	Id        uint           `gorm:"primaryKey"`
-	Name      string         `gorm:"type:varchar(50);not null;uniqueIndex:nonstocks_name_unique,where:deleted_at IS NULL"`
+	Name      string         `gorm:"not null;uniqueIndex:nonstocks_name_unique,where:deleted_at IS NULL"`
 	UomId     uint           `gorm:"not null"`
 	CreatedBy uint           `gorm:"not null"`
 	CreatedAt time.Time      `gorm:"autoCreateTime"`

internal/entities/product-category.go

@@ -8,7 +8,7 @@ import (
 
 type ProductCategory struct {
 	Id        uint           `gorm:"primaryKey"`
-	Name      string         `gorm:"type:varchar(50);not null;uniqueIndex:product_categories_name_unique,where:deleted_at IS NULL"`
+	Name      string         `gorm:"not null;uniqueIndex:product_categories_name_unique,where:deleted_at IS NULL"`
 	Code      string         `gorm:"not null;size:10;uniqueIndex:product_categories_code_unique,where:deleted_at IS NULL"`
 	CreatedBy uint           `gorm:"not null"`
 	CreatedAt time.Time      `gorm:"autoCreateTime"`

internal/entities/product.go

@@ -8,8 +8,8 @@ import (
 
 type Product struct {
 	Id                uint           `gorm:"primaryKey"`
-	Name              string         `gorm:"type:varchar(50);not null;uniqueIndex:products_name_unique,where:deleted_at IS NULL"`
-	Brand             string         `gorm:"type:varchar(50);not null"`
+	Name              string         `gorm:"not null;uniqueIndex:products_name_unique,where:deleted_at IS NULL"`
+	Brand             string         `gorm:"not null"`
 	Sku               *string        `gorm:"size:100;uniqueIndex:products_sku_unique,where:deleted_at IS NULL"`
 	UomId             uint           `gorm:"not null"`
 	ProductCategoryId uint           `gorm:"not null"`
@@ -21,12 +21,10 @@ type Product struct {
 	CreatedAt         time.Time      `gorm:"autoCreateTime"`
 	UpdatedAt         time.Time      `gorm:"autoUpdateTime"`
 	DeletedAt         gorm.DeletedAt `gorm:"index" json:"-"`
-	IsVisible         bool           `gorm:"column:is_visible;default:true"`
 
-	CreatedUser       User               `gorm:"foreignKey:CreatedBy;references:Id"`
-	Uom               Uom                `gorm:"foreignKey:UomId;references:Id"`
-	ProductCategory   ProductCategory    `gorm:"foreignKey:ProductCategoryId;references:Id"`
-	ProductSuppliers  []ProductSupplier  `gorm:"foreignKey:ProductId;references:Id"`
-	Flags             []Flag             `gorm:"polymorphic:Flagable;polymorphicValue:products"`
-	ProductWarehouses []ProductWarehouse `gorm:"foreignKey:ProductId;references:Id"`
+	CreatedUser      User              `gorm:"foreignKey:CreatedBy;references:Id"`
+	Uom              Uom               `gorm:"foreignKey:UomId;references:Id"`
+	ProductCategory  ProductCategory   `gorm:"foreignKey:ProductCategoryId;references:Id"`
+	ProductSuppliers []ProductSupplier `gorm:"foreignKey:ProductId;references:Id"`
+	Flags            []Flag            `gorm:"polymorphic:Flagable;polymorphicValue:products"`
 }

internal/entities/product_warehouse.go

@@ -1,14 +1,23 @@
 package entities
 
+import (
+	"time"
+
+	"gorm.io/gorm"
+)
+
 type ProductWarehouse struct {
-	Id                    uint    `gorm:"primaryKey;column:id"`
-	ProductId             uint    `gorm:"column:product_id;not null"`
-	WarehouseId           uint    `gorm:"column:warehouse_id;not null"`
-	ProjectFlockKandangId *uint   `gorm:"column:project_flock_kandang_id"`
-	Quantity              float64 `gorm:"column:qty;type:numeric(15,3);default:0"`
+	Id          uint           `gorm:"primaryKey;autoIncrement"`
+	ProductId   uint           `gorm:"not null"`
+	WarehouseId uint           `gorm:"not null"`
+	Quantity    float64        `gorm:"default:0"`
+	CreatedAt   time.Time      `gorm:"autoCreateTime"`
+	UpdatedAt   time.Time      `gorm:"autoUpdateTime"`
+	CreatedBy   uint           `gorm:"not null"`
+	DeletedAt   gorm.DeletedAt `json:"-" gorm:"index"`
 
 	// Relations
-	Product   Product    `gorm:"foreignKey:ProductId;references:Id"`
-	Warehouse Warehouse  `gorm:"foreignKey:WarehouseId;references:Id"`
-	StockLogs []StockLog `gorm:"foreignKey:ProductWarehouseId;references:Id"`
+	Product     Product   `gorm:"foreignKey:ProductId;references:Id"`
+	Warehouse   Warehouse `gorm:"foreignKey:WarehouseId;references:Id"`
+	CreatedUser User      `gorm:"foreignKey:CreatedBy;references:Id"`
 }

internal/entities/project_budget.go

@@ -1,15 +0,0 @@
-package entities
-
-import (
-	"time"
-)
-
-type ProjectBudget struct {
-	Id        uint      `gorm:"primaryKey"`
-	Qty       float64   `gorm:"type:numeric(15,3);not null"`
-	Price     float64   `gorm:"type:numeric(15,3);not null"`
-	CreatedAt time.Time `gorm:"autoCreateTime"`
-
-	Nonstock     *Nonstock     `gorm:"foreignKey:Id;references:Id"`
-	ProjectFlock *ProjectFlock `gorm:"foreignKey:Id;references:Id"`
-}

internal/entities/purchase.go

@@ -5,11 +5,11 @@ import (
 )
 
 type Purchase struct {
-	Id         uint `gorm:"primaryKey;autoIncrement"`
+	Id         uint64 `gorm:"primaryKey;autoIncrement"`
 	PrNumber   string `gorm:"not null"`
 	PoNumber   *string
 	PoDate     *time.Time
-	SupplierId uint `gorm:"not null"`
+	SupplierId uint64 `gorm:"not null"`
 	CreditTerm *int
 	DueDate    *time.Time
 	GrandTotal float64 `gorm:"type:numeric(15,3);default:0"`
@@ -17,7 +17,7 @@ type Purchase struct {
 	CreatedAt  time.Time  `gorm:"autoCreateTime"`
 	UpdatedAt  time.Time  `gorm:"autoUpdateTime"`
 	DeletedAt  *time.Time `gorm:"index"`
-	CreatedBy  uint     `gorm:"not null"`
+	CreatedBy  uint64     `gorm:"not null"`
 
 	// Relations
 	Supplier       Supplier       `gorm:"foreignKey:SupplierId;references:Id"`

internal/entities/purchase_item.go

@@ -5,11 +5,11 @@ import (
 )
 
 type PurchaseItem struct {
-	Id                 uint `gorm:"primaryKey;autoIncrement"`
-	PurchaseId         uint `gorm:"not null"`
-	ProductId          uint `gorm:"not null"`
-	WarehouseId        uint `gorm:"not null"`
-	ProductWarehouseId *uint
+	Id                 uint64 `gorm:"primaryKey;autoIncrement"`
+	PurchaseId         uint64 `gorm:"not null"`
+	ProductId          uint64 `gorm:"not null"`
+	WarehouseId        uint64 `gorm:"not null"`
+	ProductWarehouseId *uint64
 	ReceivedDate       *time.Time
 	TravelNumber       *string
 	TravelNumberDocs   *string

internal/entities/stock_allocation.go

@@ -1,33 +0,0 @@
-package entities
-
-import (
-	"time"
-
-	"gorm.io/gorm"
-)
-
-const (
-	StockAllocationStatusPending  = "PENDING"
-	StockAllocationStatusActive   = "ACTIVE"
-	StockAllocationStatusReleased = "RELEASED"
-)
-
-// StockAllocation links a usable record (consumption) with an incoming stock record.
-// The combination lets us trace FIFO deductions while keeping each module focused on its own fields.
-type StockAllocation struct {
-	Id                 uint           `gorm:"primaryKey"`
-	ProductWarehouseId uint           `gorm:"not null;index"`
-	StockableType      string         `gorm:"size:100;not null;index:stock_allocations_lookup,priority:1"`
-	StockableId        uint           `gorm:"not null;index:stock_allocations_lookup,priority:2"`
-	UsableType         string         `gorm:"size:100;not null;index:stock_allocations_usage_lookup,priority:1"`
-	UsableId           uint           `gorm:"not null;index:stock_allocations_usage_lookup,priority:2"`
-	Qty                float64        `gorm:"type:numeric(15,3);not null"`
-	Status             string         `gorm:"size:20;not null;default:ACTIVE"`
-	Note               *string        `gorm:"type:text"`
-	CreatedAt          time.Time      `gorm:"autoCreateTime"`
-	UpdatedAt          time.Time      `gorm:"autoUpdateTime"`
-	ReleasedAt         *time.Time     `gorm:"index"`
-	DeletedAt          gorm.DeletedAt `gorm:"index"`
-
-	ProductWarehouse *ProductWarehouse `gorm:"foreignKey:ProductWarehouseId;references:Id"`
-}

internal/entities/stock_log.go

@@ -1,6 +1,10 @@
 package entities
 
-import "time"
+import (
+	"time"
+
+	"gorm.io/gorm"
+)
 
 const (
 	LogTypeAdjustment = "ADJUSTMENT"
@@ -13,18 +17,19 @@ const (
 )
 
 type StockLog struct {
-	Id                 uint `gorm:"primaryKey;column:id"`
-	ProductWarehouseId uint `gorm:"column:product_warehouse_id;not null;index"`
-	CreatedBy          uint `gorm:"column:created_by;not null;index"`
-
-	Increase float64 `gorm:"column:increase;type:numeric(15,3);default:0"`
-	Decrease float64 `gorm:"column:decrease;type:numeric(15,3);default:0"`
-
-	LoggableType string `gorm:"column:loggable_type;type:varchar(50);not null"`
-	LoggableId   uint   `gorm:"column:loggable_id;not null"`
-
-	Notes     string    `gorm:"column:notes;type:text"`
-	CreatedAt time.Time `gorm:"column:created_at;autoCreateTime"`
+	Id                 uint           `gorm:"primaryKey;column:id"`
+	TransactionType    string         `gorm:"type:varchar(20);not null"`
+	Quantity           float64        `gorm:"type:numeric(15,3);not null"`
+	BeforeQuantity     float64        `gorm:"type:numeric(15,3);not null"`
+	AfterQuantity      float64        `gorm:"type:numeric(15,3);not null"`
+	LogType            string         `gorm:"type:varchar(50);not null;index:stock_logs_flaggable_lookup,priority:1"`
+	LogId              uint           `gorm:"not null;index:stock_logs_flaggable_lookup,priority:2"`
+	Note               string         `gorm:"type:text"`
+	ProductWarehouseId uint           `gorm:"not null;index"`
+	CreatedBy          uint           `gorm:"index"`
+	CreatedAt          time.Time      `gorm:"autoCreateTime"`
+	UpdatedAt          time.Time      `gorm:"autoUpdateTime"`
+	DeletedAt          gorm.DeletedAt `json:"-" gorm:"index"`
 
 	ProductWarehouse *ProductWarehouse `json:"product_warehouse,omitempty" gorm:"foreignKey:ProductWarehouseId;references:Id"`
 	CreatedUser      *User             `json:"created_user,omitempty" gorm:"foreignKey:CreatedBy;references:Id"`

internal/entities/supplier.go

@@ -8,14 +8,14 @@ import (
 
 type Supplier struct {
 	Id            uint           `gorm:"primaryKey"`
-	Name          string         `gorm:"type:varchar(50);not null;uniqueIndex:suppliers_name_unique,where:deleted_at IS NULL"`
+	Name          string         `gorm:"not null;uniqueIndex:suppliers_name_unique,where:deleted_at IS NULL"`
 	Alias         string         `gorm:"not null;size:5"`
-	Pic           string         `gorm:"type:varchar(50);not null"`
+	Pic           string         `gorm:"not null"`
 	Type          string         `gorm:"not null;size:50"`
 	Category      string         `gorm:"not null;size:20"`
-	Hatchery      *string        `gorm:"type:varchar(50)"`
+	Hatchery      *string        `gorm:"size:255"`
 	Phone         string         `gorm:"not null;size:20"`
-	Email         string         `gorm:"type:varchar(50);not null"`
+	Email         string         `gorm:"not null"`
 	Address       string         `gorm:"not null"`
 	Npwp          *string        `gorm:"size:50"`
 	AccountNumber *string        `gorm:"size:50"`

internal/entities/uom.go

@@ -8,7 +8,7 @@ import (
 
 type Uom struct {
 	Id        uint           `gorm:"primaryKey"`
-	Name      string         `gorm:"type:varchar(50);not null;uniqueIndex:uoms_name_unique,where:deleted_at IS NULL"`
+	Name      string         `gorm:"not null;uniqueIndex:uoms_name_unique,where:deleted_at IS NULL"`
 	CreatedBy uint           `gorm:"not null"`
 	CreatedAt time.Time      `gorm:"autoCreateTime"`
 	UpdatedAt time.Time      `gorm:"autoUpdateTime"`

internal/entities/user.go

@@ -9,8 +9,8 @@ import (
 type User struct {
 	Id        uint           `gorm:"primaryKey"`
 	IdUser    int64          `gorm:"uniqueIndex"`
-	Email     string         `gorm:"type:varchar(50);uniqueIndex"`
-	Name      string         `gorm:"type:varchar(50);not null"`
+	Email     string         `gorm:"uniqueIndex"`
+	Name      string         `gorm:"not null"`
 	CreatedAt time.Time      `gorm:"autoCreateTime"`
 	UpdatedAt time.Time      `gorm:"autoUpdateTime"`
 	DeletedAt gorm.DeletedAt `gorm:"index" json:"-"`

internal/entities/warehouse.go

@@ -8,7 +8,7 @@ import (
 
 type Warehouse struct {
 	Id         uint   `gorm:"primaryKey"`
-	Name       string `gorm:"type:varchar(50);not null"`
+	Name       string `gorm:"not null"`
 	Type       string `gorm:"not null"`
 	AreaId     uint   `gorm:"not null"`
 	LocationId *uint

internal/middleware/auth.go

@@ -105,14 +105,6 @@ func AuthenticatedUser(c *fiber.Ctx) (*entity.User, bool) {
 	return nil, false
 }
 
-func ActorIDFromContext(c *fiber.Ctx) (uint, error) {
-	user, ok := AuthenticatedUser(c)
-	if !ok || user == nil || user.Id == 0 { 
-		return 0, fiber.NewError(fiber.StatusUnauthorized, "Please authenticate")
-	}
-	return user.Id, nil
-}
-
 // AuthDetails returns the full authentication context (token, claims, user).
 func AuthDetails(c *fiber.Ctx) (*AuthContext, bool) {
 	value := c.Locals(authContextLocalsKey)

internal/modules/approvals/route.go

@@ -3,7 +3,7 @@ package approvals
 import (
 	// m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	"github.com/gofiber/fiber/v2"
-	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
+
 	common "gitlab.com/mbugroup/lti-api.git/internal/common/service"
 	controller "gitlab.com/mbugroup/lti-api.git/internal/modules/approvals/controllers"
 	user "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services"
@@ -12,8 +12,8 @@ import (
 func ApprovalRoutes(v1 fiber.Router, u user.UserService, s common.ApprovalService) {
 	_ = u
 	ctrl := controller.NewApprovalController(s)
+
 	route := v1.Group("/approvals")
-	route.Use(m.Auth(u))
 
 	route.Get("/", ctrl.GetAll)
 }

internal/modules/closings/controllers/closing.controller.go

@@ -1,97 +0,0 @@
-package controller
-
-import (
-	"math"
-	"strconv"
-
-	"gitlab.com/mbugroup/lti-api.git/internal/modules/closings/dto"
-	service "gitlab.com/mbugroup/lti-api.git/internal/modules/closings/services"
-	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/closings/validations"
-	"gitlab.com/mbugroup/lti-api.git/internal/response"
-
-	"github.com/gofiber/fiber/v2"
-)
-
-type ClosingController struct {
-	ClosingService service.ClosingService
-}
-
-func NewClosingController(closingService service.ClosingService) *ClosingController {
-	return &ClosingController{
-		ClosingService: closingService,
-	}
-}
-
-func (u *ClosingController) GetAll(c *fiber.Ctx) error {
-	query := &validation.Query{
-		Page:   c.QueryInt("page", 1),
-		Limit:  c.QueryInt("limit", 10),
-		Search: c.Query("search", ""),
-	}
-
-	if query.Page < 1 || query.Limit < 1 {
-		return fiber.NewError(fiber.StatusBadRequest, "page and limit must be greater than 0")
-	}
-
-	result, totalResults, err := u.ClosingService.GetAll(c, query)
-	if err != nil {
-		return err
-	}
-
-	return c.Status(fiber.StatusOK).
-		JSON(response.SuccessWithPaginate[dto.ClosingListDTO]{
-			Code:    fiber.StatusOK,
-			Status:  "success",
-			Message: "Get all closings successfully",
-			Meta: response.Meta{
-				Page:         query.Page,
-				Limit:        query.Limit,
-				TotalPages:   int64(math.Ceil(float64(totalResults) / float64(query.Limit))),
-				TotalResults: totalResults,
-			},
-			Data: dto.ToClosingListDTOs(result),
-		})
-}
-
-func (u *ClosingController) GetOne(c *fiber.Ctx) error {
-	param := c.Params("id")
-
-	id, err := strconv.Atoi(param)
-	if err != nil {
-		return fiber.NewError(fiber.StatusBadRequest, "Invalid Id")
-	}
-
-	result, err := u.ClosingService.GetOne(c, uint(id))
-	if err != nil {
-		return err
-	}
-
-	return c.Status(fiber.StatusOK).
-		JSON(response.Success{
-			Code:    fiber.StatusOK,
-			Status:  "success",
-			Message: "Get closing successfully",
-			Data:    dto.ToClosingListDTO(*result),
-		})
-}
-
-func (u *ClosingController) GetSapronakReport(c *fiber.Ctx) error {
-	query := &validation.SapronakQuery{
-		ProjectFlockID: uint(c.QueryInt("project_flock_id", 0)),
-		KandangID:      uint(c.QueryInt("kandang_id", 0)),
-		Status:         c.Query("status"),
-	}
-
-	result, err := u.ClosingService.GetSapronakReport(c, query)
-	if err != nil {
-		return err
-	}
-
-	return c.Status(fiber.StatusOK).
-		JSON(response.Success{
-			Code:    fiber.StatusOK,
-			Status:  "success",
-			Message: "Get sapronak report successfully",
-			Data:    result,
-		})
-}

internal/modules/closings/dto/closing.dto.go

@@ -1,64 +0,0 @@
-package dto
-
-import (
-	"time"
-
-	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	userDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/users/dto"
-)
-
-// === DTO Structs ===
-
-type ClosingRelationDTO struct {
-	Id   uint   `json:"id"`
-	Name string `json:"name"`
-}
-
-type ClosingListDTO struct {
-	Id          uint                     `json:"id"`
-	Name        string                   `json:"name"`
-	CreatedUser *userDTO.UserRelationDTO `json:"created_user"`
-	CreatedAt   time.Time                `json:"created_at"`
-	UpdatedAt   time.Time                `json:"updated_at"`
-}
-
-type ClosingDetailDTO struct {
-	ClosingListDTO
-}
-
-// === Mapper Functions ===
-
-func ToClosingRelationDTO(e entity.ProjectFlock) ClosingRelationDTO {
-	return ClosingRelationDTO{
-		Id: e.Id,
-	}
-}
-
-func ToClosingListDTO(e entity.ProjectFlock) ClosingListDTO {
-	var createdUser *userDTO.UserRelationDTO
-	if e.CreatedUser.Id != 0 {
-		mapped := userDTO.ToUserRelationDTO(e.CreatedUser)
-		createdUser = &mapped
-	}
-
-	return ClosingListDTO{
-		Id:          e.Id,
-		CreatedAt:   e.CreatedAt,
-		UpdatedAt:   e.UpdatedAt,
-		CreatedUser: createdUser,
-	}
-}
-
-func ToClosingListDTOs(e []entity.ProjectFlock) []ClosingListDTO {
-	result := make([]ClosingListDTO, len(e))
-	for i, r := range e {
-		result[i] = ToClosingListDTO(r)
-	}
-	return result
-}
-
-func ToClosingDetailDTO(e entity.ProjectFlock) ClosingDetailDTO {
-	return ClosingDetailDTO{
-		ClosingListDTO: ToClosingListDTO(e),
-	}
-}

internal/modules/closings/dto/sapronak.dto.go

@@ -1,30 +0,0 @@
-package dto
-
-import "time"
-
-type SapronakItemDTO struct {
-	ProductID     uint    `json:"product_id"`
-	ProductName   string  `json:"product_name"`
-	Flag          string  `json:"flag"`
-	IncomingQty   float64 `json:"incoming_qty"`
-	IncomingValue float64 `json:"incoming_value"`
-	UsageQty      float64 `json:"usage_qty"`
-	UsageValue    float64 `json:"usage_value"`
-	RemainingQty  float64 `json:"remaining_qty"`
-	AveragePrice  float64 `json:"average_price"`
-}
-
-type SapronakReportDTO struct {
-	ProjectFlockKandangID uint              `json:"project_flock_kandang_id"`
-	ProjectFlockID        uint              `json:"project_flock_id"`
-	ProjectName           string            `json:"project_name"`
-	KandangID             uint              `json:"kandang_id"`
-	KandangName           string            `json:"kandang_name"`
-	Period                int               `json:"period"`
-	Status                string            `json:"status"`
-	StartDate             *time.Time        `json:"start_date,omitempty"`
-	EndDate               *time.Time        `json:"end_date,omitempty"`
-	TotalIncomingValue    float64           `json:"total_incoming_value"`
-	TotalUsageValue       float64           `json:"total_usage_value"`
-	Items                 []SapronakItemDTO `json:"items"`
-}

internal/modules/closings/module.go

@@ -1,27 +0,0 @@
-package closings
-
-import (
-	"github.com/go-playground/validator/v10"
-	"github.com/gofiber/fiber/v2"
-	"gorm.io/gorm"
-
-	rClosing "gitlab.com/mbugroup/lti-api.git/internal/modules/closings/repositories"
-	sClosing "gitlab.com/mbugroup/lti-api.git/internal/modules/closings/services"
-	rProjectFlock "gitlab.com/mbugroup/lti-api.git/internal/modules/production/project_flocks/repositories"
-
-	rUser "gitlab.com/mbugroup/lti-api.git/internal/modules/users/repositories"
-	sUser "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services"
-)
-
-type ClosingModule struct{}
-
-func (ClosingModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate *validator.Validate) {
-	closingRepo := rClosing.NewClosingRepository(db)
-	projectFlockKandangRepo := rProjectFlock.NewProjectFlockKandangRepository(db)
-	userRepo := rUser.NewUserRepository(db)
-
-	closingService := sClosing.NewClosingService(closingRepo, projectFlockKandangRepo, validate)
-	userService := sUser.NewUserService(userRepo, validate)
-
-	ClosingRoutes(router, userService, closingService)
-}

internal/modules/closings/repositories/closing.repository.go

@@ -1,21 +0,0 @@
-package repository
-
-import (
-	"gitlab.com/mbugroup/lti-api.git/internal/common/repository"
-	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	"gorm.io/gorm"
-)
-
-type ClosingRepository interface {
-	repository.BaseRepository[entity.ProjectFlock]
-}
-
-type ClosingRepositoryImpl struct {
-	*repository.BaseRepositoryImpl[entity.ProjectFlock]
-}
-
-func NewClosingRepository(db *gorm.DB) ClosingRepository {
-	return &ClosingRepositoryImpl{
-		BaseRepositoryImpl: repository.NewBaseRepository[entity.ProjectFlock](db),
-	}
-}

internal/modules/closings/route.go

@@ -1,26 +0,0 @@
-package closings
-
-import (
-	// m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
-	controller "gitlab.com/mbugroup/lti-api.git/internal/modules/closings/controllers"
-	closing "gitlab.com/mbugroup/lti-api.git/internal/modules/closings/services"
-	user "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services"
-
-	"github.com/gofiber/fiber/v2"
-)
-
-func ClosingRoutes(v1 fiber.Router, u user.UserService, s closing.ClosingService) {
-	ctrl := controller.NewClosingController(s)
-
-	route := v1.Group("/closings")
-
-	// route.Get("/", m.Auth(u), ctrl.GetAll)
-	// route.Post("/", m.Auth(u), ctrl.CreateOne)
-	// route.Get("/:id", m.Auth(u), ctrl.GetOne)
-	// route.Patch("/:id", m.Auth(u), ctrl.UpdateOne)
-	// route.Delete("/:id", m.Auth(u), ctrl.DeleteOne)
-
-	route.Get("/", ctrl.GetAll)
-	route.Get("/sapronak/report", ctrl.GetSapronakReport)
-	route.Get("/:id", ctrl.GetOne)
-}

internal/modules/closings/services/closing.service.go

@@ -1,444 +0,0 @@
-package service
-
-import (
-	"context"
-	"errors"
-	"sort"
-	"strings"
-	"time"
-
-	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	"gitlab.com/mbugroup/lti-api.git/internal/modules/closings/dto"
-	repository "gitlab.com/mbugroup/lti-api.git/internal/modules/closings/repositories"
-	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/closings/validations"
-	projectFlockRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/production/project_flocks/repositories"
-	"gitlab.com/mbugroup/lti-api.git/internal/utils"
-
-	"github.com/go-playground/validator/v10"
-	"github.com/gofiber/fiber/v2"
-	"github.com/sirupsen/logrus"
-	"gorm.io/gorm"
-)
-
-type ClosingService interface {
-	GetAll(ctx *fiber.Ctx, params *validation.Query) ([]entity.ProjectFlock, int64, error)
-	GetOne(ctx *fiber.Ctx, id uint) (*entity.ProjectFlock, error)
-	GetSapronakReport(ctx *fiber.Ctx, params *validation.SapronakQuery) ([]dto.SapronakReportDTO, error)
-}
-
-type closingService struct {
-	Log                     *logrus.Logger
-	Validate                *validator.Validate
-	Repository              repository.ClosingRepository
-	ProjectFlockKandangRepo projectFlockRepo.ProjectFlockKandangRepository
-}
-
-func NewClosingService(
-	repo repository.ClosingRepository,
-	projectFlockKandangRepo projectFlockRepo.ProjectFlockKandangRepository,
-	validate *validator.Validate,
-) ClosingService {
-	return &closingService{
-		Log:                     utils.Log,
-		Validate:                validate,
-		Repository:              repo,
-		ProjectFlockKandangRepo: projectFlockKandangRepo,
-	}
-}
-
-func (s closingService) withRelations(db *gorm.DB) *gorm.DB {
-	return db.Preload("CreatedUser")
-}
-
-func (s closingService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entity.ProjectFlock, int64, error) {
-	if err := s.Validate.Struct(params); err != nil {
-		return nil, 0, err
-	}
-
-	offset := (params.Page - 1) * params.Limit
-
-	closings, total, err := s.Repository.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
-		db = s.withRelations(db)
-		if params.Search != "" {
-			return db.Where("name LIKE ?", "%"+params.Search+"%")
-		}
-		return db.Order("created_at DESC").Order("updated_at DESC")
-	})
-
-	if err != nil {
-		s.Log.Errorf("Failed to get closings: %+v", err)
-		return nil, 0, err
-	}
-	return closings, total, nil
-}
-
-func (s closingService) GetOne(c *fiber.Ctx, id uint) (*entity.ProjectFlock, error) {
-	closing, err := s.Repository.GetByID(c.Context(), id, s.withRelations)
-	if errors.Is(err, gorm.ErrRecordNotFound) {
-		return nil, fiber.NewError(fiber.StatusNotFound, "Closing not found")
-	}
-	if err != nil {
-		s.Log.Errorf("Failed get closing by id: %+v", err)
-		return nil, err
-	}
-	return closing, nil
-}
-
-var sapronakFlags = []string{
-	string(utils.FlagDOC),
-	string(utils.FlagPakan),
-	string(utils.FlagOVK),
-}
-
-type sapronakIncomingRow struct {
-	ProductID    uint
-	ProductName  string
-	Flag         string
-	Qty          float64
-	Value        float64
-	DefaultPrice float64
-}
-
-type sapronakUsageRow struct {
-	ProductID    uint
-	ProductName  string
-	Flag         string
-	Qty          float64
-	DefaultPrice float64
-}
-
-func (s closingService) GetSapronakReport(c *fiber.Ctx, params *validation.SapronakQuery) ([]dto.SapronakReportDTO, error) {
-	if err := s.Validate.Struct(params); err != nil {
-		return nil, err
-	}
-
-	pfks, err := s.loadProjectFlockKandangs(c, params)
-	if err != nil {
-		return nil, err
-	}
-	if len(pfks) == 0 {
-		return []dto.SapronakReportDTO{}, nil
-	}
-
-	startMap, err := s.mapStartDates(c.Context(), pfks)
-	if err != nil {
-		s.Log.Errorf("Failed to prepare start dates for sapronak report: %+v", err)
-		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to prepare sapronak report")
-	}
-	statusMap, nextStartMap := s.computeStatusAndNextStart(pfks, startMap)
-
-	filterStatus := strings.ToLower(strings.TrimSpace(params.Status))
-	if filterStatus == "" {
-		filterStatus = "all"
-	}
-
-	results := make([]dto.SapronakReportDTO, 0, len(pfks))
-	for _, pfk := range pfks {
-		status := statusMap[pfk.Id]
-		if status == "" {
-			status = "closing"
-		}
-
-		if (filterStatus == "active" && status != "active") || (filterStatus == "closing" && status != "closing") {
-			continue
-		}
-
-		start := startMap[pfk.Id]
-		var startPtr *time.Time
-		if !start.IsZero() {
-			startCopy := start
-			startPtr = &startCopy
-		}
-
-		var endPtr *time.Time
-		if end, ok := nextStartMap[pfk.Id]; ok {
-			endCopy := end
-			endPtr = &endCopy
-		}
-
-		items, totalIncoming, totalUsage, err := s.buildSapronakItems(c.Context(), pfk, startPtr, endPtr)
-		if err != nil {
-			s.Log.Errorf("Failed to build sapronak items for pfk %d: %+v", pfk.Id, err)
-			return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to calculate sapronak report")
-		}
-
-		results = append(results, dto.SapronakReportDTO{
-			ProjectFlockKandangID: pfk.Id,
-			ProjectFlockID:        pfk.ProjectFlockId,
-			ProjectName:           pfk.ProjectFlock.FlockName,
-			KandangID:             pfk.KandangId,
-			KandangName:           pfk.Kandang.Name,
-			Period:                pfk.Period,
-			Status:                status,
-			StartDate:             startPtr,
-			EndDate:               endPtr,
-			TotalIncomingValue:    totalIncoming,
-			TotalUsageValue:       totalUsage,
-			Items:                 items,
-		})
-	}
-
-	sort.Slice(results, func(i, j int) bool {
-		if results[i].KandangID == results[j].KandangID {
-			if results[i].Period == results[j].Period {
-				return results[i].ProjectFlockKandangID < results[j].ProjectFlockKandangID
-			}
-			return results[i].Period < results[j].Period
-		}
-		return results[i].KandangID < results[j].KandangID
-	})
-
-	return results, nil
-}
-
-func (s closingService) loadProjectFlockKandangs(c *fiber.Ctx, params *validation.SapronakQuery) ([]entity.ProjectFlockKandang, error) {
-	db := s.ProjectFlockKandangRepo.DB().
-		WithContext(c.Context()).
-		Preload("ProjectFlock").
-		Preload("Kandang")
-
-	if params != nil {
-		if params.ProjectFlockID > 0 {
-			db = db.Where("project_flock_kandangs.project_flock_id = ?", params.ProjectFlockID)
-		}
-		if params.KandangID > 0 {
-			db = db.Where("project_flock_kandangs.kandang_id = ?", params.KandangID)
-		}
-	}
-
-	var pfks []entity.ProjectFlockKandang
-	if err := db.Find(&pfks).Error; err != nil {
-		s.Log.Errorf("Failed to load project flock kandangs for sapronak report: %+v", err)
-		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to load project flock kandangs")
-	}
-
-	return pfks, nil
-}
-
-func (s closingService) mapStartDates(ctx context.Context, pfks []entity.ProjectFlockKandang) (map[uint]time.Time, error) {
-	result := make(map[uint]time.Time, len(pfks))
-	if len(pfks) == 0 {
-		return result, nil
-	}
-
-	ids := make([]uint, len(pfks))
-	for i, pfk := range pfks {
-		ids[i] = pfk.Id
-	}
-
-	var rows []struct {
-		ProjectFlockKandangID uint       `gorm:"column:project_flock_kandang_id"`
-		StartDate             *time.Time `gorm:"column:start_date"`
-	}
-
-	if err := s.ProjectFlockKandangRepo.DB().
-		WithContext(ctx).
-		Table("project_chickins").
-		Select("project_flock_kandang_id, MIN(chick_in_date) AS start_date").
-		Where("project_flock_kandang_id IN ?", ids).
-		Group("project_flock_kandang_id").
-		Scan(&rows).Error; err != nil {
-		return nil, err
-	}
-
-	for _, row := range rows {
-		if row.StartDate != nil {
-			result[row.ProjectFlockKandangID] = row.StartDate.UTC()
-		}
-	}
-
-	for _, pfk := range pfks {
-		if _, exists := result[pfk.Id]; !exists {
-			result[pfk.Id] = pfk.CreatedAt.UTC()
-		}
-	}
-
-	return result, nil
-}
-
-func (s closingService) computeStatusAndNextStart(pfks []entity.ProjectFlockKandang, startMap map[uint]time.Time) (map[uint]string, map[uint]time.Time) {
-	statusMap := make(map[uint]string, len(pfks))
-	nextStartMap := make(map[uint]time.Time, len(pfks))
-
-	if len(pfks) == 0 {
-		return statusMap, nextStartMap
-	}
-
-	grouped := make(map[uint][]entity.ProjectFlockKandang)
-	for _, pfk := range pfks {
-		grouped[pfk.KandangId] = append(grouped[pfk.KandangId], pfk)
-	}
-
-	for _, list := range grouped {
-		sort.Slice(list, func(i, j int) bool {
-			if list[i].Period == list[j].Period {
-				return startMap[list[i].Id].Before(startMap[list[j].Id])
-			}
-			return list[i].Period < list[j].Period
-		})
-
-		for idx, item := range list {
-			if idx < len(list)-1 {
-				next := list[idx+1]
-				if start, ok := startMap[next.Id]; ok {
-					nextStartMap[item.Id] = start
-				}
-				statusMap[item.Id] = "closing"
-				continue
-			}
-			statusMap[item.Id] = "active"
-		}
-	}
-
-	return statusMap, nextStartMap
-}
-
-func (s closingService) buildSapronakItems(ctx context.Context, pfk entity.ProjectFlockKandang, start, end *time.Time) ([]dto.SapronakItemDTO, float64, float64, error) {
-	incoming, err := s.fetchIncomingSapronak(ctx, pfk.KandangId, start, end)
-	if err != nil {
-		return nil, 0, 0, err
-	}
-	usage, err := s.fetchUsageSapronak(ctx, pfk.Id)
-	if err != nil {
-		return nil, 0, 0, err
-	}
-
-	itemMap := make(map[uint]dto.SapronakItemDTO, len(incoming)+len(usage))
-
-	for _, row := range incoming {
-		avgPrice := row.DefaultPrice
-		if row.Qty > 0 && row.Value > 0 {
-			avgPrice = row.Value / row.Qty
-		}
-
-		itemMap[row.ProductID] = dto.SapronakItemDTO{
-			ProductID:     row.ProductID,
-			ProductName:   row.ProductName,
-			Flag:          row.Flag,
-			IncomingQty:   row.Qty,
-			IncomingValue: row.Value,
-			RemainingQty:  row.Qty,
-			AveragePrice:  avgPrice,
-		}
-	}
-
-	for _, row := range usage {
-		existing := itemMap[row.ProductID]
-		price := existing.AveragePrice
-		if price == 0 {
-			price = row.DefaultPrice
-		}
-
-		usageValue := row.Qty * price
-
-		existing.ProductID = row.ProductID
-		if existing.ProductName == "" {
-			existing.ProductName = row.ProductName
-		}
-		if existing.Flag == "" {
-			existing.Flag = row.Flag
-		}
-		existing.AveragePrice = price
-		existing.UsageQty += row.Qty
-		existing.UsageValue += usageValue
-		if existing.IncomingQty >= existing.UsageQty {
-			existing.RemainingQty = existing.IncomingQty - existing.UsageQty
-		} else {
-			existing.RemainingQty = 0
-		}
-
-		itemMap[row.ProductID] = existing
-	}
-
-	items := make([]dto.SapronakItemDTO, 0, len(itemMap))
-	var totalIncoming, totalUsage float64
-	for _, item := range itemMap {
-		totalIncoming += item.IncomingValue
-		totalUsage += item.UsageValue
-		items = append(items, item)
-	}
-
-	sort.Slice(items, func(i, j int) bool {
-		if items[i].Flag == items[j].Flag {
-			return strings.ToLower(items[i].ProductName) < strings.ToLower(items[j].ProductName)
-		}
-		return items[i].Flag < items[j].Flag
-	})
-
-	return items, totalIncoming, totalUsage, nil
-}
-
-func (s closingService) fetchIncomingSapronak(ctx context.Context, kandangID uint, start, end *time.Time) (map[uint]sapronakIncomingRow, error) {
-	rows := make([]sapronakIncomingRow, 0)
-
-	db := s.Repository.DB().
-		WithContext(ctx).
-		Table("purchase_items AS pi").
-		Select(`
-			pi.product_id AS product_id,
-			p.name AS product_name,
-			f.name AS flag,
-			COALESCE(SUM(pi.total_qty), 0) AS qty,
-			COALESCE(SUM(pi.total_qty * pi.price), 0) AS value,
-			COALESCE(p.product_price, 0) AS default_price
-		`).
-		Joins("JOIN purchases po ON po.id = pi.purchase_id AND po.deleted_at IS NULL").
-		Joins("JOIN products p ON p.id = pi.product_id").
-		Joins("JOIN flags f ON f.flagable_id = p.id AND f.flagable_type = ?", entity.FlagableTypeProduct).
-		Joins("JOIN warehouses w ON w.id = pi.warehouse_id").
-		Where("w.kandang_id = ?", kandangID).
-		Where("f.name IN ?", sapronakFlags).
-		Where("pi.received_date IS NOT NULL")
-
-	if start != nil {
-		db = db.Where("pi.received_date >= ?", *start)
-	}
-	if end != nil {
-		db = db.Where("pi.received_date < ?", *end)
-	}
-
-	if err := db.Group("pi.product_id, p.name, f.name, p.product_price").Scan(&rows).Error; err != nil {
-		return nil, err
-	}
-
-	result := make(map[uint]sapronakIncomingRow, len(rows))
-	for _, row := range rows {
-		result[row.ProductID] = row
-	}
-	return result, nil
-}
-
-func (s closingService) fetchUsageSapronak(ctx context.Context, pfkID uint) (map[uint]sapronakUsageRow, error) {
-	rows := make([]sapronakUsageRow, 0)
-
-	if pfkID == 0 {
-		return map[uint]sapronakUsageRow{}, nil
-	}
-
-	db := s.Repository.DB().
-		WithContext(ctx).
-		Table("recording_stocks AS rs").
-		Select(`
-			pw.product_id AS product_id,
-			p.name AS product_name,
-			f.name AS flag,
-			COALESCE(SUM(rs.usage_qty), 0) AS qty,
-			COALESCE(p.product_price, 0) AS default_price
-		`).
-		Joins("JOIN recordings r ON r.id = rs.recording_id AND r.deleted_at IS NULL").
-		Joins("JOIN product_warehouses pw ON pw.id = rs.product_warehouse_id").
-		Joins("JOIN products p ON p.id = pw.product_id").
-		Joins("JOIN flags f ON f.flagable_id = p.id AND f.flagable_type = ?", entity.FlagableTypeProduct).
-		Where("r.project_flock_kandangs_id = ?", pfkID).
-		Where("f.name IN ?", sapronakFlags)
-
-	if err := db.Group("pw.product_id, p.name, f.name, p.product_price").Scan(&rows).Error; err != nil {
-		return nil, err
-	}
-
-	result := make(map[uint]sapronakUsageRow, len(rows))
-	for _, row := range rows {
-		result[row.ProductID] = row
-	}
-	return result, nil
-}

internal/modules/closings/validations/closing.validation.go

@@ -1,15 +0,0 @@
-package validation
-
-type Create struct {
-	Name   string `json:"name" validate:"required_strict,min=3"`
-}
-
-type Update struct {
-	Name   *string `json:"name,omitempty" validate:"omitempty"`
-}
-
-type Query struct {
-	Page   int    `query:"page" validate:"omitempty,number,min=1,gt=0"`
-	Limit  int    `query:"limit" validate:"omitempty,number,min=1,max=100,gt=0"`
-	Search string `query:"search" validate:"omitempty,max=50"`
-}

internal/modules/closings/validations/sapronak.validation.go

@@ -1,7 +0,0 @@
-package validation
-
-type SapronakQuery struct {
-	ProjectFlockID uint   `query:"project_flock_id" validate:"omitempty,gt=0"`
-	KandangID      uint   `query:"kandang_id" validate:"omitempty,gt=0"`
-	Status         string `query:"status" validate:"omitempty,oneof=active closing all"`
-}

internal/modules/expenses/controllers/expense.controller.go

@@ -96,30 +96,30 @@ func (u *ExpenseController) CreateOne(c *fiber.Ctx) error {
 	}
 	req.Documents = form.File["documents"]
 
-	expenseNonstocksJSON := c.FormValue("expense_nonstocks")
-	if expenseNonstocksJSON != "" {
+	costPerKandangJSON := c.FormValue("cost_per_kandangs")
+	if costPerKandangJSON != "" {
 
-		if err := json.Unmarshal([]byte(expenseNonstocksJSON), &req.ExpenseNonstocks); err != nil {
+		if err := json.Unmarshal([]byte(costPerKandangJSON), &req.CostPerKandangs); err != nil {
 
-			var singleExpenseNonstock validation.ExpenseNonstock
-			if err := json.Unmarshal([]byte(expenseNonstocksJSON), &singleExpenseNonstock); err != nil {
-				return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Invalid expense_nonstocks JSON: %v", err))
+			var singleCostPerKandang validation.CostPerKandang
+			if err := json.Unmarshal([]byte(costPerKandangJSON), &singleCostPerKandang); err != nil {
+				return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Invalid cost_per_kandangs JSON: %v", err))
 			}
 
-			if singleExpenseNonstock.KandangID == 0 {
+			if singleCostPerKandang.KandangID == 0 {
 				return fiber.NewError(fiber.StatusBadRequest, "Field KandangID is required")
 			}
 
-			req.ExpenseNonstocks = []validation.ExpenseNonstock{singleExpenseNonstock}
+			req.CostPerKandangs = []validation.CostPerKandang{singleCostPerKandang}
 		} else {
-			for i, expenseNonstock := range req.ExpenseNonstocks {
-				if expenseNonstock.KandangID == 0 {
-					return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Field KandangID is required for expense_nonstocks[%d]", i))
+			for i, costPerKandang := range req.CostPerKandangs {
+				if costPerKandang.KandangID == 0 {
+					return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Field KandangID is required for cost_per_kandangs[%d]", i))
 				}
 			}
 		}
 	} else {
-		return fiber.NewError(fiber.StatusBadRequest, "Field expense_nonstocks is required")
+		return fiber.NewError(fiber.StatusBadRequest, "Field cost_per_kandangs is required")
 	}
 
 	result, err := u.ExpenseService.CreateOne(c, req)
@@ -155,32 +155,20 @@ func (u *ExpenseController) UpdateOne(c *fiber.Ctx) error {
 		req.TransactionDate = &transactionDate
 	}
 
-	categoryVal := c.FormValue("category")
-	req.Category = &categoryVal
-
-	supplierIDVal := c.FormValue("supplier_id")
-	if supplierIDVal != "" {
-		supplierID, err := strconv.ParseUint(supplierIDVal, 10, 64)
-		if err != nil {
-			return fiber.NewError(fiber.StatusBadRequest, "Invalid supplier_id format")
-		}
-		req.SupplierID = &supplierID
-	}
-
-	expenseNonstocksJSON := c.FormValue("expense_nonstocks")
-	if expenseNonstocksJSON != "" {
-		var expenseNonstocks []validation.ExpenseNonstock
-		if err := json.Unmarshal([]byte(expenseNonstocksJSON), &expenseNonstocks); err != nil {
-			return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Invalid expense_nonstocks JSON: %v", err))
+	costPerKandangJSON := c.FormValue("cost_per_kandang")
+	if costPerKandangJSON != "" {
+		var costPerKandang []validation.CostPerKandang
+		if err := json.Unmarshal([]byte(costPerKandangJSON), &costPerKandang); err != nil {
+			return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Invalid cost_per_kandang JSON: %v", err))
 		}
 
-		for i, expenseNonstock := range expenseNonstocks {
-			if expenseNonstock.KandangID == 0 {
-				return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Field KandangID is required for expense_nonstocks[%d]", i))
+		for i, costPerKandang := range costPerKandang {
+			if costPerKandang.KandangID == 0 {
+				return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Field KandangID is required for cost_per_kandang[%d]", i))
 			}
 		}
 
-		req.ExpenseNonstocks = &expenseNonstocks
+		req.CostPerKandang = &costPerKandang
 	}
 
 	result, err := u.ExpenseService.UpdateOne(c, req, uint(id))

internal/modules/expenses/dto/expense.dto.go

@@ -15,9 +15,10 @@ import (
 // === DTO Structs ===
 
 type ExpenseRelationDTO struct {
-	Id              uint64    `json:"id"`
-	PoNumber        string    `json:"po_number"`
-	TransactionDate time.Time `json:"transaction_date"`
+	Id          uint64    `json:"id"`
+	PoNumber    string    `json:"po_number"`
+	ExpenseDate time.Time `json:"expense_date"`
+	GrandTotal  float64   `json:"grand_total"`
 }
 
 type ExpenseBaseDTO struct {
@@ -27,7 +28,8 @@ type ExpenseBaseDTO struct {
 	Category        string                           `json:"category"`
 	Supplier        *supplierDTO.SupplierRelationDTO `json:"supplier,omitempty"`
 	RealizationDate *time.Time                       `json:"realization_date,omitempty"`
-	TransactionDate time.Time                        `json:"transaction_date"`
+	ExpenseDate     time.Time                        `json:"expense_date"`
+	GrandTotal      float64                          `json:"grand_total"`
 	Location        *locationDTO.LocationRelationDTO `json:"location,omitempty"`
 }
 
@@ -53,26 +55,21 @@ type ExpenseDetailDTO struct {
 }
 
 type ExpenseNonstockDTO struct {
-	Id                    uint64                           `json:"id"`
-	ExpenseId             *uint64                          `json:"expense_id,omitempty"`
-	ProjectFlockKandangId *uint64                          `json:"project_flock_kandang_id,omitempty"`
-	KandangId             *uint64                          `json:"kandang_id,omitempty"`
-	NonstockId            *uint64                          `json:"nonstock_id,omitempty"`
-	Qty                   float64                          `json:"qty"`
-	Price                 float64                          `json:"price"`
-	Notes                 string                           `json:"notes"`
-	Nonstock              *nonstockDTO.NonstockRelationDTO `json:"nonstock,omitempty"`
-	CreatedAt             time.Time                        `json:"created_at"`
+	Id         uint64                           `json:"id"`
+	Qty        float64                          `json:"qty"`
+	UnitPrice  float64                          `json:"unit_price"`
+	TotalPrice float64                          `json:"total_price"`
+	Note       *string                          `json:"note,omitempty"`
+	Nonstock   *nonstockDTO.NonstockRelationDTO `json:"nonstock,omitempty"`
 }
 
 type ExpenseRealizationDTO struct {
-	Id                uint64                           `json:"id"`
-	ExpenseNonstockId *uint64                          `json:"expense_nonstock_id,omitempty"`
-	Qty               float64                          `json:"qty"`
-	Price             float64                          `json:"price"`
-	Notes             string                           `json:"notes"`
-	Nonstock          *nonstockDTO.NonstockRelationDTO `json:"nonstock,omitempty"`
-	CreatedAt         time.Time                        `json:"created_at"`
+	Id         uint64                           `json:"id"`
+	Qty        float64                          `json:"qty"`
+	UnitPrice  float64                          `json:"unit_price"`
+	TotalPrice float64                          `json:"total_price"`
+	Note       *string                          `json:"note,omitempty"`
+	Nonstock   *nonstockDTO.NonstockRelationDTO `json:"nonstock,omitempty"`
 }
 
 type KandangGroupDTO struct {
@@ -92,9 +89,10 @@ type DocumentDTO struct {
 
 func ToExpenseRelationDTO(e entity.Expense) ExpenseRelationDTO {
 	return ExpenseRelationDTO{
-		Id:              e.Id,
-		PoNumber:        e.PoNumber,
-		TransactionDate: e.TransactionDate,
+		Id:          e.Id,
+		PoNumber:    e.PoNumber,
+		ExpenseDate: e.ExpenseDate,
+		GrandTotal:  e.GrandTotal,
 	}
 }
 
@@ -126,7 +124,8 @@ func ToExpenseBaseDTO(e *entity.Expense) ExpenseBaseDTO {
 		Category:        e.Category,
 		Supplier:        supplier,
 		RealizationDate: realizationDate,
-		TransactionDate: e.TransactionDate,
+		ExpenseDate:     e.ExpenseDate,
+		GrandTotal:      e.GrandTotal,
 		Location:        location,
 	}
 }
@@ -193,9 +192,10 @@ func ToExpenseDetailDTO(e *entity.Expense) ExpenseDetailDTO {
 
 		for _, ns := range e.Nonstocks {
 			pengajuanDTO := ToExpenseNonstockDTO(ns)
+
 			pengajuans = append(pengajuans, pengajuanDTO)
 
-			if ns.Realization != nil {
+			if ns.Realization != nil && ns.Realization.Id != 0 {
 				var nonstock *nonstockDTO.NonstockRelationDTO
 				if ns.Nonstock != nil && ns.Nonstock.Id != 0 {
 					mapped := nonstockDTO.ToNonstockRelationDTO(*ns.Nonstock)
@@ -203,13 +203,12 @@ func ToExpenseDetailDTO(e *entity.Expense) ExpenseDetailDTO {
 				}
 
 				realisasiDTO := ExpenseRealizationDTO{
-					Id:                ns.Realization.Id,
-					ExpenseNonstockId: ns.Realization.ExpenseNonstockId,
-					Qty:               ns.Realization.Qty,
-					Price:             ns.Realization.Price,
-					Notes:             ns.Realization.Notes,
-					Nonstock:          nonstock,
-					CreatedAt:         ns.Realization.CreatedAt,
+					Id:         ns.Realization.Id,
+					Qty:        ns.Realization.RealizationQty,
+					UnitPrice:  ns.Realization.RealizationUnitPrice,
+					TotalPrice: ns.Realization.RealizationTotalPrice,
+					Note:       ns.Realization.Note,
+					Nonstock:   nonstock,
 				}
 				realisasi = append(realisasi, realisasiDTO)
 			}
@@ -218,12 +217,12 @@ func ToExpenseDetailDTO(e *entity.Expense) ExpenseDetailDTO {
 
 	var totalPengajuan float64
 	for _, p := range pengajuans {
-		totalPengajuan += p.Qty * p.Price
+		totalPengajuan += p.TotalPrice
 	}
 
 	var totalRealisasi float64
 	for _, r := range realisasi {
-		totalRealisasi += r.Qty * r.Price
+		totalRealisasi += r.TotalPrice
 	}
 	kandangs := ToKandangGroupDTO(pengajuans, realisasi, e.Nonstocks)
 
@@ -249,16 +248,12 @@ func ToExpenseNonstockDTO(ns entity.ExpenseNonstock) ExpenseNonstockDTO {
 	}
 
 	return ExpenseNonstockDTO{
-		Id:                    ns.Id,
-		ExpenseId:             ns.ExpenseId,
-		ProjectFlockKandangId: ns.ProjectFlockKandangId,
-		KandangId:             ns.KandangId,
-		NonstockId:            ns.NonstockId,
-		Qty:                   ns.Qty,
-		Price:                 ns.Price,
-		Notes:                 ns.Notes,
-		Nonstock:              nonstock,
-		CreatedAt:             ns.CreatedAt,
+		Id:         ns.Id,
+		Qty:        ns.Qty,
+		UnitPrice:  ns.UnitPrice,
+		TotalPrice: ns.TotalPrice,
+		Note:       &ns.Note,
+		Nonstock:   nonstock,
 	}
 }
 
@@ -269,13 +264,11 @@ func ToKandangGroupDTO(pengajuans []ExpenseNonstockDTO, realisasi []ExpenseReali
 		var kandangId uint64
 		var kandangName string
 
-		if p.KandangId != nil {
-			kandangId = *p.KandangId
-			for _, ns := range nonstocks {
-				if ns.Id == p.Id && ns.Kandang != nil {
-					kandangName = ns.Kandang.Name
-					break
-				}
+		for _, ns := range nonstocks {
+			if ns.Id == p.Id && ns.Kandang != nil {
+				kandangId = uint64(ns.Kandang.Id)
+				kandangName = ns.Kandang.Name
+				break
 			}
 		}
 

internal/modules/expenses/repositories/expense.repository.go

@@ -10,7 +10,7 @@ import (
 
 type ExpenseRepository interface {
 	repository.BaseRepository[entity.Expense]
-	IdExists(ctx context.Context, id uint) (bool, error)
+	IdExists(ctx context.Context, id uint64) (bool, error)
 	GetNextSequence(ctx context.Context) (int, error)
 	GetWithSupplier(ctx context.Context, id uint64) (*entity.Expense, error)
 }
@@ -25,8 +25,8 @@ func NewExpenseRepository(db *gorm.DB) ExpenseRepository {
 	}
 }
 
-func (r *ExpenseRepositoryImpl) IdExists(ctx context.Context, id uint) (bool, error) {
-	return repository.Exists[entity.Expense](ctx, r.DB(), id)
+func (r *ExpenseRepositoryImpl) IdExists(ctx context.Context, id uint64) (bool, error) {
+	return repository.Exists[entity.Expense](ctx, r.DB(), uint(id))
 }
 
 func (r *ExpenseRepositoryImpl) GetNextSequence(ctx context.Context) (int, error) {

internal/modules/expenses/route.go

@@ -1,7 +1,7 @@
 package expenses
 
 import (
-	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
+	// m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	controller "gitlab.com/mbugroup/lti-api.git/internal/modules/expenses/controllers"
 	expense "gitlab.com/mbugroup/lti-api.git/internal/modules/expenses/services"
 	user "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services"
@@ -13,7 +13,7 @@ func ExpenseRoutes(v1 fiber.Router, u user.UserService, s expense.ExpenseService
 	ctrl := controller.NewExpenseController(s)
 
 	route := v1.Group("/expenses")
-	route.Use(m.Auth(u))
+
 	// route.Get("/", m.Auth(u), ctrl.GetAll)
 	// route.Post("/", m.Auth(u), ctrl.CreateOne)
 	// route.Get("/:id", m.Auth(u), ctrl.GetOne)

internal/modules/expenses/services/expense.service.go

@@ -7,6 +7,7 @@ import (
 	"errors"
 	"fmt"
 	"mime/multipart"
+	"time"
 
 	commonRepo "gitlab.com/mbugroup/lti-api.git/internal/common/repository"
 	commonSvc "gitlab.com/mbugroup/lti-api.git/internal/common/service"
@@ -147,8 +148,8 @@ func (s *expenseService) CreateOne(c *fiber.Ctx, req *validation.Create) (*expen
 		return nil, err
 	}
 
-	for _, expenseNonstock := range req.ExpenseNonstocks {
-		for _, costItem := range expenseNonstock.CostItems {
+	for _, costPerKandang := range req.CostPerKandangs {
+		for _, costItem := range costPerKandang.CostItems {
 			nonstockId := uint(costItem.NonstockID)
 
 			if err := commonSvc.EnsureRelations(c.Context(),
@@ -188,13 +189,21 @@ func (s *expenseService) CreateOne(c *fiber.Ctx, req *validation.Create) (*expen
 			return fiber.NewError(fiber.StatusInternalServerError, "Failed to generate reference number")
 		}
 
+		var grandTotal float64
+		for _, costPerKandang := range req.CostPerKandangs {
+			for _, costItem := range costPerKandang.CostItems {
+				grandTotal += costItem.TotalCost
+			}
+		}
+
 		createdBy := uint64(1) //todo get from auth
 		expense = &entity.Expense{
 			ReferenceNumber: referenceNumber,
 			PoNumber:        req.PoNumber,
 			Category:        req.Category,
 			SupplierId:      req.SupplierID,
-			TransactionDate: expenseDate,
+			ExpenseDate:     expenseDate,
+			GrandTotal:      grandTotal,
 			CreatedBy:       createdBy,
 		}
 
@@ -202,15 +211,15 @@ func (s *expenseService) CreateOne(c *fiber.Ctx, req *validation.Create) (*expen
 			return fiber.NewError(fiber.StatusInternalServerError, "Failed to create expense")
 		}
 
-		if len(req.ExpenseNonstocks) > 0 {
+		if len(req.CostPerKandangs) > 0 {
 
-			for _, expenseNonstock := range req.ExpenseNonstocks {
+			for _, costPerKandang := range req.CostPerKandangs {
 
 				var projectFlockKandangId *uint64
 
 				if req.Category == "BOP" {
 
-					projectFlockKandang, err := projectFlockKandangRepoTx.GetActiveByKandangID(c.Context(), uint(expenseNonstock.KandangID))
+					projectFlockKandang, err := projectFlockKandangRepoTx.GetActiveByKandangID(c.Context(), uint(costPerKandang.KandangID))
 					if err != nil {
 						if errors.Is(err, gorm.ErrRecordNotFound) {
 							return fiber.NewError(fiber.StatusNotFound, "No active project flock kandang found for this kandang")
@@ -221,16 +230,16 @@ func (s *expenseService) CreateOne(c *fiber.Ctx, req *validation.Create) (*expen
 					projectFlockKandangId = &id
 				}
 
-				for _, costItem := range expenseNonstock.CostItems {
+				for _, costItem := range costPerKandang.CostItems {
 
 					nonstockId := costItem.NonstockID
 					var kandangId *uint64
 					if req.Category == "NON-BOP" {
-						id := uint64(expenseNonstock.KandangID)
+						id := uint64(costPerKandang.KandangID)
 						kandangId = &id
 					} else if req.Category == "BOP" {
 						if projectFlockKandangId != nil {
-							kandangId = &expenseNonstock.KandangID
+							kandangId = &costPerKandang.KandangID
 						}
 					}
 
@@ -240,8 +249,8 @@ func (s *expenseService) CreateOne(c *fiber.Ctx, req *validation.Create) (*expen
 						KandangId:             kandangId,
 						NonstockId:            &nonstockId,
 						Qty:                   costItem.Quantity,
-						Price:                 costItem.Price,
-						Notes:                 costItem.Notes,
+						TotalPrice:            costItem.TotalCost,
+						Note:                  costItem.Notes,
 					}
 
 					if err := expenseNonstockRepoTx.CreateOne(c.Context(), expenseNonstock, nil); err != nil {
@@ -293,7 +302,9 @@ func (s expenseService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint)
 	}
 
 	if err := commonSvc.EnsureRelations(c.Context(),
-		commonSvc.RelationCheck{Name: "Expense", ID: &id, Exists: s.Repository.IdExists},
+		commonSvc.RelationCheck{Name: "Expense", ID: &id, Exists: func(ctx context.Context, id uint) (bool, error) {
+			return s.Repository.IdExists(ctx, uint64(id))
+		}},
 	); err != nil {
 		return nil, err
 	}
@@ -317,27 +328,10 @@ func (s expenseService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint)
 		if err != nil {
 			return nil, fiber.NewError(fiber.StatusBadRequest, "Invalid transaction_date format")
 		}
-		updateBody["transaction_date"] = expenseDate
+		updateBody["expense_date"] = expenseDate
 	}
 
-	if req.Category != nil {
-		updateBody["category"] = *req.Category
-	}
-
-	if req.SupplierID != nil {
-		supplierID := uint(*req.SupplierID)
-		supplierExistsFunc := func(ctx context.Context, id uint) (bool, error) {
-			return commonRepo.Exists[entity.Supplier](ctx, s.SupplierRepo.DB(), id)
-		}
-		if err := commonSvc.EnsureRelations(c.Context(),
-			commonSvc.RelationCheck{Name: "Supplier", ID: &supplierID, Exists: supplierExistsFunc},
-		); err != nil {
-			return nil, err
-		}
-		updateBody["supplier_id"] = *req.SupplierID
-	}
-
-	if len(updateBody) == 0 && req.ExpenseNonstocks == nil && len(req.Documents) == 0 {
+	if len(updateBody) == 0 && req.CostPerKandang == nil && len(req.Documents) == 0 {
 
 		responseDTO, err := s.GetOne(c, id)
 		if err != nil {
@@ -352,21 +346,6 @@ func (s expenseService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint)
 		approvalSvcTx := commonSvc.NewApprovalService(commonRepo.NewApprovalRepository(tx))
 		expenseNonstockRepoTx := repository.NewExpenseNonstockRepository(tx)
 
-		currentExpense, err := expenseRepoTx.GetByID(c.Context(), id, nil)
-		if err != nil {
-			if errors.Is(err, gorm.ErrRecordNotFound) {
-				return fiber.NewError(fiber.StatusNotFound, "Expense not found")
-			}
-			return fiber.NewError(fiber.StatusInternalServerError, "Failed to get expense")
-		}
-
-		categoryChanged := false
-		var newCategory string
-		if req.Category != nil && *req.Category != currentExpense.Category {
-			categoryChanged = true
-			newCategory = *req.Category
-		}
-
 		if len(updateBody) > 0 {
 			if err := expenseRepoTx.PatchOne(c.Context(), id, updateBody, nil); err != nil {
 				if errors.Is(err, gorm.ErrRecordNotFound) {
@@ -376,79 +355,41 @@ func (s expenseService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint)
 			}
 		}
 
-		if categoryChanged {
-			if currentExpense.Category == "BOP" && newCategory == "NON-BOP" {
+		if req.CostPerKandang != nil {
 
-				var existingExpenseNonstocks []entity.ExpenseNonstock
-				if err := tx.Where("expense_id = ?", id).Find(&existingExpenseNonstocks).Error; err != nil {
-					return fiber.NewError(fiber.StatusInternalServerError, "Failed to get expense nonstocks")
-				}
-
-				for _, ens := range existingExpenseNonstocks {
-					updateData := map[string]interface{}{
-						"project_flock_kandang_id": nil,
-					}
-					if err := expenseNonstockRepoTx.PatchOne(c.Context(), uint(ens.Id), updateData, nil); err != nil {
-						return fiber.NewError(fiber.StatusInternalServerError, "Failed to update project flock kandang id to null")
-					}
-				}
-			} else if currentExpense.Category == "NON-BOP" && newCategory == "BOP" {
-
-				var existingExpenseNonstocks []entity.ExpenseNonstock
-				if err := tx.Where("expense_id = ?", id).Find(&existingExpenseNonstocks).Error; err != nil {
-					return fiber.NewError(fiber.StatusInternalServerError, "Failed to get expense nonstocks")
-				}
-
-				projectFlockKandangRepoTx := projectFlockKandangRepo.NewProjectFlockKandangRepository(tx)
-				for _, ens := range existingExpenseNonstocks {
-					if ens.KandangId != nil {
-						projectFlockKandang, err := projectFlockKandangRepoTx.GetActiveByKandangID(c.Context(), uint(*ens.KandangId))
-						if err != nil {
-							if errors.Is(err, gorm.ErrRecordNotFound) {
-								return fiber.NewError(fiber.StatusNotFound, "No active project flock kandang found for this kandang")
-							}
-							return fiber.NewError(fiber.StatusInternalServerError, "Failed to find project flock kandang for this kandang")
-						}
-						projectFlockKandangId := uint64(projectFlockKandang.Id)
-
-						updateData := map[string]interface{}{
-							"project_flock_kandang_id": projectFlockKandangId,
-						}
-						if err := expenseNonstockRepoTx.PatchOne(c.Context(), uint(ens.Id), updateData, nil); err != nil {
-							return fiber.NewError(fiber.StatusInternalServerError, "Failed to update project flock kandang id")
-						}
-					}
-				}
-			}
-		}
-
-		if req.ExpenseNonstocks != nil {
-
-			var existingExpenseNonstocks []entity.ExpenseNonstock
-			if err := tx.Where("expense_id = ?", id).Find(&existingExpenseNonstocks).Error; err != nil {
-				return fiber.NewError(fiber.StatusInternalServerError, "Failed to get expense nonstocks for deletion")
+			if err := tx.Where("expense_id = ?", id).Delete(&entity.ExpenseNonstock{}).Error; err != nil {
+				return fiber.NewError(fiber.StatusInternalServerError, "Failed to update expense items")
 			}
 
-			for _, ens := range existingExpenseNonstocks {
-				if err := expenseNonstockRepoTx.DeleteOne(c.Context(), uint(ens.Id)); err != nil {
-					return fiber.NewError(fiber.StatusInternalServerError, "Failed to delete expense nonstock")
+			var grandTotal float64
+			for _, cpk := range *req.CostPerKandang {
+				for _, costItem := range cpk.CostItems {
+					grandTotal += costItem.TotalCost
 				}
 			}
 
-			updatedExpense, err := expenseRepoTx.GetByID(c.Context(), id, nil)
-			if err != nil {
-				if errors.Is(err, gorm.ErrRecordNotFound) {
-					return fiber.NewError(fiber.StatusNotFound, "Expense not found")
-				}
-				return fiber.NewError(fiber.StatusInternalServerError, "Failed to get updated expense")
+			if err := expenseRepoTx.PatchOne(c.Context(), id, map[string]interface{}{
+				"grand_total": grandTotal,
+			}, nil); err != nil {
+
+				return fiber.NewError(fiber.StatusInternalServerError, "Failed to update expense grand total")
 			}
 
-			for _, expenseNonstock := range *req.ExpenseNonstocks {
+			for _, cpk := range *req.CostPerKandang {
 				var projectFlockKandangId *uint64
 
-				if updatedExpense.Category == "BOP" {
+				expense, err := expenseRepoTx.GetByID(c.Context(), id, nil)
+				if err != nil {
+					if errors.Is(err, gorm.ErrRecordNotFound) {
+						return fiber.NewError(fiber.StatusNotFound, "Expense not found")
+					}
+					return fiber.NewError(fiber.StatusInternalServerError, "Failed to get expense")
+				}
+
+				if expense.Category == "BOP" {
+
 					projectFlockKandangRepoTx := projectFlockKandangRepo.NewProjectFlockKandangRepository(tx)
-					projectFlockKandang, err := projectFlockKandangRepoTx.GetActiveByKandangID(c.Context(), uint(expenseNonstock.KandangID))
+					projectFlockKandang, err := projectFlockKandangRepoTx.GetActiveByKandangID(c.Context(), uint(cpk.KandangID))
 					if err != nil {
 						if errors.Is(err, gorm.ErrRecordNotFound) {
 							return fiber.NewError(fiber.StatusNotFound, "No active project flock kandang found for this kandang")
@@ -459,7 +400,7 @@ func (s expenseService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint)
 					projectFlockKandangId = &id
 				}
 
-				for _, costItem := range expenseNonstock.CostItems {
+				for _, costItem := range cpk.CostItems {
 
 					nonstockId := uint(costItem.NonstockID)
 					if err := commonSvc.EnsureRelations(c.Context(),
@@ -469,12 +410,13 @@ func (s expenseService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint)
 					}
 
 					var kandangId *uint64
-					if updatedExpense.Category == "NON-BOP" {
-						id := uint64(expenseNonstock.KandangID)
+					if expense.Category == "NON-BOP" {
+						id := uint64(cpk.KandangID)
 						kandangId = &id
-					} else if updatedExpense.Category == "BOP" {
+					} else if expense.Category == "BOP" {
+
 						if projectFlockKandangId != nil {
-							kandangId = &expenseNonstock.KandangID
+							kandangId = &cpk.KandangID
 						}
 					}
 
@@ -485,8 +427,8 @@ func (s expenseService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint)
 						KandangId:             kandangId,
 						NonstockId:            &costItem.NonstockID,
 						Qty:                   costItem.Quantity,
-						Price:                 costItem.Price,
-						Notes:                 costItem.Notes,
+						TotalPrice:            costItem.TotalCost,
+						Note:                  costItem.Notes,
 					}
 
 					if err := expenseNonstockRepoTx.CreateOne(c.Context(), expenseNonstock, nil); err != nil {
@@ -539,7 +481,9 @@ func (s expenseService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint)
 func (s expenseService) DeleteOne(c *fiber.Ctx, id uint) error {
 
 	if err := commonSvc.EnsureRelations(c.Context(),
-		commonSvc.RelationCheck{Name: "Expense", ID: &id, Exists: s.Repository.IdExists},
+		commonSvc.RelationCheck{Name: "Expense", ID: &id, Exists: func(ctx context.Context, id uint) (bool, error) {
+			return s.Repository.IdExists(ctx, uint64(id))
+		}},
 	); err != nil {
 		return err
 	}
@@ -562,7 +506,9 @@ func (s *expenseService) CreateRealization(c *fiber.Ctx, expenseID uint, req *va
 	}
 
 	if err := commonSvc.EnsureRelations(c.Context(),
-		commonSvc.RelationCheck{Name: "Expense", ID: &expenseID, Exists: s.Repository.IdExists},
+		commonSvc.RelationCheck{Name: "Expense", ID: &expenseID, Exists: func(ctx context.Context, id uint) (bool, error) {
+			return s.Repository.IdExists(ctx, uint64(id))
+		}},
 	); err != nil {
 		return nil, err
 	}
@@ -572,6 +518,8 @@ func (s *expenseService) CreateRealization(c *fiber.Ctx, expenseID uint, req *va
 		return nil, fiber.NewError(fiber.StatusBadRequest, "Invalid realization_date format")
 	}
 
+	createdBy := uint64(1) // TODO: replace with authenticated user id
+
 	if err := s.Repository.DB().WithContext(c.Context()).Transaction(func(tx *gorm.DB) error {
 
 		approvalSvc := commonSvc.NewApprovalService(commonRepo.NewApprovalRepository(tx))
@@ -595,14 +543,13 @@ func (s *expenseService) CreateRealization(c *fiber.Ctx, expenseID uint, req *va
 			}
 
 			realization := &entity.ExpenseRealization{
-				ExpenseNonstockId: &expenseNonstockID,
-				Qty:               realizationItem.Qty,
-				Price:             realizationItem.Price,
-				Notes:             "",
-			}
-
-			if realizationItem.Notes != nil {
-				realization.Notes = *realizationItem.Notes
+				ExpenseNonstockId:     &expenseNonstockID,
+				RealizationQty:        realizationItem.Qty,
+				RealizationUnitPrice:  realizationItem.UnitPrice,
+				RealizationTotalPrice: realizationItem.TotalPrice,
+				RealizationDate:       realizationDate,
+				Note:                  realizationItem.Notes,
+				CreatedBy:             &createdBy,
 			}
 
 			if err := realizationRepoTx.CreateOne(c.Context(), realization, nil); err != nil {
@@ -629,7 +576,7 @@ func (s *expenseService) CreateRealization(c *fiber.Ctx, expenseID uint, req *va
 			expenseID,
 			utils.ExpenseStepRealisasi,
 			&approvalAction,
-			uint(1), // TODO: replace with authenticated user id
+			uint(createdBy),
 			nil); err != nil {
 
 			return fiber.NewError(fiber.StatusInternalServerError, "Failed to create realization approval")
@@ -650,7 +597,9 @@ func (s *expenseService) CreateRealization(c *fiber.Ctx, expenseID uint, req *va
 func (s *expenseService) CompleteExpense(c *fiber.Ctx, id uint, notes *string) (*expenseDto.ExpenseDetailDTO, error) {
 
 	if err := commonSvc.EnsureRelations(c.Context(),
-		commonSvc.RelationCheck{Name: "Expense", ID: &id, Exists: s.Repository.IdExists},
+		commonSvc.RelationCheck{Name: "Expense", ID: &id, Exists: func(ctx context.Context, id uint) (bool, error) {
+			return s.Repository.IdExists(ctx, uint64(id))
+		}},
 	); err != nil {
 		return nil, err
 	}
@@ -703,12 +652,14 @@ func (s *expenseService) CompleteExpense(c *fiber.Ctx, id uint, notes *string) (
 
 func (s *expenseService) UpdateRealization(c *fiber.Ctx, expenseID uint, req *validation.UpdateRealization) (*expenseDto.ExpenseDetailDTO, error) {
 	if err := s.Validate.Struct(req); err != nil {
-
+		s.Log.Errorf("Validation failed for UpdateRealization: %+v", err)
 		return nil, err
 	}
 
 	if err := commonSvc.EnsureRelations(c.Context(),
-		commonSvc.RelationCheck{Name: "Expense", ID: &expenseID, Exists: s.Repository.IdExists},
+		commonSvc.RelationCheck{Name: "Expense", ID: &expenseID, Exists: func(ctx context.Context, id uint) (bool, error) {
+			return s.Repository.IdExists(ctx, uint64(id))
+		}},
 	); err != nil {
 		return nil, err
 	}
@@ -718,56 +669,66 @@ func (s *expenseService) UpdateRealization(c *fiber.Ctx, expenseID uint, req *va
 		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to validate workflow")
 	}
 
-	if latestApproval != nil && (latestApproval.StepNumber < uint16(utils.ExpenseStepRealisasi)) {
+	if latestApproval != nil && latestApproval.StepNumber != uint16(utils.ExpenseStepRealisasi) {
 		currentStepName := utils.ExpenseApprovalSteps[approvalutils.ApprovalStep(latestApproval.StepNumber)]
 		return nil, fiber.NewError(fiber.StatusBadRequest,
-			fmt.Sprintf("tidak bisa update realisasi pada step %s. Harus pada step Realisasi atau selesai", currentStepName))
+			fmt.Sprintf("Cannot update realization at %s step. Must be at Realisasi step", currentStepName))
 	}
 
-	err = s.Repository.DB().WithContext(c.Context()).Transaction(func(tx *gorm.DB) error {
+	var realizationDate *time.Time
+	if req.RealizationDate != "" {
+		parsedDate, err := utils.ParseDateString(req.RealizationDate)
+		if err != nil {
+			return nil, fiber.NewError(fiber.StatusBadRequest, "Invalid realization_date format")
+		}
+		realizationDate = &parsedDate
+	}
+
+	if err := s.Repository.DB().WithContext(c.Context()).Transaction(func(tx *gorm.DB) error {
 
-		approvalSvcTx := commonSvc.NewApprovalService(commonRepo.NewApprovalRepository(tx))
 		realizationRepoTx := repository.NewExpenseRealizationRepository(tx)
 		expenseNonstockRepoTx := repository.NewExpenseNonstockRepository(tx)
 		expenseRepoTx := repository.NewExpenseRepository(tx)
 
-		// Check if only updating documents
-		updateDataOnly := len(req.Realizations) == 0 && len(req.Documents) > 0
+		for _, realizationItem := range req.Realizations {
 
-		if len(req.Realizations) > 0 {
-			for _, realizationItem := range req.Realizations {
+			expenseNonstockID := realizationItem.ExpenseNonstockID
 
-				expenseNonstockID := realizationItem.ExpenseNonstockID
-
-				if err := s.validateExpenseNonstockRelation(c, expenseNonstockRepoTx, expenseID, expenseNonstockID); err != nil {
-					return err
-				}
-
-				existingRealization, err := realizationRepoTx.GetByExpenseNonstockID(c.Context(), uint64(expenseNonstockID))
-				if err != nil {
-					if errors.Is(err, gorm.ErrRecordNotFound) {
-
-						return fiber.NewError(fiber.StatusNotFound, "Realization not found for this expense nonstock")
-					}
-
-					return fiber.NewError(fiber.StatusInternalServerError, "Failed to get existing realization")
-				}
-
-				updateData := map[string]interface{}{
-					"qty":   realizationItem.Qty,
-					"price": realizationItem.Price,
-				}
-
-				if realizationItem.Notes != nil {
-					updateData["notes"] = *realizationItem.Notes
-				}
-
-				if err := realizationRepoTx.PatchOne(c.Context(), uint(existingRealization.Id), updateData, nil); err != nil {
-					s.Log.Errorf("Failed to update realization: %+v", err)
-					return fiber.NewError(fiber.StatusInternalServerError, "Failed to update realization")
-				}
+			if err := s.validateExpenseNonstockRelation(c, expenseNonstockRepoTx, expenseID, expenseNonstockID); err != nil {
+				return err
 			}
 
+			existingRealization, err := realizationRepoTx.GetByExpenseNonstockID(c.Context(), uint64(expenseNonstockID))
+			if err != nil {
+				if errors.Is(err, gorm.ErrRecordNotFound) {
+
+					return fiber.NewError(fiber.StatusNotFound, "Realization not found for this expense nonstock")
+				}
+
+				return fiber.NewError(fiber.StatusInternalServerError, "Failed to get existing realization")
+			}
+
+			updateData := map[string]interface{}{
+				"realization_qty":         realizationItem.Qty,
+				"realization_unit_price":  realizationItem.UnitPrice,
+				"realization_total_price": realizationItem.TotalPrice,
+				"realization_date":        *realizationDate,
+			}
+
+			if realizationItem.Notes != nil {
+				updateData["note"] = *realizationItem.Notes
+			}
+
+			if err := realizationRepoTx.PatchOne(c.Context(), uint(existingRealization.Id), updateData, nil); err != nil {
+				s.Log.Errorf("Failed to update realization: %+v", err)
+				return fiber.NewError(fiber.StatusInternalServerError, "Failed to update realization")
+			}
+		}
+
+		if err := expenseRepoTx.PatchOne(c.Context(), expenseID, map[string]interface{}{
+			"realization_date": *realizationDate,
+		}, nil); err != nil {
+			return fiber.NewError(fiber.StatusInternalServerError, "Failed to update realization date")
 		}
 
 		if len(req.Documents) > 0 {
@@ -776,28 +737,9 @@ func (s *expenseService) UpdateRealization(c *fiber.Ctx, expenseID uint, req *va
 			}
 		}
 
-		if !updateDataOnly && *latestApproval.Action == entity.ApprovalActionUpdated {
-			actorID := uint(1) // TODO: replace with authenticated user id
-			approvalAction := entity.ApprovalActionUpdated
-			if _, err := approvalSvcTx.CreateApproval(
-				c.Context(),
-				utils.ApprovalWorkflowExpense,
-				expenseID,
-				utils.ExpenseStepRealisasi,
-				&approvalAction,
-				actorID,
-				nil); err != nil {
-				return fiber.NewError(fiber.StatusInternalServerError, "Failed to create realization approval")
-			}
-		}
-
 		return nil
-	})
-	if err != nil {
-		if fiberErr, ok := err.(*fiber.Error); ok {
-			return nil, fiberErr
-		}
-		return nil, fiber.NewError(fiber.StatusInternalServerError, "gagal update realisasi expense")
+	}); err != nil {
+		return nil, err
 	}
 
 	responseDTO, err := s.GetOne(c, expenseID)
@@ -883,7 +825,9 @@ func (s *expenseService) processDocuments(ctx *fiber.Ctx, expenseRepoTx reposito
 func (s *expenseService) DeleteDocument(ctx *fiber.Ctx, expenseID uint, documentID uint64, isRealization bool) error {
 
 	if err := commonSvc.EnsureRelations(ctx.Context(),
-		commonSvc.RelationCheck{Name: "Expense", ID: &expenseID, Exists: s.Repository.IdExists},
+		commonSvc.RelationCheck{Name: "Expense", ID: &expenseID, Exists: func(ctx context.Context, id uint) (bool, error) {
+			return s.Repository.IdExists(ctx, uint64(id))
+		}},
 	); err != nil {
 		return err
 	}
@@ -965,7 +909,9 @@ func (s *expenseService) Approval(c *fiber.Ctx, req *validation.ApprovalRequest,
 
 		for _, id := range req.ApprovableIds {
 			if err := commonSvc.EnsureRelations(c.Context(),
-				commonSvc.RelationCheck{Name: "Expense", ID: &id, Exists: s.Repository.IdExists},
+				commonSvc.RelationCheck{Name: "Expense", ID: &id, Exists: func(ctx context.Context, id uint) (bool, error) {
+					return s.Repository.IdExists(ctx, uint64(id))
+				}},
 			); err != nil {
 				return err
 			}

internal/modules/expenses/validations/expense.validation.go

@@ -5,15 +5,15 @@ import (
 )
 
 type Create struct {
-	PoNumber         string                   `form:"po_number" json:"po_number" validate:"omitempty,max=50"`
-	TransactionDate  string                   `form:"transaction_date" json:"transaction_date" validate:"required,datetime=2006-01-02"`
-	Category         string                   `form:"category" json:"category" validate:"required,oneof=BOP NON-BOP"`
-	SupplierID       uint64                   `form:"supplier_id" json:"supplier_id" validate:"required,gt=0"`
-	Documents        []*multipart.FileHeader  `form:"documents" json:"documents" validate:"omitempty,dive"`
-	ExpenseNonstocks []ExpenseNonstock       `form:"expense_nonstocks" json:"expense_nonstocks" validate:"required,min=1,dive"`
+	PoNumber        string                  `form:"po_number" json:"po_number" validate:"omitempty,max=50"`
+	TransactionDate string                  `form:"transaction_date" json:"transaction_date" validate:"required,datetime=2006-01-02"`
+	Category        string                  `form:"category" json:"category" validate:"required,oneof=BOP NON-BOP"`
+	SupplierID      uint64                  `form:"supplier_id" json:"supplier_id" validate:"required,gt=0"`
+	Documents       []*multipart.FileHeader `form:"documents" json:"documents" validate:"omitempty,dive"`
+	CostPerKandangs []CostPerKandang        `form:"cost_per_kandangs" json:"cost_per_kandangs" validate:"required,min=1,dive"`
 }
 
-type ExpenseNonstock struct {
+type CostPerKandang struct {
 	KandangID uint64     `form:"kandang_id" json:"kandang_id" validate:"required,gt=0"`
 	CostItems []CostItem `form:"cost_items" json:"cost_items" validate:"required,min=1,dive"`
 }
@@ -21,16 +21,14 @@ type ExpenseNonstock struct {
 type CostItem struct {
 	NonstockID uint64  `form:"nonstock_id" json:"nonstock_id" validate:"required,gt=0"`
 	Quantity   float64 `form:"quantity" json:"quantity" validate:"required,gt=0"`
-	Price      float64 `form:"price" json:"price" validate:"required,gt=0"`
+	TotalCost  float64 `form:"total_cost" json:"total_cost" validate:"required,gt=0"`
 	Notes      string  `form:"notes" json:"notes" validate:"required,max=500"`
 }
 
 type Update struct {
-	TransactionDate  *string                  `form:"transaction_date" json:"transaction_date" validate:"omitempty,datetime=2006-01-02"`
-	Category         *string                  `form:"category" json:"category" validate:"omitempty,oneof=BOP NON-BOP"`
-	SupplierID       *uint64                  `form:"supplier_id" json:"supplier_id" validate:"omitempty,gt=0"`
-	ExpenseNonstocks *[]ExpenseNonstock      `form:"expense_nonstocks" json:"expense_nonstocks" validate:"omitempty,min=1,dive"`
-	Documents        []*multipart.FileHeader  `form:"documents" json:"documents" validate:"omitempty,dive"`
+	TransactionDate *string                 `form:"transaction_date" json:"transaction_date" validate:"omitempty,datetime=2006-01-02"`
+	CostPerKandang  *[]CostPerKandang       `form:"cost_per_kandang" json:"cost_per_kandang" validate:"omitempty,min=1,dive"`
+	Documents       []*multipart.FileHeader `form:"documents" json:"documents" validate:"omitempty,dive"`
 }
 
 type Query struct {
@@ -54,7 +52,8 @@ type UpdateRealization struct {
 type RealizationItem struct {
 	ExpenseNonstockID uint64  `form:"expense_nonstock_id" json:"expense_nonstock_id" validate:"required,gt=0"`
 	Qty               float64 `form:"qty" json:"qty" validate:"required,gt=0"`
-	Price             float64 `form:"price" json:"price" validate:"required,gt=0"`
+	UnitPrice         float64 `form:"unit_price" json:"unit_price" validate:"required,gt=0"`
+	TotalPrice        float64 `form:"total_price" json:"total_price" validate:"required,gt=0"`
 	Notes             *string `form:"notes" json:"notes" validate:"omitempty,max=500"`
 }
 

internal/modules/inventory/adjustments/dto/adjustment.dto.go

@@ -104,12 +104,12 @@ func ToProductWarehouseDTO(e *entity.ProductWarehouse) *ProductWarehouseDTO {
 
 func ToAdjustmentRelationDTO(e *entity.StockLog) AdjustmentRelationDTO {
 	return AdjustmentRelationDTO{
-		Id: e.Id,
-		// TransactionType: e.LoggableType,
-		// Quantity:           e.Q,
-		// BeforeQuantity:     e.BeforeQuantity,
-		// AfterQuantity:      e.AfterQuantity,
-		Note:               e.Notes,
+		Id:                 e.Id,
+		TransactionType:    e.TransactionType,
+		Quantity:           e.Quantity,
+		BeforeQuantity:     e.BeforeQuantity,
+		AfterQuantity:      e.AfterQuantity,
+		Note:               e.Note,
 		ProductWarehouseId: e.ProductWarehouseId,
 		ProductWarehouse:   ToProductWarehouseDTO(e.ProductWarehouse),
 	}
@@ -136,6 +136,6 @@ func ToAdjustmentListDTO(e *entity.StockLog) AdjustmentListDTO {
 func ToAdjustmentDetailDTO(e *entity.StockLog) AdjustmentDetailDTO {
 	return AdjustmentDetailDTO{
 		AdjustmentListDTO: ToAdjustmentListDTO(e),
-		// UpdatedAt:         e.UpdatedAt,
+		UpdatedAt:         e.UpdatedAt,
 	}
 }

internal/modules/inventory/adjustments/services/adjustment.service.go

@@ -5,8 +5,8 @@ import (
 	"strings"
 
 	common "gitlab.com/mbugroup/lti-api.git/internal/common/service"
+
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/adjustments/validations"
 	ProductWarehouse "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/repositories"
 	productRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/master/products/repositories"
@@ -66,7 +66,7 @@ func (s *adjustmentService) GetOne(c *fiber.Ctx, id uint) (*entity.StockLog, err
 		return nil, err
 	}
 
-	if stockLog.LoggableType != entity.LogTypeAdjustment {
+	if stockLog.LogType != entity.LogTypeAdjustment {
 		return nil, fiber.NewError(fiber.StatusNotFound, "Adjustment not found")
 	}
 
@@ -78,10 +78,7 @@ func (s *adjustmentService) Adjustment(c *fiber.Ctx, req *validation.Create) (*e
 		return nil, err
 	}
 	ctx := c.Context()
-	actorID, err := m.ActorIDFromContext(c)
-	if err != nil {
-		return nil, err
-	}
+
 	if err := common.EnsureRelations(c.Context(),
 		common.RelationCheck{Name: "Product", ID: &req.ProductID, Exists: s.ProductRepo.IdExists},
 		common.RelationCheck{Name: "Warehouse", ID: &req.WarehouseID, Exists: s.WarehouseRepo.IdExists},
@@ -110,7 +107,7 @@ func (s *adjustmentService) Adjustment(c *fiber.Ctx, req *validation.Create) (*e
 			ProductId:   uint(req.ProductID),
 			WarehouseId: uint(req.WarehouseID),
 			Quantity:    0,
-			// CreatedBy:   1, // TODO: should Get from auth middleware
+			CreatedBy:   1, // TODO: should Get from auth middleware
 		}
 
 		if err := s.ProductWarehouseRepo.CreateOne(ctx, newPW, nil); err != nil {
@@ -128,23 +125,25 @@ func (s *adjustmentService) Adjustment(c *fiber.Ctx, req *validation.Create) (*e
 		}
 
 		afterQuantity := productWarehouse.Quantity
-		newLog := &entity.StockLog{
-			// TransactionType:    transactionType,
-			LoggableType:       entity.LogTypeAdjustment,
-			LoggableId:         0,
-			Notes:              req.Note,
-			ProductWarehouseId: productWarehouse.Id,
-			CreatedBy:          actorID, // TODO: should Get from auth middleware
-		}
 		if transactionType == entity.TransactionTypeIncrease {
 			afterQuantity += req.Quantity
-			newLog.Increase = afterQuantity
 		} else {
 			if productWarehouse.Quantity < req.Quantity {
 				return fiber.NewError(fiber.StatusBadRequest, "Insufficient stock for adjustment")
 			}
 			afterQuantity -= req.Quantity
-			newLog.Decrease = afterQuantity
+		}
+
+		newLog := &entity.StockLog{
+			TransactionType:    transactionType,
+			Quantity:           req.Quantity,
+			BeforeQuantity:     productWarehouse.Quantity,
+			AfterQuantity:      afterQuantity,
+			LogType:            entity.LogTypeAdjustment,
+			LogId:              0,
+			Note:               req.Note,
+			ProductWarehouseId: productWarehouse.Id,
+			CreatedBy:          1, // TODO: should Get from auth middleware
 		}
 
 		if err := s.StockLogsRepository.WithTx(tx).CreateOne(ctx, newLog, nil); err != nil {

internal/modules/inventory/product-stocks/controllers/product-stock.controller.go

@@ -1,77 +0,0 @@
-package controller
-
-import (
-	"math"
-	"strconv"
-
-	"gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-stocks/dto"
-	service "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-stocks/services"
-	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-stocks/validations"
-	"gitlab.com/mbugroup/lti-api.git/internal/response"
-
-	"github.com/gofiber/fiber/v2"
-	// entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-)
-
-type ProductStockController struct {
-	ProductStockService service.ProductStockService
-}
-
-func NewProductStockController(productStockService service.ProductStockService) *ProductStockController {
-	return &ProductStockController{
-		ProductStockService: productStockService,
-	}
-}
-
-func (u *ProductStockController) GetAll(c *fiber.Ctx) error {
-	query := &validation.Query{
-		Page:   c.QueryInt("page", 1),
-		Limit:  c.QueryInt("limit", 10),
-		Search: c.Query("search", ""),
-	}
-
-	if query.Page < 1 || query.Limit < 1 {
-		return fiber.NewError(fiber.StatusBadRequest, "page and limit must be greater than 0")
-	}
-
-	result, totalResults, err := u.ProductStockService.GetAll(c, query)
-	if err != nil {
-		return err
-	}
-
-	return c.Status(fiber.StatusOK).
-		JSON(response.SuccessWithPaginate[dto.ProductStockListDTO]{
-			Code:    fiber.StatusOK,
-			Status:  "success",
-			Message: "Get all productStocks successfully",
-			Meta: response.Meta{
-				Page:         query.Page,
-				Limit:        query.Limit,
-				TotalPages:   int64(math.Ceil(float64(totalResults) / float64(query.Limit))),
-				TotalResults: totalResults,
-			},
-			Data: dto.ToProductStockListDTOs(result),
-		})
-}
-
-func (u *ProductStockController) GetOne(c *fiber.Ctx) error {
-	param := c.Params("id")
-
-	id, err := strconv.Atoi(param)
-	if err != nil {
-		return fiber.NewError(fiber.StatusBadRequest, "Invalid Id")
-	}
-
-	res, err := u.ProductStockService.GetOne(c, uint(id))
-	if err != nil {
-		return err
-	}
-
-	return c.Status(fiber.StatusOK).
-		JSON(response.Success{
-			Code:    fiber.StatusOK,
-			Status:  "success",
-			Message: "Retrieved product successfully",
-			Data:    dto.ToProductStockDetailDTO(*res),
-		})
-}

internal/modules/inventory/product-stocks/dto/product-stock.dto.go

@@ -1,224 +0,0 @@
-package dto
-
-import (
-	"time"
-
-	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	locationDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/locations/dto"
-	productCategoryDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/product-categories/dto"
-	uomDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/uoms/dto"
-	userDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/users/dto"
-)
-
-// === DTO Structs ===
-
-type ProductStockRelationDTO struct {
-	Id   uint   `json:"id"`
-	Name string `json:"name"`
-}
-
-type ProductStockListDTO struct {
-	Id                uint                                           `json:"id"`
-	Name              string                                         `json:"name"`
-	Brand             string                                         `json:"brand"`
-	Sku               *string                                        `json:"sku,omitempty"`
-	ProductPrice      float64                                        `json:"product_price"`
-	SellingPrice      *float64                                       `json:"selling_price,omitempty"`
-	Tax               *float64                                       `json:"tax,omitempty"`
-	ExpiryPeriod      *int                                           `json:"expiry_period,omitempty"`
-	Flags             []string                                       `json:"flags"`
-	Uom               *uomDTO.UomRelationDTO                         `json:"uom,omitempty"`
-	ProductCategory   *productCategoryDTO.ProductCategoryRelationDTO `json:"product_category,omitempty"`
-	CreatedUser       *userDTO.UserRelationDTO                       `json:"created_user"`
-	CreatedAt         time.Time                                      `json:"created_at"`
-	UpdatedAt         time.Time                                      `json:"updated_at"`
-	Suppliers         []SupplierDTO                                  `json:"suppliers,omitempty"`
-	ProductWarehouses []ProductWarehouseDTO                          `json:"product_warehouses,omitempty"`
-	TotalStock        float64                                        `json:"total_stock"`
-}
-
-type ProductStockDetailDTO struct {
-	ProductStockListDTO
-}
-
-type SupplierDTO struct {
-	Id       uint   `json:"id"`
-	Name     string `json:"name"`
-	Alias    string `json:"alias"`
-	Category string `json:"category"`
-}
-
-type ProductWarehouseDTO struct {
-	Id            uint                             `json:"id"`
-	ProductId     uint                             `json:"product_id"`
-	WarehouseId   uint                             `json:"warehouse_id"`
-	WarehouseName string                           `json:"warehouse_name"`
-	Location      *locationDTO.LocationRelationDTO `json:"location"`
-	CurrentStock  float64                          `json:"current_stock"`
-	StockLogs     []StockLogDetailDTO              `json:"stock_logs"`
-}
-
-type StockLogDetailDTO struct {
-	Id                 uint                     `json:"id"`
-	Increase           float64                  `json:"increase"`
-	Decrease           float64                  `json:"decrease"`
-	LoggableType       string                   `json:"loggable_type"`
-	LoggableId         uint                     `json:"loggable_id"`
-	Notes              *string                  `json:"notes"`
-	ProductWarehouseId uint                     `json:"product_warehouse_id"`
-	CreatedBy          uint                     `json:"created_by"`
-	CreatedUser        *userDTO.UserRelationDTO `json:"created_user,omitempty"`
-	CreatedAt          time.Time                `json:"created_at"`
-}
-
-// === Mapper Functions ===
-func ToProductStockListDTO(e entity.Product) ProductStockListDTO {
-	var createdUser *userDTO.UserRelationDTO
-	if e.CreatedUser.Id != 0 {
-		mapped := userDTO.ToUserRelationDTO(e.CreatedUser)
-		createdUser = &mapped
-	}
-
-	var categoryRef *productCategoryDTO.ProductCategoryRelationDTO
-	if e.ProductCategory.Id != 0 {
-		mapped := productCategoryDTO.ToProductCategoryRelationDTO(e.ProductCategory)
-		categoryRef = &mapped
-	}
-
-	flags := make([]string, len(e.Flags))
-	for i, f := range e.Flags {
-		flags[i] = f.Name
-	}
-
-	var uomRef *uomDTO.UomRelationDTO
-	if e.Uom.Id != 0 {
-		mapped := uomDTO.ToUomRelationDTO(e.Uom)
-		uomRef = &mapped
-	}
-
-	return ProductStockListDTO{
-		Id:              e.Id,
-		Name:            e.Name,
-		Flags:           flags,
-		Uom:             uomRef,
-		Brand:           e.Brand,
-		Sku:             e.Sku,
-		ProductPrice:    e.ProductPrice,
-		SellingPrice:    e.SellingPrice,
-		Tax:             e.Tax,
-		ExpiryPeriod:    e.ExpiryPeriod,
-		CreatedAt:       e.CreatedAt,
-		UpdatedAt:       e.UpdatedAt,
-		CreatedUser:     createdUser,
-		ProductCategory: categoryRef,
-		Suppliers:       mapSupplierDTOs(e.ProductSuppliers),
-		TotalStock:      calculateTotalStock(e.ProductWarehouses),
-	}
-}
-
-func ToProductStockListDTOs(e []entity.Product) []ProductStockListDTO {
-	result := make([]ProductStockListDTO, len(e))
-	for i, r := range e {
-		result[i] = ToProductStockListDTO(r)
-	}
-	return result
-}
-
-func ToProductStockDetailDTO(e entity.Product) ProductStockDetailDTO {
-	base := ToProductStockListDTO(e)
-	base.ProductWarehouses = mapProductWarehouseDTOs(e.ProductWarehouses)
-
-	return ProductStockDetailDTO{
-		ProductStockListDTO: base,
-	}
-}
-
-// --- helpers ---
-
-func mapSupplierDTOs(src []entity.ProductSupplier) []SupplierDTO {
-	if len(src) == 0 {
-		return nil
-	}
-	result := make([]SupplierDTO, 0, len(src))
-	for _, ps := range src {
-		if ps.Supplier.Id == 0 {
-			continue
-		}
-		result = append(result, SupplierDTO{
-			Id:       ps.Supplier.Id,
-			Name:     ps.Supplier.Name,
-			Alias:    ps.Supplier.Alias,
-			Category: ps.Supplier.Category,
-		})
-	}
-	return result
-}
-
-func mapProductWarehouseDTOs(src []entity.ProductWarehouse) []ProductWarehouseDTO {
-	if len(src) == 0 {
-		return []ProductWarehouseDTO{}
-	}
-	result := make([]ProductWarehouseDTO, 0, len(src))
-	for _, pw := range src {
-		dto := ProductWarehouseDTO{
-			Id:           pw.Id,
-			ProductId:    pw.ProductId,
-			WarehouseId:  pw.WarehouseId,
-			CurrentStock: pw.Quantity,
-			StockLogs:    mapStockLogs(pw.StockLogs),
-		}
-		if pw.Warehouse.Id != 0 {
-			dto.WarehouseName = pw.Warehouse.Name
-			if pw.Warehouse.Location != nil {
-				mapped := locationDTO.ToLocationRelationDTO(*pw.Warehouse.Location)
-				dto.Location = &mapped
-			}
-		}
-		result = append(result, dto)
-	}
-	return result
-}
-
-func mapStockLogs(src []entity.StockLog) []StockLogDetailDTO {
-	if len(src) == 0 {
-		return []StockLogDetailDTO{}
-	}
-	result := make([]StockLogDetailDTO, 0, len(src))
-	for _, log := range src {
-		var notes *string
-		if log.Notes != "" {
-			n := log.Notes
-			notes = &n
-		}
-
-		result = append(result, StockLogDetailDTO{
-			Id:                 log.Id,
-			Increase:           log.Increase,
-			Decrease:           log.Decrease,
-			LoggableType:       log.LoggableType,
-			LoggableId:         log.LoggableId,
-			Notes:              notes,
-			ProductWarehouseId: log.ProductWarehouseId,
-			CreatedBy:          log.CreatedBy,
-			CreatedUser:        mapCreatedUser(log.CreatedUser),
-			CreatedAt:          log.CreatedAt,
-		})
-	}
-	return result
-}
-
-func mapCreatedUser(user *entity.User) *userDTO.UserRelationDTO {
-	if user == nil || user.Id == 0 {
-		return nil
-	}
-	mapped := userDTO.ToUserRelationDTO(*user)
-	return &mapped
-}
-
-func calculateTotalStock(productWarehouses []entity.ProductWarehouse) float64 {
-	var total float64
-	for _, pw := range productWarehouses {
-		total += pw.Quantity
-	}
-	return total
-}

internal/modules/inventory/product-stocks/module.go

@@ -1,25 +0,0 @@
-package productStocks
-
-import (
-	"github.com/go-playground/validator/v10"
-	"github.com/gofiber/fiber/v2"
-	"gorm.io/gorm"
-
-	sProductStock "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-stocks/services"
-
-	rProduct "gitlab.com/mbugroup/lti-api.git/internal/modules/master/products/repositories"
-	rUser "gitlab.com/mbugroup/lti-api.git/internal/modules/users/repositories"
-	sUser "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services"
-)
-
-type ProductStockModule struct{}
-
-func (ProductStockModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate *validator.Validate) {
-	productRepo := rProduct.NewProductRepository(db)
-	userRepo := rUser.NewUserRepository(db)
-
-	productStockService := sProductStock.NewProductStockService(productRepo, validate)
-	userService := sUser.NewUserService(userRepo, validate)
-
-	ProductStockRoutes(router, userService, productStockService)
-}

internal/modules/inventory/product-stocks/repositories/product-stock.repository.go

@@ -1,21 +0,0 @@
-package repository
-
-// import (
-// 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-// 	"gitlab.com/mbugroup/lti-api.git/internal/common/repository"
-// 	"gorm.io/gorm"
-// )
-
-// type ProductStockRepository interface {
-// 	repository.BaseRepository[entity.ProductStock]
-// }
-
-// type ProductStockRepositoryImpl struct {
-// 	*repository.BaseRepositoryImpl[entity.ProductStock]
-// }
-
-// func NewProductStockRepository(db *gorm.DB) ProductStockRepository {
-// 	return &ProductStockRepositoryImpl{
-// 		BaseRepositoryImpl: repository.NewBaseRepository[entity.ProductStock](db),
-// 	}
-// }

internal/modules/inventory/product-stocks/route.go

@@ -1,25 +0,0 @@
-package productStocks
-
-import (
-	// m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
-	controller "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-stocks/controllers"
-	productStock "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-stocks/services"
-	user "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services"
-
-	"github.com/gofiber/fiber/v2"
-)
-
-func ProductStockRoutes(v1 fiber.Router, u user.UserService, s productStock.ProductStockService) {
-	ctrl := controller.NewProductStockController(s)
-
-	route := v1.Group("/product-stocks")
-
-	// route.Get("/", m.Auth(u), ctrl.GetAll)
-	// route.Post("/", m.Auth(u), ctrl.CreateOne)
-	// route.Get("/:id", m.Auth(u), ctrl.GetOne)
-	// route.Patch("/:id", m.Auth(u), ctrl.UpdateOne)
-	// route.Delete("/:id", m.Auth(u), ctrl.DeleteOne)
-
-	route.Get("/", ctrl.GetAll)
-	route.Get("/:id", ctrl.GetOne)
-}

internal/modules/inventory/product-stocks/services/product-stock.service.go

@@ -1,91 +0,0 @@
-package service
-
-import (
-	"errors"
-
-	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-stocks/validations"
-	productRepository "gitlab.com/mbugroup/lti-api.git/internal/modules/master/products/repositories"
-	"gitlab.com/mbugroup/lti-api.git/internal/utils"
-
-	"github.com/go-playground/validator/v10"
-	"github.com/gofiber/fiber/v2"
-	"github.com/sirupsen/logrus"
-	"gorm.io/gorm"
-)
-
-type ProductStockService interface {
-	GetAll(ctx *fiber.Ctx, params *validation.Query) ([]entity.Product, int64, error)
-	GetOne(ctx *fiber.Ctx, id uint) (*entity.Product, error)
-}
-
-type productStockService struct {
-	Log               *logrus.Logger
-	Validate          *validator.Validate
-	ProductRepository productRepository.ProductRepository
-}
-
-func NewProductStockService(
-	productRepo productRepository.ProductRepository,
-	validate *validator.Validate,
-) ProductStockService {
-	return &productStockService{
-		Log:               utils.Log,
-		Validate:          validate,
-		ProductRepository: productRepo,
-	}
-}
-
-func (s productStockService) withRelations(db *gorm.DB) *gorm.DB {
-	return db.
-		Preload("CreatedUser").
-		Preload("Uom").
-		Preload("ProductCategory").
-		Preload("Flags").
-		Preload("ProductWarehouses").
-		Preload("ProductWarehouses.Warehouse").
-		Preload("ProductWarehouses.Warehouse.Location").
-		Preload("ProductWarehouses.Warehouse.Location.Area").
-		Preload("ProductWarehouses.StockLogs", func(db *gorm.DB) *gorm.DB {
-			return db.Order("created_at ASC")
-		}).
-		Preload("ProductWarehouses.StockLogs.CreatedUser").
-		Preload("ProductSuppliers").
-		Preload("ProductSuppliers.Supplier", func(db *gorm.DB) *gorm.DB {
-			return db.Order("suppliers.name ASC")
-		})
-}
-
-func (s productStockService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entity.Product, int64, error) {
-	if err := s.Validate.Struct(params); err != nil {
-		return nil, 0, err
-	}
-
-	offset := (params.Page - 1) * params.Limit
-
-	productStocks, total, err := s.ProductRepository.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
-		db = s.withRelations(db)
-		if params.Search != "" {
-			return db.Where("name ILIKE ?", "%"+params.Search+"%")
-		}
-		return db.Order("created_at DESC").Order("updated_at DESC")
-	})
-
-	if err != nil {
-		s.Log.Errorf("Failed to get productStocks: %+v", err)
-		return nil, 0, err
-	}
-	return productStocks, total, nil
-}
-
-func (s productStockService) GetOne(c *fiber.Ctx, id uint) (*entity.Product, error) {
-	product, err := s.ProductRepository.GetByID(c.Context(), id, s.withRelations)
-	if errors.Is(err, gorm.ErrRecordNotFound) {
-		return nil, fiber.NewError(fiber.StatusNotFound, "Product not found")
-	}
-	if err != nil {
-		s.Log.Errorf("Failed get product by id: %+v", err)
-		return nil, err
-	}
-	return product, nil
-}

internal/modules/inventory/product-stocks/validations/product-stock.validation.go

@@ -1,15 +0,0 @@
-package validation
-
-type Create struct {
-	Name   string `json:"name" validate:"required_strict,min=3"`
-}
-
-type Update struct {
-	Name   *string `json:"name,omitempty" validate:"omitempty"`
-}
-
-type Query struct {
-	Page   int    `query:"page" validate:"omitempty,number,min=1,gt=0"`
-	Limit  int    `query:"limit" validate:"omitempty,number,min=1,max=100,gt=0"`
-	Search string `query:"search" validate:"omitempty,max=50"`
-}

internal/modules/inventory/product-warehouses/dto/product_warehouse.dto.go

@@ -98,8 +98,8 @@ func ToProductWarehouseNestedDTO(e entity.ProductWarehouse) ProductWarehousNeste
 func ToProductWarehouseListDTO(e entity.ProductWarehouse) ProductWarehouseListDTO {
 	dto := ProductWarehouseListDTO{
 		ProductWarehouseRelationDTO: ToProductWarehouseRelationDTO(e),
-		// CreatedAt:                   e.CreatedAt,
-		// UpdatedAt:                   e.UpdatedAt,
+		CreatedAt:                   e.CreatedAt,
+		UpdatedAt:                   e.UpdatedAt,
 	}
 
 	// Map Product relation jika ada
@@ -140,13 +140,13 @@ func ToProductWarehouseListDTO(e entity.ProductWarehouse) ProductWarehouseListDT
 	}
 
 	// Map CreatedUser relation jika ada
-	// if e.CreatedUser.Id != 0 {
-	// 	user := UserRelationDTO{
-	// 		Id:       e.CreatedUser.Id,
-	// 		Username: e.CreatedUser.Name,
-	// 	}
-	// 	dto.CreatedUser = &user
-	// }
+	if e.CreatedUser.Id != 0 {
+		user := UserRelationDTO{
+			Id:       e.CreatedUser.Id,
+			Username: e.CreatedUser.Name,
+		}
+		dto.CreatedUser = &user
+	}
 
 	return dto
 }

internal/modules/inventory/product-warehouses/repositories/product_warehouse.repository.go

@@ -27,7 +27,7 @@ type ProductWarehouseRepository interface {
 	GetDetailByID(ctx context.Context, id uint) (*entity.ProductWarehouse, error)
 	IdExists(ctx context.Context, id uint) (bool, error)
 	CleanupEmpty(ctx context.Context, affected map[uint]struct{}) error
-	EnsureProductWarehouse(ctx context.Context, productID, warehouseID uint, createdBy uint) (uint, error)
+	EnsureProductWarehouse(ctx context.Context, productID, warehouseID uint, createdBy uint64) (uint, error)
 }
 
 type ProductWarehouseRepositoryImpl struct {
@@ -151,7 +151,7 @@ func (r *ProductWarehouseRepositoryImpl) AdjustQuantities(ctx context.Context, d
 		}
 		if err := base.Model(&entity.ProductWarehouse{}).
 			Where("id = ?", id).
-			Update("qty", gorm.Expr("COALESCE(qty,0) + ?", delta)).Error; err != nil {
+			Update("quantity", gorm.Expr("COALESCE(quantity,0) + ?", delta)).Error; err != nil {
 			return err
 		}
 	}
@@ -171,7 +171,7 @@ func (r *ProductWarehouseRepositoryImpl) CleanupEmpty(ctx context.Context, affec
 	var emptyIDs []uint
 	if err := r.DB().WithContext(ctx).
 		Model(&entity.ProductWarehouse{}).
-		Where("id IN ? AND COALESCE(qty,0) <= 0", ids).
+		Where("id IN ? AND COALESCE(quantity,0) <= 0", ids).
 		Pluck("id", &emptyIDs).Error; err != nil {
 		return err
 	}
@@ -199,7 +199,7 @@ func (r *ProductWarehouseRepositoryImpl) EnsureProductWarehouse(
 	ctx context.Context,
 	productID uint,
 	warehouseID uint,
-	createdBy uint,
+	createdBy uint64,
 ) (uint, error) {
 	record, err := r.GetProductWarehouseByProductAndWarehouseID(ctx, productID, warehouseID)
 	if err == nil {
@@ -213,11 +213,11 @@ func (r *ProductWarehouseRepositoryImpl) EnsureProductWarehouse(
 		ProductId:   productID,
 		WarehouseId: warehouseID,
 		Quantity:    0,
-		// CreatedBy:   uint(createdBy),
+		CreatedBy:   uint(createdBy),
+	}
+	if entity.CreatedBy == 0 {
+		entity.CreatedBy = 1
 	}
-	// if entity.CreatedBy == 0 {
-	// 	entity.CreatedBy = 1
-	// }
 
 	if err := r.CreateOne(ctx, entity, nil); err != nil {
 		return 0, err
@@ -257,7 +257,7 @@ func (r *ProductWarehouseRepositoryImpl) GetByFlagAndWarehouseID(ctx context.Con
 		Joins("JOIN products ON products.id = product_warehouses.product_id").
 		Joins("JOIN flags ON flags.flagable_id = products.id AND flags.flagable_type = 'products'").
 		Where("flags.name = ? AND product_warehouses.warehouse_id = ?", flagName, warehouseId).
-		Order("product_warehouses.id DESC").
+		Order("product_warehouses.created_at DESC").
 		Preload("Product").Preload("Warehouse").
 		Find(&productWarehouses).Error
 	if err != nil {

internal/modules/inventory/route.go

@@ -8,7 +8,6 @@ import (
 	"gorm.io/gorm"
 
 	adjustments "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/adjustments"
-	productStocks "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-stocks"
 	productWarehouses "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses"
 	transfers "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/transfers"
 	// MODULE IMPORTS
@@ -22,7 +21,6 @@ func RegisterRoutes(router fiber.Router, db *gorm.DB, validate *validator.Valida
 
 		adjustments.AdjustmentModule{},
 		transfers.TransferModule{},
-		productStocks.ProductStockModule{},
 		// MODULE REGISTRY
 	}
 

internal/modules/inventory/transfers/services/transfer.service.go

@@ -3,15 +3,15 @@ package service
 import (
 	"errors"
 	"fmt"
+	"strings"
+
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	rProductWarehouse "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/repositories"
 	rStockTransfer "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/transfers/repositories"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/transfers/validations"
 	rSupplier "gitlab.com/mbugroup/lti-api.git/internal/modules/master/suppliers/repositories"
 	rStockLogs "gitlab.com/mbugroup/lti-api.git/internal/modules/shared/repositories"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils"
-	"strings"
 
 	"github.com/go-playground/validator/v10"
 	"github.com/gofiber/fiber/v2"
@@ -127,10 +127,6 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 			return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Stok produk %d di gudang asal tidak cukup", product.ProductID))
 		}
 	}
-	actorID, err := m.ActorIDFromContext(c)
-	if err != nil {
-		return nil, err
-	}
 
 	// validasi total qty harus lebih besar dari atau sama dengan total qty di delivery compare berdasarkan productid
 	deliveryQtyMap := make(map[uint]float64)
@@ -178,7 +174,7 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 		Reason:          req.TransferReason,
 		TransferDate:    transferDate,
 		MovementNumber:  movementNumber,
-		CreatedBy:       uint64(actorID),
+		CreatedBy:       1, //todo: get from token
 	}
 
 	// Save the transfer entity to the database
@@ -271,20 +267,17 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 			s.Log.Infof("Source product warehouse updated: %+v", sourcePW.Id)
 
 			// create stock log for decrease (source)
-			// beforeQty := sourcePW.Quantity + product.ProductQty // sourcePW already decreased
+			beforeQty := sourcePW.Quantity + product.ProductQty // sourcePW already decreased
 			decreaseLog := &entity.StockLog{
-				// TransactionType:    entity.TransactionTypeDecrease,
-				// Quantity:           product.ProductQty,
-				// BeforeQuantity:     beforeQty,
-				// AfterQuantity:      sourcePW.Qty,
-				// LogType:            entity.LogTypeTransfer,
-				// LogId:              uint(entityTransfer.Id),
-				Decrease:           product.ProductQty,
-				Notes:              "",
-				LoggableType:       entity.LogTypeTransfer,
-				LoggableId:         uint(entityTransfer.Id),
+				TransactionType:    entity.TransactionTypeDecrease,
+				Quantity:           product.ProductQty,
+				BeforeQuantity:     beforeQty,
+				AfterQuantity:      sourcePW.Quantity,
+				LogType:            entity.LogTypeTransfer,
+				LogId:              uint(entityTransfer.Id),
+				Note:               "",
 				ProductWarehouseId: sourcePW.Id,
-				CreatedBy:          actorID,
+				CreatedBy:          1,
 			}
 			if err := s.StockLogsRepository.WithTx(tx).CreateOne(c.Context(), decreaseLog, nil); err != nil {
 				s.Log.Errorf("Failed to create stock log decrease: %+v", err)
@@ -305,7 +298,7 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 					ProductId:   uint(product.ProductID),
 					WarehouseId: uint(req.DestinationWarehouseID),
 					Quantity:    0,
-					// CreatedBy:   1, // TODO: should Get from auth middleware
+					CreatedBy:   1, // TODO: should Get from auth middleware
 				}
 				if err := s.ProductWarehouseRepo.WithTx(tx).CreateOne(c.Context(), destPW, nil); err != nil {
 					s.Log.Errorf("Failed to create destination product warehouse: %+v", err)
@@ -322,18 +315,17 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 			s.Log.Infof("Destination product warehouse updated: %+v", destPW.Id)
 
 			// create stock log for increase (destination)
-			// beforeDestQty := destPW.Quantity - product.ProductQty
+			beforeDestQty := destPW.Quantity - product.ProductQty
 			increaseLog := &entity.StockLog{
-				// TransactionType:    entity.TransactionTypeIncrease,
-				// Quantity:           product.ProductQty,
-				// BeforeQuantity:     beforeDestQty,
-				// AfterQuantity:      destPW.Qty,
-				Increase:           product.ProductQty,
-				LoggableType:       entity.LogTypeTransfer,
-				LoggableId:         uint(entityTransfer.Id),
-				Notes:              "",
+				TransactionType:    entity.TransactionTypeIncrease,
+				Quantity:           product.ProductQty,
+				BeforeQuantity:     beforeDestQty,
+				AfterQuantity:      destPW.Quantity,
+				LogType:            entity.LogTypeTransfer,
+				LogId:              uint(entityTransfer.Id),
+				Note:               "",
 				ProductWarehouseId: destPW.Id,
-				CreatedBy:          actorID,
+				CreatedBy:          1,
 			}
 			if err := s.StockLogsRepository.WithTx(tx).CreateOne(c.Context(), increaseLog, nil); err != nil {
 				s.Log.Errorf("Failed to create stock log increase: %+v", err)

internal/modules/marketing/delivery-orderss/services/delivery-orders.service.go

@@ -8,7 +8,6 @@ import (
 
 	commonRepo "gitlab.com/mbugroup/lti-api.git/internal/common/repository"
 	commonSvc "gitlab.com/mbugroup/lti-api.git/internal/common/service"
-	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
 	marketingDeliveryProductRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/marketing-delivery-products/repositories"
 	productWarehouseRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/repositories"
@@ -176,11 +175,6 @@ func (s *deliveryOrdersService) CreateOne(c *fiber.Ctx, req *validation.Create)
 		return nil, err
 	}
 
-	actorID, err := m.ActorIDFromContext(c)
-	if err != nil {
-		return nil, err
-	}
-
 	approvalSvc := commonSvc.NewApprovalService(commonRepo.NewApprovalRepository(s.MarketingRepo.DB()))
 
 	latestApproval, err := approvalSvc.LatestByTarget(c.Context(), utils.ApprovalWorkflowMarketing, req.MarketingId, nil)
@@ -196,6 +190,9 @@ func (s *deliveryOrdersService) CreateOne(c *fiber.Ctx, req *validation.Create)
 	if latestApproval.StepNumber >= uint16(utils.MarketingDeliveryOrder) {
 		return nil, fiber.NewError(fiber.StatusBadRequest, "Delivery order already exists for this marketing")
 	}
+	if latestApproval.Action == nil || *latestApproval.Action != entity.ApprovalActionApproved {
+		return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Marketing is not approved - current status: %v", *latestApproval.Action))
+	}
 
 	err = s.MarketingRepo.DB().WithContext(c.Context()).Transaction(func(dbTransaction *gorm.DB) error {
 
@@ -259,7 +256,7 @@ func (s *deliveryOrdersService) CreateOne(c *fiber.Ctx, req *validation.Create)
 
 		}
 
-		
+		actorID := uint(1) // TODO: ambil dari auth context
 		approvalAction := entity.ApprovalActionApproved
 		if _, err := approvalSvcTx.CreateApproval(
 			c.Context(),

internal/modules/marketing/sales-orders/repositories/marketings.repository.go

@@ -2,22 +2,16 @@ package repository
 
 import (
 	"context"
-	"fmt"
-	"strconv"
-	"strings"
 
 	"gitlab.com/mbugroup/lti-api.git/internal/common/repository"
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	"gitlab.com/mbugroup/lti-api.git/internal/utils"
 	"gorm.io/gorm"
-	"gorm.io/gorm/clause"
 )
 
 type MarketingRepository interface {
 	repository.BaseRepository[entity.Marketing]
 	IdExists(ctx context.Context, id uint) (bool, error)
 	GetNextSequence(ctx context.Context) (uint, error)
-	NextSoNumber(ctx context.Context, tx *gorm.DB) (string, error)
 }
 
 type MarketingRepositoryImpl struct {
@@ -41,82 +35,3 @@ func (r *MarketingRepositoryImpl) GetNextSequence(ctx context.Context) (uint, er
 	}
 	return maxID + 1, nil
 }
-
-func (r *MarketingRepositoryImpl) NextSoNumber(ctx context.Context, tx *gorm.DB) (string, error) {
-	return r.generateSequentialNumber(ctx, tx, "so_number", utils.MarketingSoNumberPrefix, utils.MarketingNumberPadding)
-}
-
-func parseNumericSuffix(value, prefix string) (int, bool) {
-	if !strings.HasPrefix(value, prefix) {
-		return 0, false
-	}
-	suffix := strings.TrimPrefix(value, prefix)
-	if suffix == "" {
-		return 0, false
-	}
-	trimmed := strings.TrimLeft(suffix, "0")
-	if trimmed == "" {
-		trimmed = "0"
-	}
-	number, err := strconv.Atoi(trimmed)
-	if err != nil {
-		return 0, false
-	}
-	return number, true
-}
-
-func (r *MarketingRepositoryImpl) numberExists(ctx context.Context, db *gorm.DB, column, value string) (bool, error) {
-	var count int64
-	if err := db.WithContext(ctx).
-		Model(&entity.Marketing{}).
-		Where(fmt.Sprintf("%s = ?", column), value).
-		Count(&count).Error; err != nil {
-		return false, err
-	}
-	return count > 0, nil
-}
-
-func (r *MarketingRepositoryImpl) generateSequentialNumber(ctx context.Context, tx *gorm.DB, column, prefix string, padding int) (string, error) {
-
-	db := tx
-	if db == nil {
-		db = r.DB()
-	}
-
-	var values []string
-	err := db.WithContext(ctx).
-		Model(&entity.Marketing{}).
-		Where(fmt.Sprintf("%s LIKE ?", column), prefix+"%").
-		Select(column).
-		Order(fmt.Sprintf("%s DESC", column)).
-		Limit(20).
-		Clauses(clause.Locking{Strength: "UPDATE"}).
-		Pluck(column, &values).Error
-	if err != nil {
-		return "", err
-	}
-
-	next := 1
-	for _, value := range values {
-		if number, ok := parseNumericSuffix(value, prefix); ok {
-			next = number + 1
-			break
-		}
-	}
-
-	const maxAttempts = 20
-	for attempt := 0; attempt < maxAttempts; attempt++ {
-		candidate := fmt.Sprintf("%s%0*d", prefix, padding, next)
-		exists, err := r.numberExists(ctx, db, column, candidate)
-		if err != nil {
-			return "", err
-		}
-		if !exists {
-			return candidate, nil
-		}
-		next++
-	}
-
-	return "", fmt.Errorf("unable to generate unique %s", column)
-
-}

internal/modules/marketing/sales-orders/services/sales-orders.service.go

@@ -9,7 +9,6 @@ import (
 	commonRepo "gitlab.com/mbugroup/lti-api.git/internal/common/repository"
 	commonSvc "gitlab.com/mbugroup/lti-api.git/internal/common/service"
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	rInvMarketingDeliveryProduct "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/marketing-delivery-products/repositories"
 	productWarehouseRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/repositories"
 	repository "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/sales-orders/repositories"
@@ -91,11 +90,6 @@ func (s *salesOrdersService) CreateOne(c *fiber.Ctx, req *validation.Create) (*e
 		return nil, err
 	}
 
-	actorID, err := m.ActorIDFromContext(c)
-	if err != nil {
-		return nil, err
-	}
-
 	if err := commonSvc.EnsureRelations(c.Context(),
 		commonSvc.RelationCheck{Name: "Customer", ID: &req.CustomerId, Exists: s.CustomerRepo.IdExists},
 	); err != nil {
@@ -115,10 +109,11 @@ func (s *salesOrdersService) CreateOne(c *fiber.Ctx, req *validation.Create) (*e
 		return nil, fiber.NewError(fiber.StatusBadRequest, "Invalid date format")
 	}
 
-	soNumber, err := s.MarketingRepo.NextSoNumber(context.Background(), nil)
+	nextSeq, err := s.MarketingRepo.GetNextSequence(c.Context())
 	if err != nil {
 		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to generate SO number")
 	}
+	soNumber := fmt.Sprintf("SO-%05d", nextSeq)
 
 	var marketing *entity.Marketing
 	err = s.MarketingRepo.DB().WithContext(c.Context()).Transaction(func(dbTransaction *gorm.DB) error {
@@ -134,7 +129,7 @@ func (s *salesOrdersService) CreateOne(c *fiber.Ctx, req *validation.Create) (*e
 			SoDate:        soDate,
 			SalesPersonId: req.SalesPersonId,
 			Notes:         req.Notes,
-			CreatedBy:     actorID,
+			CreatedBy:     1,
 		}
 		if err := marketingRepoTx.CreateOne(c.Context(), marketing, nil); err != nil {
 			return fiber.NewError(fiber.StatusInternalServerError, "Failed to create salesOrders")
@@ -148,6 +143,7 @@ func (s *salesOrdersService) CreateOne(c *fiber.Ctx, req *validation.Create) (*e
 			}
 		}
 
+		actorID := uint(1) // TODO: ambil dari auth context
 		approvalAction := entity.ApprovalActionCreated
 		if _, err := approvalSvcTx.CreateApproval(
 			c.Context(),
@@ -184,11 +180,6 @@ func (s salesOrdersService) UpdateOne(c *fiber.Ctx, req *validation.Update, id u
 		return nil, err
 	}
 
-	actorID, err := m.ActorIDFromContext(c)
-	if err != nil {
-		return nil, err
-	}
-
 	if err := commonSvc.EnsureRelations(c.Context(),
 		commonSvc.RelationCheck{Name: "Marketing", ID: &id, Exists: s.MarketingRepo.IdExists},
 		commonSvc.RelationCheck{Name: "Customer", ID: &req.CustomerId, Exists: s.CustomerRepo.IdExists},
@@ -330,6 +321,7 @@ func (s salesOrdersService) UpdateOne(c *fiber.Ctx, req *validation.Update, id u
 			}
 		}
 		if latestApproval != nil {
+			actorID := uint(1) // todo: ambil dari auth context
 			action := entity.ApprovalActionUpdated
 			_, err := approvalSvcTx.CreateApproval(
 				c.Context(),
@@ -413,11 +405,6 @@ func (s salesOrdersService) Approval(c *fiber.Ctx, req *validation.Approve) ([]e
 		return nil, err
 	}
 
-	actorID, err := m.ActorIDFromContext(c)
-	if err != nil {
-		return nil, err
-	}
-
 	approvalSvc := commonSvc.NewApprovalService(commonRepo.NewApprovalRepository(s.MarketingRepo.DB()))
 
 	var action entity.ApprovalAction
@@ -461,7 +448,7 @@ func (s salesOrdersService) Approval(c *fiber.Ctx, req *validation.Approve) ([]e
 		}
 	}
 
-	err = s.MarketingRepo.DB().WithContext(c.Context()).Transaction(func(dbTransaction *gorm.DB) error {
+	err := s.MarketingRepo.DB().WithContext(c.Context()).Transaction(func(dbTransaction *gorm.DB) error {
 
 		approvalSvc := commonSvc.NewApprovalService(commonRepo.NewApprovalRepository(dbTransaction))
 
@@ -492,6 +479,7 @@ func (s salesOrdersService) Approval(c *fiber.Ctx, req *validation.Approve) ([]e
 				nextStep = approvalutils.ApprovalStep(currentStep)
 			}
 
+			actorID := uint(1) // todo ambil dari auth context
 			if _, err := approvalSvc.CreateApproval(
 				c.Context(),
 				utils.ApprovalWorkflowMarketing,

internal/modules/master/areas/services/area.service.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	repository "gitlab.com/mbugroup/lti-api.git/internal/modules/master/areas/repositories"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/master/areas/validations"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils"
@@ -88,14 +87,10 @@ func (s *areaService) CreateOne(c *fiber.Ctx, req *validation.Create) (*entity.A
 		return nil, fiber.NewError(fiber.StatusConflict, fmt.Sprintf("Area with name %s already exists", req.Name))
 	}
 
-	actorID, err := m.ActorIDFromContext(c)
-	if err != nil {
-		return nil, err
-	}
-
+	//TODO: created by dummy
 	createBody := &entity.Area{
 		Name:      req.Name,
-		CreatedBy: actorID,
+		CreatedBy: 1,
 	}
 
 	if err := s.Repository.CreateOne(c.Context(), createBody, nil); err != nil {

internal/modules/master/areas/validations/area.validation.go

@@ -1,11 +1,11 @@
 package validation
 
 type Create struct {
-	Name string `json:"name" validate:"required_strict,min=3,max=50"`
+	Name string `json:"name" validate:"required_strict,min=3"`
 }
 
 type Update struct {
-	Name *string `json:"name,omitempty" validate:"omitempty,max=50"`
+	Name *string `json:"name,omitempty" validate:"omitempty"`
 }
 
 type Query struct {

internal/modules/master/banks/validations/bank.validation.go

@@ -1,16 +1,16 @@
 package validation
 
 type Create struct {
-	Name          string  `json:"name" validate:"required_strict,min=3,max=50"`
-	Alias         string  `json:"alias" validate:"required_strict,max=5"`
-	Owner         *string `json:"owner,omitempty" validate:"omitempty,max=50"`
+	Name          string  `json:"name" validate:"required_strict,min=3"`
+	Alias         string  `json:"alias" validate:"required_strict"`
+	Owner         *string `json:"owner,omitempty" validate:"omitempty"`
 	AccountNumber string  `json:"account_number" validate:"required_strict,max=50"`
 }
 
 type Update struct {
-	Name          *string `json:"name,omitempty" validate:"omitempty,max=50"`
-	Alias         *string `json:"alias,omitempty" validate:"omitempty,max=5"`
-	Owner         *string `json:"owner,omitempty" validate:"omitempty,max=50"`
+	Name          *string `json:"name,omitempty" validate:"omitempty"`
+	Alias         *string `json:"alias,omitempty" validate:"omitempty"`
+	Owner         *string `json:"owner,omitempty" validate:"omitempty"`
 	AccountNumber *string `json:"account_number,omitempty" validate:"omitempty,max=50"`
 }
 

internal/modules/master/customers/services/customer.service.go

@@ -3,13 +3,13 @@ package service
 import (
 	"errors"
 	"fmt"
+	"strings"
+
 	common "gitlab.com/mbugroup/lti-api.git/internal/common/service"
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	repository "gitlab.com/mbugroup/lti-api.git/internal/modules/master/customers/repositories"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/master/customers/validations"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils"
-	"strings"
 
 	"github.com/go-playground/validator/v10"
 	"github.com/gofiber/fiber/v2"
@@ -81,10 +81,6 @@ func (s *customerService) CreateOne(c *fiber.Ctx, req *validation.Create) (*enti
 	if err := s.Validate.Struct(req); err != nil {
 		return nil, err
 	}
-	actorID, err := m.ActorIDFromContext(c)
-	if err != nil {
-		return nil, err
-	}
 
 	if exists, err := s.Repository.NameExists(c.Context(), req.Name, nil); err != nil {
 		s.Log.Errorf("Failed to check customer name: %+v", err)
@@ -104,6 +100,7 @@ func (s *customerService) CreateOne(c *fiber.Ctx, req *validation.Create) (*enti
 		return nil, err
 	}
 
+	//TODO: created by dummy
 	createBody := &entity.Customer{
 		Name:          req.Name,
 		PicId:         req.PicId,
@@ -112,7 +109,7 @@ func (s *customerService) CreateOne(c *fiber.Ctx, req *validation.Create) (*enti
 		Phone:         req.Phone,
 		Email:         req.Email,
 		AccountNumber: req.AccountNumber,
-		CreatedBy:     actorID,
+		CreatedBy:     1,
 	}
 
 	if err := s.Repository.CreateOne(c.Context(), createBody, nil); err != nil {

internal/modules/master/customers/validations/customer.validation.go

@@ -1,23 +1,23 @@
 package validation
 
 type Create struct {
-	Name          string `json:"name" validate:"required_strict,min=3,max=50"`
+	Name          string `json:"name" validate:"required_strict,min=3"`
 	PicId         uint   `json:"pic_id" validate:"required_strict,number,gt=0"`
-	Type          string `json:"type" validate:"required_strict,max=50"`
+	Type          string `json:"type" validate:"required_strict"`
 	Address       string `json:"address" validate:"required_strict"`
 	Phone         string `json:"phone" validate:"required_strict,max=20"`
-	Email         string `json:"email" validate:"required_strict,email,max=50"`
-	AccountNumber string `json:"account_number" validate:"required_strict,max=50"`
+	Email         string `json:"email" validate:"required_strict,email"`
+	AccountNumber string `json:"account_number" validate:"required_strict"`
 }
 
 type Update struct {
-	Name          *string `json:"name,omitempty" validate:"omitempty,max=50"`
+	Name          *string `json:"name,omitempty" validate:"omitempty"`
 	PicId         *uint   `json:"pic_id,omitempty" validate:"omitempty,number,gt=0"`
-	Type          *string `json:"type,omitempty" validate:"omitempty,max=50"`
+	Type          *string `json:"type,omitempty" validate:"omitempty"`
 	Address       *string `json:"address,omitempty" validate:"omitempty"`
-	Phone         *string `json:"phone,omitempty" validate:"omitempty,max=20"`
-	Email         *string `json:"email,omitempty" validate:"omitempty,max=50"`
-	AccountNumber *string `json:"account_number,omitempty" validate:"omitempty,max=50"`
+	Phone         *string `json:"phone,omitempty" validate:"omitempty"`
+	Email         *string `json:"email,omitempty" validate:"omitempty"`
+	AccountNumber *string `json:"account_number,omitempty" validate:"omitempty"`
 }
 
 type Query struct {

internal/modules/master/kandangs/route.go

@@ -1,7 +1,7 @@
 package kandangs
 
 import (
-	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
+	// m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	controller "gitlab.com/mbugroup/lti-api.git/internal/modules/master/kandangs/controllers"
 	kandang "gitlab.com/mbugroup/lti-api.git/internal/modules/master/kandangs/services"
 	user "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services"
@@ -13,7 +13,7 @@ func KandangRoutes(v1 fiber.Router, u user.UserService, s kandang.KandangService
 	ctrl := controller.NewKandangController(s)
 
 	route := v1.Group("/kandangs")
-	route.Use(m.Auth(u))
+	// route.Use(m.Auth(u))
 
 	route.Get("/", ctrl.GetAll)
 	route.Post("/", ctrl.CreateOne)

internal/modules/master/kandangs/services/kandang.service.go

@@ -3,13 +3,13 @@ package service
 import (
 	"errors"
 	"fmt"
+	"strings"
+
 	common "gitlab.com/mbugroup/lti-api.git/internal/common/service"
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	repository "gitlab.com/mbugroup/lti-api.git/internal/modules/master/kandangs/repositories"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/master/kandangs/validations"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils"
-	"strings"
 
 	"github.com/go-playground/validator/v10"
 	"github.com/gofiber/fiber/v2"
@@ -130,18 +130,14 @@ func (s *kandangService) CreateOne(c *fiber.Ctx, req *validation.Create) (*entit
 
 	}
 
-	actorID, err := m.ActorIDFromContext(c)
-	if err != nil {
-		return nil, err
-	}
-
+	//TODO: created by dummy
 	createBody := &entity.Kandang{
 		Name:       req.Name,
 		LocationId: req.LocationId,
 		Capacity:   req.Capacity,
 		Status:     status,
 		PicId:      req.PicId,
-		CreatedBy:  actorID,
+		CreatedBy:  1,
 	}
 
 	if err := s.Repository.CreateOne(c.Context(), createBody, nil); err != nil {

internal/modules/master/kandangs/validations/kandang.validation.go

@@ -1,8 +1,8 @@
 package validation
 
 type Create struct {
-	Name           string  `json:"name" validate:"required_strict,min=3,max=50"`
-	Status         string  `json:"status,omitempty" validate:"omitempty,min=3,max=50"`
+	Name           string  `json:"name" validate:"required_strict,min=3"`
+	Status         string  `json:"status,omitempty" validate:"omitempty,min=3"`
 	Capacity       float64 `json:"capacity" validate:"required_strict,gt=0"`
 	LocationId     uint    `json:"location_id" validate:"required_strict,number,gt=0"`
 	PicId          uint    `json:"pic_id" validate:"required_strict,number,gt=0"`
@@ -10,8 +10,8 @@ type Create struct {
 }
 
 type Update struct {
-	Name           *string  `json:"name,omitempty" validate:"omitempty,max=50"`
-	Status         *string  `json:"status,omitempty" validate:"omitempty,min=3,max=50"`
+	Name           *string  `json:"name,omitempty" validate:"omitempty"`
+	Status         *string  `json:"status,omitempty" validate:"omitempty,min=3"`
 	Capacity       *float64 `json:"capacity" validate:"omitempty,gt=0"`
 	LocationId     *uint    `json:"location_id,omitempty" validate:"omitempty,number,gt=0"`
 	PicId          *uint    `json:"pic_id,omitempty" validate:"omitempty,number,gt=0"`

internal/modules/master/locations/services/location.service.go

@@ -4,15 +4,15 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/go-playground/validator/v10"
-	"github.com/gofiber/fiber/v2"
-	"github.com/sirupsen/logrus"
 	common "gitlab.com/mbugroup/lti-api.git/internal/common/service"
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	repository "gitlab.com/mbugroup/lti-api.git/internal/modules/master/locations/repositories"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/master/locations/validations"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils"
+
+	"github.com/go-playground/validator/v10"
+	"github.com/gofiber/fiber/v2"
+	"github.com/sirupsen/logrus"
 	"gorm.io/gorm"
 )
 
@@ -97,16 +97,12 @@ func (s *locationService) CreateOne(c *fiber.Ctx, req *validation.Create) (*enti
 		return nil, err
 	}
 
-	actorID, err := m.ActorIDFromContext(c)
-	if err != nil {
-		return nil, err
-	}
-
+	//TODO: created by dummy
 	createBody := &entity.Location{
 		Name:      req.Name,
 		Address:   req.Address,
 		AreaId:    req.AreaId,
-		CreatedBy: actorID,
+		CreatedBy: 1,
 	}
 
 	if err := s.Repository.CreateOne(c.Context(), createBody, nil); err != nil {

internal/modules/master/locations/validations/location.validation.go

@@ -1,13 +1,13 @@
 package validation
 
 type Create struct {
-	Name    string `json:"name" validate:"required_strict,min=3,max=50"`
+	Name    string `json:"name" validate:"required_strict,min=3"`
 	Address string `json:"address" validate:"required_strict"`
 	AreaId  uint   `json:"area_id" validate:"required_strict,number,gt=0"`
 }
 
 type Update struct {
-	Name    *string `json:"name,omitempty" validate:"omitempty,max=50"`
+	Name    *string `json:"name,omitempty" validate:"omitempty"`
 	Address *string `json:"address,omitempty" validate:"omitempty"`
 	AreaId  *uint   `json:"area_id,omitempty" validate:"omitempty,number,gt=0"`
 }

internal/modules/master/nonstocks/validations/nonstock.validation.go

@@ -1,14 +1,14 @@
 package validation
 
 type Create struct {
-	Name        string   `json:"name" validate:"required_strict,min=3,max=50"`
+	Name        string   `json:"name" validate:"required_strict,min=3"`
 	UomID       uint     `json:"uom_id" validate:"required,gt=0"`
 	SupplierIDs []uint   `json:"supplier_ids,omitempty" validate:"omitempty,dive,gt=0"`
 	Flags       []string `json:"flags,omitempty" validate:"omitempty,dive,max=50"`
 }
 
 type Update struct {
-	Name        *string   `json:"name,omitempty" validate:"omitempty,min=3,max=50"`
+	Name        *string   `json:"name,omitempty" validate:"omitempty,min=3"`
 	UomID       *uint     `json:"uom_id,omitempty" validate:"omitempty,gt=0"`
 	SupplierIDs *[]uint   `json:"supplier_ids,omitempty" validate:"omitempty,dive,gt=0"`
 	Flags       *[]string `json:"flags,omitempty" validate:"omitempty,dive,max=50"`

internal/modules/master/product-categories/validations/product-category.validation.go

@@ -1,12 +1,12 @@
 package validation
 
 type Create struct {
-	Name string `json:"name" validate:"required_strict,min=3,max=50"`
+	Name string `json:"name" validate:"required_strict,min=3"`
 	Code string `json:"code" validate:"required_strict,max=10"`
 }
 
 type Update struct {
-	Name *string `json:"name,omitempty" validate:"omitempty,max=50"`
+	Name *string `json:"name,omitempty" validate:"omitempty"`
 	Code *string `json:"code,omitempty" validate:"omitempty,max=10"`
 }
 

internal/modules/master/products/dto/product.dto.go

@@ -12,13 +12,12 @@ import (
 // === DTO Structs ===
 
 type ProductRelationDTO struct {
-	Id              uint                                           `json:"id"`
-	Name            string                                         `json:"name"`
-	ProductPrice    float64                                        `gorm:"type:numeric(15,3);not null"`
-	SellingPrice    *float64                                       `gorm:"type:numeric(15,3)"`
-	Uom             *uomDTO.UomRelationDTO                         `json:"uom,omitempty"`
-	Flags           *[]string                                      `json:"flags,omitempty"`
-	ProductCategory *productCategoryDTO.ProductCategoryRelationDTO `json:"product_category,omitempty"`
+	Id           uint                   `json:"id"`
+	Name         string                 `json:"name"`
+	ProductPrice float64                `gorm:"type:numeric(15,3);not null"`
+	SellingPrice *float64               `gorm:"type:numeric(15,3)"`
+	Uom          *uomDTO.UomRelationDTO `json:"uom,omitempty"`
+	Flags        *[]string              `json:"flags,omitempty"`
 }
 
 type ProductListDTO struct {
@@ -56,20 +55,13 @@ func ToProductRelationDTO(e entity.Product) ProductRelationDTO {
 		uomRef = &mapped
 	}
 
-	var categoryRef *productCategoryDTO.ProductCategoryRelationDTO
-	if e.ProductCategory.Id != 0 {
-		mapped := productCategoryDTO.ToProductCategoryRelationDTO(e.ProductCategory)
-		categoryRef = &mapped
-	}
-
 	return ProductRelationDTO{
-		Id:              e.Id,
-		Name:            e.Name,
-		ProductPrice:    e.ProductPrice,
-		SellingPrice:    e.SellingPrice,
-		Flags:           &flags,
-		Uom:             uomRef,
-		ProductCategory: categoryRef,
+		Id:           e.Id,
+		Name:         e.Name,
+		ProductPrice: e.ProductPrice,
+		SellingPrice: e.SellingPrice,
+		Flags:        &flags,
+		Uom:          uomRef,
 	}
 }
 

internal/modules/master/products/validations/product.validation.go

@@ -1,9 +1,9 @@
 package validation
 
 type Create struct {
-	Name              string   `json:"name" validate:"required_strict,min=3,max=50"`
-	Brand             string   `json:"brand" validate:"required_strict,min=2,max=50"`
-	Sku               *string  `json:"sku,omitempty" validate:"omitempty,max=100"`
+	Name              string   `json:"name" validate:"required_strict,min=3"`
+	Brand             string   `json:"brand" validate:"required_strict,min=2"`
+	Sku               *string  `json:"sku,omitempty" validate:"omitempty"`
 	UomID             uint     `json:"uom_id" validate:"required,gt=0"`
 	ProductCategoryID uint     `json:"product_category_id" validate:"required,gt=0"`
 	ProductPrice      float64  `json:"product_price" validate:"required"`

internal/modules/master/suppliers/route.go

@@ -1,7 +1,7 @@
 package suppliers
 
 import (
-	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
+	// m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	controller "gitlab.com/mbugroup/lti-api.git/internal/modules/master/suppliers/controllers"
 	supplier "gitlab.com/mbugroup/lti-api.git/internal/modules/master/suppliers/services"
 	user "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services"
@@ -13,7 +13,7 @@ func SupplierRoutes(v1 fiber.Router, u user.UserService, s supplier.SupplierServ
 	ctrl := controller.NewSupplierController(s)
 
 	route := v1.Group("/suppliers")
-	route.Use(m.Auth(u))
+	// route.Use(m.Auth(u))
 
 	route.Get("/", ctrl.GetAll)
 	route.Post("/", ctrl.CreateOne)

internal/modules/master/suppliers/services/supplier.service.go

@@ -5,14 +5,14 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/go-playground/validator/v10"
-	"github.com/gofiber/fiber/v2"
-	"github.com/sirupsen/logrus"
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	repository "gitlab.com/mbugroup/lti-api.git/internal/modules/master/suppliers/repositories"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/master/suppliers/validations"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils"
+
+	"github.com/go-playground/validator/v10"
+	"github.com/gofiber/fiber/v2"
+	"github.com/sirupsen/logrus"
 	"gorm.io/gorm"
 )
 
@@ -124,10 +124,8 @@ func (s *supplierService) CreateOne(c *fiber.Ctx, req *validation.Create) (*enti
 	}
 
 	alias := strings.TrimSpace(strings.ToUpper(req.Alias))
-	actorID, err := m.ActorIDFromContext(c)
-	if err != nil {
-		return nil, err
-	}
+
+	//TODO: created by dummy
 	createBody := &entity.Supplier{
 		Name:          req.Name,
 		Alias:         alias,
@@ -141,7 +139,7 @@ func (s *supplierService) CreateOne(c *fiber.Ctx, req *validation.Create) (*enti
 		Npwp:          req.Npwp,
 		AccountNumber: req.AccountNumber,
 		DueDate:       req.DueDate,
-		CreatedBy:     actorID,
+		CreatedBy:     1,
 	}
 
 	if err := s.Repository.CreateOne(c.Context(), createBody, nil); err != nil {