feat(model): AIModel ve Provider sınıfları eklendi; AIModelRepository ve ProviderRepository güncellendi

omerada · omerada · commit 0e190ccc0701 · 2025-05-17T21:11:38.000+03:00
diff --git a/user-service/src/main/java/com/craftpilot/userservice/dto/ai/ModelResponse.java b/user-service/src/main/java/com/craftpilot/userservice/dto/ai/ModelResponse.java
@@ -6,6 +6,7 @@
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+
 import java.util.List;
 
 @Data
diff --git a/user-service/src/main/java/com/craftpilot/userservice/dto/ai/ModelsData.java b/user-service/src/main/java/com/craftpilot/userservice/dto/ai/ModelsData.java
@@ -6,6 +6,7 @@
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+
 import java.util.List;
 
 @Data
diff --git a/user-service/src/main/java/com/craftpilot/userservice/model/AIModel.java b/user-service/src/main/java/com/craftpilot/userservice/model/AIModel.java
@@ -0,0 +1,40 @@
+package com.craftpilot.userservice.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.index.Indexed;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+import java.time.LocalDateTime;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Document(collection = "ai_models")
+public class AIModel {
+    
+    @Id
+    private String id;
+    
+    @Indexed(unique = true)
+    private String modelId;
+    
+    private String modelName;
+    private String provider;
+    
+    @JsonIgnore
+    private String providerId;
+    
+    private int maxInputTokens;
+    private String requiredPlan;
+    private int creditCost;
+    private String creditType;
+    private String category;
+    private int contextLength;
+    private boolean active = true;
+    private LocalDateTime createdAt;
+    private LocalDateTime updatedAt;
+}
diff --git a/user-service/src/main/java/com/craftpilot/userservice/model/Provider.java b/user-service/src/main/java/com/craftpilot/userservice/model/Provider.java
@@ -0,0 +1,35 @@
+package com.craftpilot.userservice.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.index.Indexed;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Document(collection = "providers")
+public class Provider {
+    
+    @Id
+    private String id;
+    
+    @Indexed(unique = true)
+    private String name;
+    
+    private String description;
+    private String logoUrl;
+    private boolean active;
+    private LocalDateTime createdAt;
+    private LocalDateTime updatedAt;
+    
+    // Add missing field to store models
+    private List<AIModel> models;
+}
diff --git a/user-service/src/main/java/com/craftpilot/userservice/repository/AIModelRepository.java b/user-service/src/main/java/com/craftpilot/userservice/repository/AIModelRepository.java
@@ -8,9 +8,7 @@
 
 @Repository
 public interface AIModelRepository extends ReactiveMongoRepository<AIModel, String> {
-    Flux<AIModel> findByCategory(String category);
-
-    Flux<AIModel> findByRequiredPlan(String plan);
-
     Mono<AIModel> findByModelId(String modelId);
+    Flux<AIModel> findByProvider(String provider);
+    Flux<AIModel> findByCategory(String category);
 }
diff --git a/user-service/src/main/java/com/craftpilot/userservice/repository/ProviderRepository.java b/user-service/src/main/java/com/craftpilot/userservice/repository/ProviderRepository.java
@@ -3,11 +3,9 @@
 import com.craftpilot.userservice.model.ai.Provider;
 import org.springframework.data.mongodb.repository.ReactiveMongoRepository;
 import org.springframework.stereotype.Repository;
-import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 @Repository
 public interface ProviderRepository extends ReactiveMongoRepository<Provider, String> {
-    // Provider'ları bulmak için ek metotlar buraya eklenebilir
     Mono<Provider> findByName(String name);
 }
diff --git a/user-service/src/main/java/com/craftpilot/userservice/service/AIModelService.java b/user-service/src/main/java/com/craftpilot/userservice/service/AIModelService.java
@@ -9,11 +9,9 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -42,7 +40,9 @@ public Mono<ModelsData> getAvailableModels(String userPlan) {
                     }
                     
                     // Kredi tipi aynıysa, kredi maliyetine göre sırala (küçükten büyüğe)
-                    return model1.getCreditCost().compareTo(model2.getCreditCost());
+                    return Integer.compare(
+                        model1.getCreditCost() != null ? model1.getCreditCost() : 0, 
+                        model2.getCreditCost() != null ? model2.getCreditCost() : 0);
                 });
                 
                 // Provider'ları getir
@@ -73,6 +73,19 @@ public Mono<ModelsData> getAvailableModels(String userPlan) {
             .doOnError(e -> log.error("AI modelleri getirilirken hata: error={}", e.getMessage()));
     }
     
+    // Helper method to compare credit types
+    private int compareCreditTypes(String type1, String type2) {
+        if (type1 == null) return type2 == null ? 0 : 1;
+        if (type2 == null) return -1;
+        
+        if ("STANDARD".equals(type1) && "ADVANCED".equals(type2)) {
+            return -1;
+        } else if ("ADVANCED".equals(type1) && "STANDARD".equals(type2)) {
+            return 1;
+        }
+        return 0;
+    }
+    
     public ModelsData getDefaultModels(String userPlan, Throwable t) {
         log.warn("Varsayılan AI modeller döndürülüyor (fallback): userPlan={}, error={}", userPlan, t.getMessage());
         
@@ -90,8 +103,8 @@ public ModelsData getDefaultModels(String userPlan, Throwable t) {
         List<Provider> defaultProviders = new ArrayList<>();
         defaultProviders.add(Provider.builder()
             .name("Google")
-            .icon("TbBrandGoogle")
-            .description("Gemini serisi modeller")
+            .description("Google AI models")
+            .active(true)
             .models(defaultModels)
             .build());
             
@@ -100,57 +113,4 @@ public ModelsData getDefaultModels(String userPlan, Throwable t) {
             .providers(defaultProviders)
             .build();
     }
-    
-    public String getDefaultModelForPlan(String userPlan) {
-        switch(userPlan.toLowerCase()) {
-            case "premium":
-            case "enterprise":
-                return "google/gemini-2.0-pro-001";
-            case "pro":
-                return "google/gemini-2.0-pro-001";
-            case "free":
-            default:
-                return "google/gemini-2.0-flash-lite-001";
-        }
-    }
-    
-    private Mono<List<AIModel>> filterModelsByPlan(String userPlan) { 
-        log.info("Tüm AI modeller getiriliyor (filtreleme yapılmadan)");
-        return modelRepository.findAll().collectList();
-    }
-    
-    private String mapLegacyModelId(String modelId) {
-        // Eski ID'den yeni ID'ye eşleme
-        Map<String, String> modelMappings = new HashMap<>();
-        modelMappings.put("gemini-pro", "google/gemini-1.5-pro");
-        modelMappings.put("gpt-4-turbo", "openai/gpt-4-turbo");
-        
-        // Eşleşen bir eski ID varsa yeni ID'yi döndür, yoksa orijinal ID'yi kullan
-        return modelMappings.getOrDefault(modelId, modelId);
-    }
-    
-    public Mono<AIModel> saveModel(AIModel model) {
-        log.info("AI Model kaydediliyor: modelId={}", model.getModelId());
-        return modelRepository.save(model);
-    }
-
-    public Flux<AIModel> saveAllModels(List<AIModel> models) {
-        log.info("{} AI model kaydediliyor", models.size());
-        return Flux.fromIterable(models)
-            .flatMap(this::saveModel);
-    }
-    
-    // Kredi tipi karşılaştırma yardımcı metodu
-    private int compareCreditTypes(String creditType1, String creditType2) {
-        // "STANDARD" < "ADVANCED" olacak şekilde sırala
-        if (creditType1 == null && creditType2 == null) return 0;
-        if (creditType1 == null) return -1;  // null değerler başta olsun
-        if (creditType2 == null) return 1;
-        
-        // STANDARD önce, ADVANCED sonra
-        if ("STANDARD".equals(creditType1) && "ADVANCED".equals(creditType2)) return -1;
-        if ("ADVANCED".equals(creditType1) && "STANDARD".equals(creditType2)) return 1;
-        
-        return 0;   
-    }
 }
diff --git a/user-service/src/main/java/com/craftpilot/userservice/service/ModelDataLoader.java b/user-service/src/main/java/com/craftpilot/userservice/service/ModelDataLoader.java
@@ -235,19 +235,8 @@ private void validateModels(List<ModelDTO> models) {
             }
             
             if (!isValid) {
-                log.warn("Geçersiz model verisi: {} - {}", model.modelId, errors.toString());
-                invalidModels++;
-                invalidModelIds.add(model.modelId);
-            }
-        }
-        
-        if (invalidModels > 0) {
-            log.warn("{} model geçersiz veri içeriyor: {}", invalidModels, String.join(", ", invalidModelIds));
-            
-            // Kritik doğrulama başarısız olursa işlemi durdur
-            if (invalidModels > models.size() * 0.2) { // %20'den fazla model geçersizse
-                throw new IllegalArgumentException("Model dosyasında çok fazla geçersiz veri bulundu: " + 
-                    invalidModels + " / " + models.size());
+                // Log error or handle invalid model
+                log.error("Model validation failed: {}", errors.toString());
             }
         }
         
@@ -351,12 +340,7 @@ private Mono<Map<String, Provider>> saveProvidersReactive(List<ModelDTO> modelDT
                                 continue;
                             }
                             
-                            Provider newProvider = Provider.builder()
-                                .name(providerName)
-                                .active(true)
-                                .createdAt(LocalDateTime.now())
-                                .updatedAt(LocalDateTime.now())
-                                .build();
+                            Provider newProvider = createProvider(providerName, null);
                                 
                             newProviders.add(newProvider);
                             log.info("Yeni provider hazırlanıyor: {}", newProvider.getName());
@@ -375,12 +359,12 @@ private Mono<Map<String, Provider>> saveProvidersReactive(List<ModelDTO> modelDT
                     // Önce yeni provider'ları kaydet
                     Mono<List<Provider>> saveNewProvidersMono = newProviders.isEmpty() ? 
                         Mono.just(Collections.emptyList()) : 
-                        providerRepository.saveAll(newProviders).collectList();
+                        Flux.fromIterable(newProviders).flatMap(providerRepository::save).collectList();
                     
                     // Sonra güncellenen provider'ları kaydet
                     Mono<List<Provider>> updateProvidersMono = updatedProviders.isEmpty() ? 
                         Mono.just(Collections.emptyList()) : 
-                        providerRepository.saveAll(updatedProviders).collectList();
+                        Flux.fromIterable(updatedProviders).flatMap(providerRepository::save).collectList();
                     
                     // Her iki işlemi de tamamla ve providerMap'i döndür
                     return saveNewProvidersMono.flatMap(savedNewProviders -> {
@@ -517,7 +501,8 @@ class ModelCounter {
                             counter.errorCount, counter.skippedCount, counter.invalidProviderCount);
                         
                         // Modelleri toplu olarak kaydet, daha verimli
-                        return aiModelRepository.saveAll(modelsToSave)
+                        return Flux.fromIterable(modelsToSave)
+                                .flatMap(aiModelRepository::save)
                                 .collectList()
                                 .map(savedModels -> {
                                     log.info("{} model başarıyla kaydedildi", savedModels.size());
@@ -590,4 +575,17 @@ public Map<String, Object> getModelLoadingStatus() {
         status.put("lastLoadedModelCount", lastLoadedModelCount);
         return status;
     }
+    
+    /**
+     * Provider oluşturma işlemini gerçekleştiren yardımcı metod
+     */
+    private Provider createProvider(String name, String description) {
+        return Provider.builder()
+                .name(name)
+                .description(description)
+                .active(true)
+                .createdAt(LocalDateTime.now())
+                .updatedAt(LocalDateTime.now())
+                .build();
+    }
 }
diff --git a/user-service/src/main/java/com/craftpilot/userservice/service/UserPreferenceService.java b/user-service/src/main/java/com/craftpilot/userservice/service/UserPreferenceService.java
@@ -112,7 +112,19 @@ private void applyUpdates(UserPreference preferences, Map<String, Object> update
                     break;
                 case "aiModelFavorites":
                     if (value instanceof List) {
-                        preferences.setAiModelFavorites((List<String>) value);
+                        List<?> rawList = (List<?>) value;
+                        List<String> validatedList = rawList.stream()
+                            .filter(item -> item instanceof String)
+                            .map(item -> (String) item)
+                            .filter(s -> s != null && !s.trim().isEmpty())
+                            .distinct()
+                            .collect(Collectors.toList());
+                        
+                        preferences.setAiModelFavorites(validatedList);
+                        if (validatedList.size() != rawList.size()) {
+                            log.warn("aiModelFavorites listesinde geçersiz öğeler filtrelendi. Orijinal: {}, Filtrelenmiş: {}", 
+                                    rawList.size(), validatedList.size());
+                        }
                     }
                     break;
                 case "notifications":
