AI model yönetimi için yeni API'ler eklendi; kullanıcı planına göre uygun AI modellerini getiren endpoint oluşturuldu. Kullanıcı tercihleri ve model bilgileri güncellendi.

omerada · omerada · commit 55e21475bc8a · 2025-04-22T23:25:29.000+03:00
diff --git a/user-service/pom.xml b/user-service/pom.xml
@@ -213,6 +213,7 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<configuration>
+					<mainClass>com.craftpilot.userservice.UserServiceApplication</mainClass>
 					<excludes>
 						<exclude>
 							<groupId>org.projectlombok</groupId>
diff --git a/user-service/src/main/java/com/craftpilot/userservice/controller/AIModelController.java b/user-service/src/main/java/com/craftpilot/userservice/controller/AIModelController.java
@@ -0,0 +1,64 @@
+package com.craftpilot.userservice.controller;
+
+import com.craftpilot.userservice.dto.ai.ModelResponse;
+import com.craftpilot.userservice.service.AIModelService;
+import com.craftpilot.userservice.service.UserService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.ReactiveSecurityContextHolder;
+import org.springframework.security.core.context.SecurityContext;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import reactor.core.publisher.Mono;
+
+@RestController
+@RequestMapping("/api/v1/ai")
+@RequiredArgsConstructor
+@Slf4j
+@Tag(name = "AI Models", description = "AI model yönetimi API'leri")
+public class AIModelController {
+
+    private final AIModelService modelService;
+    private final UserService userService;
+
+    @GetMapping("/models/available")
+    @Operation(summary = "Kullanıcıya uygun AI modellerini getir", description = "Kullanıcının planına göre erişebileceği tüm AI modellerini getirir")
+    public Mono<ResponseEntity<ModelResponse>> getAvailableModels() {
+        return ReactiveSecurityContextHolder.getContext()
+            .map(SecurityContext::getAuthentication)
+            .map(Authentication::getName)
+            .flatMap(userId -> {
+                log.info("Kullanıcı için erişilebilir AI modelleri getiriliyor: userId={}", userId);
+                return userService.getUserPlan(userId)
+                    .flatMap(userPlan ->
+                        userService.getUserPreferences(userId)
+                            .flatMap(preferences -> {
+                                // Son seçilen model yoksa varsayılan değer kullan
+                                final String lastSelectedModel = preferences.getLastSelectedModelId() != null ?
+                                        preferences.getLastSelectedModelId() : 
+                                        modelService.getDefaultModelForPlan(userPlan);
+
+                                return modelService.getAvailableModels(userPlan)
+                                    .map(modelsData -> {
+                                        ModelResponse response = ModelResponse.builder()
+                                            .models(modelsData.getModels())
+                                            .providers(modelsData.getProviders())
+                                            .defaultModelId(modelService.getDefaultModelForPlan(userPlan))
+                                            .userPlan(userPlan)
+                                            .lastSelectedModelId(lastSelectedModel)
+                                            .version(modelsData.getVersion())
+                                            .build();
+                                        return ResponseEntity.ok(response);
+                                    });
+                            })
+                    )
+                    .doOnSuccess(response -> log.info("AI modelleri başarıyla getirildi: userId={}", userId))
+                    .doOnError(e -> log.error("AI modelleri getirilirken hata: userId={}, error={}", userId, e.getMessage()));
+            });
+    }
+}
diff --git a/user-service/src/main/java/com/craftpilot/userservice/dto/UserPreferenceRequest.java b/user-service/src/main/java/com/craftpilot/userservice/dto/UserPreferenceRequest.java
@@ -19,4 +19,5 @@ public class UserPreferenceRequest {
     private Map<String, Boolean> notifications;
     private Boolean pushEnabled;
     private List<String> aiModelFavorites;
+    private String lastSelectedModelId;
 }
diff --git a/user-service/src/main/java/com/craftpilot/userservice/dto/UserPreferenceResponse.java b/user-service/src/main/java/com/craftpilot/userservice/dto/UserPreferenceResponse.java
@@ -20,6 +20,7 @@ public class UserPreferenceResponse {
     private Map<String, Boolean> notifications;
     private Boolean pushEnabled;
     private List<String> aiModelFavorites;
+    private String lastSelectedModelId;
     private Long createdAt;
     private Long updatedAt;
 }
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
@@ -0,0 +1,22 @@
+package com.craftpilot.userservice.dto.ai;
+
+import com.craftpilot.userservice.model.ai.AIModel;
+import com.craftpilot.userservice.model.ai.Provider;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ModelResponse {
+    private List<AIModel> models;
+    private List<Provider> providers;
+    private String defaultModelId;
+    private String userPlan;
+    private String lastSelectedModelId;
+    private Integer version;
+}
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
@@ -0,0 +1,19 @@
+package com.craftpilot.userservice.dto.ai;
+
+import com.craftpilot.userservice.model.ai.AIModel;
+import com.craftpilot.userservice.model.ai.Provider;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ModelsData {
+    private List<AIModel> models;
+    private List<Provider> providers;
+    private Integer version;
+}
diff --git a/user-service/src/main/java/com/craftpilot/userservice/mapper/UserPreferenceMapper.java b/user-service/src/main/java/com/craftpilot/userservice/mapper/UserPreferenceMapper.java
@@ -24,6 +24,7 @@ public UserPreference toEntity(UserPreferenceRequest dto) {
                 .notifications(dto.getNotifications())
                 .pushEnabled(dto.getPushEnabled())
                 .aiModelFavorites(dto.getAiModelFavorites())
+                .lastSelectedModelId(dto.getLastSelectedModelId())
                 .build();
     }
 
@@ -40,6 +41,7 @@ public UserPreferenceRequest toDto(UserPreference entity) {
                 .notifications(entity.getNotifications())
                 .pushEnabled(entity.getPushEnabled())
                 .aiModelFavorites(entity.getAiModelFavorites())
+                .lastSelectedModelId(entity.getLastSelectedModelId())
                 .build();
     }
 }
diff --git a/user-service/src/main/java/com/craftpilot/userservice/model/UserPreference.java b/user-service/src/main/java/com/craftpilot/userservice/model/UserPreference.java
@@ -49,6 +49,10 @@ public class UserPreference {
     
     @Builder.Default
     private Boolean pushEnabled = false;
+    
+    // Son seçilen AI modeli ID'si
+    @Builder.Default
+    private String lastSelectedModelId = "google/gemini-2.0-flash-lite-001";
 
     // Zaman damgaları
     private Long createdAt;
diff --git a/user-service/src/main/java/com/craftpilot/userservice/model/ai/AIModel.java b/user-service/src/main/java/com/craftpilot/userservice/model/ai/AIModel.java
@@ -0,0 +1,30 @@
+package com.craftpilot.userservice.model.ai;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.annotation.TypeAlias;
+import com.google.cloud.firestore.annotation.DocumentId;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@TypeAlias("aiModel")
+public class AIModel {
+    @Id
+    @DocumentId
+    private String id;
+    private String value;
+    private String label;
+    private String description;
+    private String badge;
+    private Boolean popular;
+    private String provider;
+    private String providerIcon;
+    private Integer maxTokens;
+    private Integer maxInputTokens;
+    private String requiredPlan;
+}
diff --git a/user-service/src/main/java/com/craftpilot/userservice/model/ai/Provider.java b/user-service/src/main/java/com/craftpilot/userservice/model/ai/Provider.java
@@ -0,0 +1,24 @@
+package com.craftpilot.userservice.model.ai;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.annotation.TypeAlias;
+import com.google.cloud.firestore.annotation.DocumentId;
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@TypeAlias("provider")
+public class Provider {
+    @Id
+    @DocumentId
+    private String name;
+    private String icon;
+    private String description;
+    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
@@ -0,0 +1,11 @@
+package com.craftpilot.userservice.repository;
+
+import com.craftpilot.userservice.model.ai.AIModel;
+import org.springframework.data.repository.reactive.ReactiveCrudRepository;
+import org.springframework.stereotype.Repository;
+import reactor.core.publisher.Flux;
+
+@Repository
+public interface AIModelRepository extends ReactiveCrudRepository<AIModel, String> {
+    Flux<AIModel> findByRequiredPlan(String plan);
+}
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
@@ -0,0 +1,9 @@
+package com.craftpilot.userservice.repository;
+
+import com.craftpilot.userservice.model.ai.Provider;
+import org.springframework.data.repository.reactive.ReactiveCrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ProviderRepository extends ReactiveCrudRepository<Provider, String> {
+}
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
@@ -0,0 +1,138 @@
+package com.craftpilot.userservice.service;
+
+import com.craftpilot.userservice.dto.ai.ModelsData;
+import com.craftpilot.userservice.model.ai.AIModel;
+import com.craftpilot.userservice.model.ai.Provider;
+import com.craftpilot.userservice.repository.AIModelRepository;
+import com.craftpilot.userservice.repository.ProviderRepository;
+import io.github.resilience4j.circuitbreaker.annotation.CircuitBreaker;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+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;
+
+@Service
+@Slf4j
+@RequiredArgsConstructor
+public class AIModelService {
+
+    private final AIModelRepository modelRepository;
+    private final ProviderRepository providerRepository;
+    
+    @Value("${ai.models.version:1}")
+    private Integer modelsVersion;
+
+    @CircuitBreaker(name = "aiModels", fallbackMethod = "getDefaultModels")
+    public Mono<ModelsData> getAvailableModels(String userPlan) {
+        log.info("AI modelleri getiriliyor: userPlan={}", userPlan);
+        
+        // Kullanıcı planına göre uygun modelleri filtrele
+        return filterModelsByPlan(userPlan)
+            .flatMap(models -> {
+                // Provider'ları getir
+                return providerRepository.findAll()
+                    .collectList()
+                    .flatMap(providers -> {
+                        // Provider'lara model listesini ekle
+                        Map<String, List<AIModel>> modelsByProvider = models.stream()
+                            .collect(Collectors.groupingBy(AIModel::getProvider));
+                        
+                        List<Provider> enrichedProviders = providers.stream()
+                            .map(provider -> {
+                                List<AIModel> providerModels = modelsByProvider.getOrDefault(provider.getName(), new ArrayList<>());
+                                provider.setModels(providerModels);
+                                return provider;
+                            })
+                            .collect(Collectors.toList());
+                        
+                        return Mono.just(ModelsData.builder()
+                            .models(models)
+                            .providers(enrichedProviders)
+                            .version(modelsVersion)
+                            .build()
+                        );
+                    });
+            })
+            .doOnSuccess(data -> log.info("AI modelleri başarıyla getirildi: modelCount={}, providerCount={}", 
+                data.getModels().size(), data.getProviders().size()))
+            .doOnError(e -> log.error("AI modelleri getirilirken hata: error={}", e.getMessage()));
+    }
+    
+    public ModelsData getDefaultModels(String userPlan, Throwable t) {
+        log.warn("Varsayılan AI modeller döndürülüyor (fallback): userPlan={}, error={}", userPlan, t.getMessage());
+        
+        // Basit varsayılan modeller oluştur
+        List<AIModel> defaultModels = new ArrayList<>();
+        defaultModels.add(AIModel.builder()
+            .id("google/gemini-2.0-flash-lite-001")
+            .value("google/gemini-2.0-flash-lite-001")
+            .label("Gemini Flash Lite")
+            .description("Hızlı yanıt süresi için optimize edilmiş")
+            .provider("Google")
+            .providerIcon("TbBrandGoogle")
+            .maxTokens(8000)
+            .maxInputTokens(6000)
+            .requiredPlan("free")
+            .build());
+            
+        // Birkaç varsayılan provider oluştur
+        List<Provider> defaultProviders = new ArrayList<>();
+        defaultProviders.add(Provider.builder()
+            .name("Google")
+            .icon("TbBrandGoogle")
+            .description("Gemini serisi modeller")
+            .models(defaultModels)
+            .build());
+            
+        return ModelsData.builder()
+            .models(defaultModels)
+            .providers(defaultProviders)
+            .version(1)
+            .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) {
+        // Plan hiyerarşisi - üst plan, alt planları içerir
+        Map<String, List<String>> planHierarchy = new HashMap<>();
+        planHierarchy.put("free", List.of("free"));
+        planHierarchy.put("pro", List.of("free", "pro"));
+        planHierarchy.put("premium", List.of("free", "pro", "premium"));
+        planHierarchy.put("enterprise", List.of("free", "pro", "premium", "enterprise"));
+        
+        List<String> allowedPlans = planHierarchy.getOrDefault(userPlan.toLowerCase(), List.of("free"));
+        
+        return modelRepository.findAll()
+            .filter(model -> allowedPlans.contains(model.getRequiredPlan().toLowerCase()))
+            .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);
+    }
+}
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
@@ -324,6 +324,11 @@ private void mergePreferences(UserPreference target, Map<String, Object> updates
             target.setAiModelFavorites((List<String>) updates.get("aiModelFavorites"));
         }
 
+        // lastSelectedModelId güncelleme
+        if (updates.containsKey("lastSelectedModelId")) {
+            target.setLastSelectedModelId((String) updates.get("lastSelectedModelId"));
+        }
+
         // notifications güncelleme
         if (updates.containsKey("notifications")) {
             Map<String, Boolean> newNotifications = (Map<String, Boolean>) updates.get("notifications");
@@ -353,6 +358,7 @@ private UserPreference createDefaultPreferences(String userId) {
             .aiModelFavorites(new ArrayList<>())
             .notifications(notificationsMap)
             .pushEnabled(false)
+            .lastSelectedModelId("google/gemini-2.0-flash-lite-001") // Varsayılan model ID'si
             .build();
 
         // Zaman damgaları
diff --git a/user-service/src/main/java/com/craftpilot/userservice/service/UserService.java b/user-service/src/main/java/com/craftpilot/userservice/service/UserService.java

Original file line number	Diff line number	Diff line change
`@@ -19,4 +19,5 @@ public class UserPreferenceRequest {`
`19`	`19`	`private Map<String, Boolean> notifications;`
`20`	`20`	`private Boolean pushEnabled;`
`21`	`21`	`private List<String> aiModelFavorites;`
	`22`	`+ private String lastSelectedModelId;`
`22`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ public class UserPreferenceResponse {`
`20`	`20`	`private Map<String, Boolean> notifications;`
`21`	`21`	`private Boolean pushEnabled;`
`22`	`22`	`private List<String> aiModelFavorites;`
	`23`	`+ private String lastSelectedModelId;`
`23`	`24`	`private Long createdAt;`
`24`	`25`	`private Long updatedAt;`
`25`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ public UserPreference toEntity(UserPreferenceRequest dto) {`
`24`	`24`	`.notifications(dto.getNotifications())`
`25`	`25`	`.pushEnabled(dto.getPushEnabled())`
`26`	`26`	`.aiModelFavorites(dto.getAiModelFavorites())`
	`27`	`+ .lastSelectedModelId(dto.getLastSelectedModelId())`
`27`	`28`	`.build();`
`28`	`29`	`}`
`29`	`30`
`@@ -40,6 +41,7 @@ public UserPreferenceRequest toDto(UserPreference entity) {`
`40`	`41`	`.notifications(entity.getNotifications())`
`41`	`42`	`.pushEnabled(entity.getPushEnabled())`
`42`	`43`	`.aiModelFavorites(entity.getAiModelFavorites())`
	`44`	`+ .lastSelectedModelId(entity.getLastSelectedModelId())`
`43`	`45`	`.build();`
`44`	`46`	`}`
`45`	`47`	`}`