-

internal/services/application_service.go

@@ -5,30 +5,61 @@ import (
 	"crypto/rand"
 	"encoding/hex"
 	"fmt"
+	"time"
 
 	"github.com/go-playground/validator/v10"
 	"go.uber.org/zap"
 
+	"github.com/kms/api-key-service/internal/audit"
 	"github.com/kms/api-key-service/internal/domain"
 	"github.com/kms/api-key-service/internal/repository"
 )
 
 // applicationService implements the ApplicationService interface
 type applicationService struct {
-	appRepo   repository.ApplicationRepository
-	logger    *zap.Logger
-	validator *validator.Validate
+	appRepo     repository.ApplicationRepository
+	auditRepo   repository.AuditRepository
+	auditLogger audit.AuditLogger
+	logger      *zap.Logger
+	validator   *validator.Validate
 }
 
 // NewApplicationService creates a new application service
-func NewApplicationService(appRepo repository.ApplicationRepository, logger *zap.Logger) ApplicationService {
+func NewApplicationService(appRepo repository.ApplicationRepository, auditRepo repository.AuditRepository, logger *zap.Logger) ApplicationService {
+	// Create audit logger with audit package's repository interface
+	auditRepoImpl := &auditRepositoryAdapter{repo: auditRepo}
+	auditLogger := audit.NewAuditLogger(nil, logger, auditRepoImpl) // config can be nil for now
+	
 	return &applicationService{
-		appRepo:   appRepo,
-		logger:    logger,
-		validator: validator.New(),
+		appRepo:     appRepo,
+		auditRepo:   auditRepo,
+		auditLogger: auditLogger,
+		logger:      logger,
+		validator:   validator.New(),
 	}
 }
 
+// auditRepositoryAdapter adapts repository.AuditRepository to audit.AuditRepository
+type auditRepositoryAdapter struct {
+	repo repository.AuditRepository
+}
+
+func (a *auditRepositoryAdapter) Create(ctx context.Context, event *audit.AuditEvent) error {
+	return a.repo.Create(ctx, event)
+}
+
+func (a *auditRepositoryAdapter) Query(ctx context.Context, filter *audit.AuditFilter) ([]*audit.AuditEvent, error) {
+	return a.repo.Query(ctx, filter)
+}
+
+func (a *auditRepositoryAdapter) GetStats(ctx context.Context, filter *audit.AuditStatsFilter) (*audit.AuditStats, error) {
+	return a.repo.GetStats(ctx, filter)
+}
+
+func (a *auditRepositoryAdapter) DeleteOldEvents(ctx context.Context, olderThan time.Time) (int, error) {
+	return a.repo.DeleteOldEvents(ctx, olderThan)
+}
+
 // Create creates a new application
 func (s *applicationService) Create(ctx context.Context, req *domain.CreateApplicationRequest, userID string) (*domain.Application, error) {
 	s.logger.Info("Creating application", zap.String("app_id", req.AppID), zap.String("user_id", userID))
@@ -75,9 +106,43 @@ func (s *applicationService) Create(ctx context.Context, req *domain.CreateAppli
 
 	if err := s.appRepo.Create(ctx, app); err != nil {
 		s.logger.Error("Failed to create application", zap.Error(err), zap.String("app_id", req.AppID))
+		
+		// Log audit event for failed creation
+		s.auditLogger.LogEvent(ctx, audit.NewAuditEventBuilder(audit.EventTypeAppCreated).
+			WithSeverity(audit.SeverityError).
+			WithStatus(audit.StatusFailure).
+			WithActor(userID, "user", "").
+			WithResource(req.AppID, "application").
+			WithAction("create").
+			WithDescription(fmt.Sprintf("Failed to create application %s", req.AppID)).
+			WithDetails(map[string]interface{}{
+				"error":   err.Error(),
+				"app_id":  req.AppID,
+				"user_id": userID,
+			}).
+			Build())
+		
 		return nil, fmt.Errorf("failed to create application: %w", err)
 	}
 
+	// Log successful creation
+	s.auditLogger.LogEvent(ctx, audit.NewAuditEventBuilder(audit.EventTypeAppCreated).
+		WithSeverity(audit.SeverityInfo).
+		WithStatus(audit.StatusSuccess).
+		WithActor(userID, "user", "").
+		WithResource(app.AppID, "application").
+		WithAction("create").
+		WithDescription(fmt.Sprintf("Created application %s", app.AppID)).
+		WithDetails(map[string]interface{}{
+			"app_id":      app.AppID,
+			"app_link":    app.AppLink,
+			"type":        app.Type,
+			"user_id":     userID,
+			"owner_name":  app.Owner.Name,
+			"owner_type":  app.Owner.Type,
+		}).
+		Build())
+
 	s.logger.Info("Application created successfully", zap.String("app_id", app.AppID))
 	return app, nil
 }