Firestore koleksiyon isimleri güncellendi; "performance_analysis" ve "subscription_plans" isimleri sırasıyla "performanceAnalysis" ve "subscriptionPlans" olarak değiştirildi. AIModel ve Provider için yeni alanlar eklendi; ModelDataLoader ve ModelDataLoaderCommand sınıfları oluşturuldu, JSON dosyasından model yükleme işlevselliği eklendi. Uygulama yapılandırmasına model yükleme seçeneği eklendi.

omerada · omerada · commit c32b0834601f · 2025-04-23T22:39:34.000+03:00
diff --git a/llm-service/src/main/java/com/craftpilot/llmservice/repository/PerformanceAnalysisRepository.java b/llm-service/src/main/java/com/craftpilot/llmservice/repository/PerformanceAnalysisRepository.java
@@ -18,7 +18,7 @@
 @RequiredArgsConstructor
 @Slf4j
 public class PerformanceAnalysisRepository {
-    private static final String COLLECTION_NAME = "performance_analysis";
+    private static final String COLLECTION_NAME = "performanceAnalysis";
     
     private final Firestore firestore;
     
diff --git a/subscription-service/src/main/java/com/craftpilot/subscriptionservice/repository/SubscriptionPlanRepository.java b/subscription-service/src/main/java/com/craftpilot/subscriptionservice/repository/SubscriptionPlanRepository.java
@@ -17,7 +17,7 @@
 public class SubscriptionPlanRepository {
 
     private final Firestore firestore;
-    private static final String COLLECTION_NAME = "subscription_plans";
+    private static final String COLLECTION_NAME = "subscriptionPlans";
 
     public Mono<SubscriptionPlan> save(SubscriptionPlan plan) {
         if (plan.getId() == null) {
diff --git a/user-service/src/main/java/com/craftpilot/userservice/command/ModelDataLoaderCommand.java b/user-service/src/main/java/com/craftpilot/userservice/command/ModelDataLoaderCommand.java
@@ -0,0 +1,38 @@
+package com.craftpilot.userservice.command;
+
+import com.craftpilot.userservice.service.ModelDataLoader;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.stereotype.Component;
+import java.time.Duration;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+@ConditionalOnProperty(name = "app.load-models", havingValue = "true")
+public class ModelDataLoaderCommand implements CommandLineRunner {
+
+    private final ModelDataLoader modelDataLoader;
+
+    @Override
+    public void run(String... args) {
+        log.info("AI modelleri yükleme işlemi başlıyor...");
+        
+        String jsonFilePath = "c:\\Projects\\Craft-Pilot-Ai\\models.json";
+        if (args.length > 0 && args[0] != null && !args[0].isEmpty()) {
+            jsonFilePath = args[0];
+        }
+        
+        modelDataLoader.loadModelsFromJson(jsonFilePath)
+            .timeout(Duration.ofMinutes(5))
+            .doOnSuccess(count -> {
+                log.info("AI model yükleme işlemi tamamlandı: {} model yüklendi", count);
+            })
+            .doOnError(error -> {
+                log.error("AI model yükleme sırasında hata: {}", error.getMessage(), error);
+            })
+            .block();
+    }
+}
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
@@ -27,4 +27,8 @@ public class AIModel {
     private Integer maxTokens;
     private Integer maxInputTokens;
     private String requiredPlan;
+    private Integer creditCost; // Her kullanımda tüketilecek kredi miktarı
+    private String category; // Model kategorisi (basic, standard, premium gibi)
+    private String architecture; // Modelin mimarisi
+    private Integer contextLength; // Modelin bağlam penceresi uzunluğu
 }
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
@@ -1,40 +1,46 @@
 package com.craftpilot.userservice.repository;
 
 import com.craftpilot.userservice.model.ai.AIModel;
-import com.google.api.core.ApiFuture;
-import com.google.cloud.firestore.DocumentSnapshot;
 import com.google.cloud.firestore.Firestore;
-import com.google.cloud.firestore.QuerySnapshot;
-import com.google.cloud.firestore.WriteResult;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.core.scheduler.Schedulers;
 
-import java.util.concurrent.CompletableFuture;
-
 @Repository
 @RequiredArgsConstructor
 public class AIModelRepository {
-    
-    private final Firestore firestore;
-    private static final String COLLECTION_NAME = "ai_models";
 
-    public Flux<AIModel> findAll() {
-        return Mono.fromCallable(() -> 
+    private final Firestore firestore;
+    private static final String COLLECTION_NAME = "aiModels";
+    
+    public Mono<AIModel> save(AIModel model) {
+        return Mono.fromCallable(() -> {
             firestore.collection(COLLECTION_NAME)
-                    .get()
-                    .get()
-                    .getDocuments()
-                    .stream()
-                    .map(doc -> doc.toObject(AIModel.class))
-                    .toList()
-        )
-        .subscribeOn(Schedulers.boundedElastic())
-        .flatMapMany(Flux::fromIterable);
+                    .document(model.getId())
+                    .set(model)
+                    .get();
+            return model;
+        }).subscribeOn(Schedulers.boundedElastic());
     }
-
+    
+    public Flux<AIModel> findAll() {
+        return Flux.defer(() -> Flux.fromIterable(
+                firestore.collection(COLLECTION_NAME).get().get().getDocuments())
+                .map(doc -> doc.toObject(AIModel.class)))
+                .subscribeOn(Schedulers.boundedElastic());
+    }
+    
+    public Flux<AIModel> findByCategory(String category) {
+        return Flux.defer(() -> Flux.fromIterable(
+                firestore.collection(COLLECTION_NAME)
+                        .whereEqualTo("category", category)
+                        .get().get().getDocuments())
+                .map(doc -> doc.toObject(AIModel.class)))
+                .subscribeOn(Schedulers.boundedElastic());
+    }
+    
     public Mono<AIModel> findById(String id) {
         return Mono.fromCallable(() -> 
             firestore.collection(COLLECTION_NAME)
@@ -45,16 +51,6 @@ public Mono<AIModel> findById(String id) {
         ).subscribeOn(Schedulers.boundedElastic());
     }
 
-    public Mono<AIModel> save(AIModel model) {
-        return Mono.fromCallable(() -> {
-            if (model.getId() == null) {
-                model.setId(firestore.collection(COLLECTION_NAME).document().getId());
-            }
-            firestore.collection(COLLECTION_NAME).document(model.getId()).set(model).get();
-            return model;
-        }).subscribeOn(Schedulers.boundedElastic());
-    }
-
     public Mono<Void> deleteById(String id) {
         return Mono.fromRunnable(() -> {
             try {
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
@@ -1,38 +1,35 @@
 package com.craftpilot.userservice.repository;
 
 import com.craftpilot.userservice.model.ai.Provider;
-import com.google.api.core.ApiFuture;
-import com.google.cloud.firestore.DocumentSnapshot;
 import com.google.cloud.firestore.Firestore;
-import com.google.cloud.firestore.QuerySnapshot;
-import com.google.cloud.firestore.WriteResult;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.core.scheduler.Schedulers;
 
-import java.util.concurrent.CompletableFuture;
-
 @Repository
 @RequiredArgsConstructor
 public class ProviderRepository {
-    
+
     private final Firestore firestore;
     private static final String COLLECTION_NAME = "providers";
-
-    public Flux<Provider> findAll() {
-        return Mono.fromCallable(() -> 
+    
+    public Mono<Provider> save(Provider provider) {
+        return Mono.fromCallable(() -> {
             firestore.collection(COLLECTION_NAME)
-                    .get()
-                    .get()
-                    .getDocuments()
-                    .stream()
-                    .map(doc -> doc.toObject(Provider.class))
-                    .toList()
-        )
-        .subscribeOn(Schedulers.boundedElastic())
-        .flatMapMany(Flux::fromIterable);
+                    .document(provider.getName())
+                    .set(provider)
+                    .get();
+            return provider;
+        }).subscribeOn(Schedulers.boundedElastic());
+    }
+    
+    public Flux<Provider> findAll() {
+        return Flux.defer(() -> Flux.fromIterable(
+                firestore.collection(COLLECTION_NAME).get().get().getDocuments())
+                .map(doc -> doc.toObject(Provider.class)))
+                .subscribeOn(Schedulers.boundedElastic());
     }
 
     public Mono<Provider> findById(String name) {
@@ -45,13 +42,6 @@ public Mono<Provider> findById(String name) {
         ).subscribeOn(Schedulers.boundedElastic());
     }
 
-    public Mono<Provider> save(Provider provider) {
-        return Mono.fromCallable(() -> {
-            firestore.collection(COLLECTION_NAME).document(provider.getName()).set(provider).get();
-            return provider;
-        }).subscribeOn(Schedulers.boundedElastic());
-    }
-
     public Mono<Void> deleteById(String name) {
         return Mono.fromRunnable(() -> {
             try {
diff --git a/user-service/src/main/java/com/craftpilot/userservice/repository/UserPreferenceRepository.java b/user-service/src/main/java/com/craftpilot/userservice/repository/UserPreferenceRepository.java
@@ -17,7 +17,7 @@
 public class UserPreferenceRepository {
 
     private final Firestore firestore;
-    private static final String COLLECTION_NAME = "user_preferences";
+    private static final String COLLECTION_NAME = "userPreferences";
 
     public Mono<UserPreference> findById(String userId) {
         return Mono.fromCallable(() -> 
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
diff --git a/user-service/src/main/resources/application.properties b/user-service/src/main/resources/application.properties

Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,8 @@ public class AIModel {`
`27`	`27`	`private Integer maxTokens;`
`28`	`28`	`private Integer maxInputTokens;`
`29`	`29`	`private String requiredPlan;`
	`30`	`+ private Integer creditCost; // Her kullanımda tüketilecek kredi miktarı`
	`31`	`+ private String category; // Model kategorisi (basic, standard, premium gibi)`
	`32`	`+ private String architecture; // Modelin mimarisi`
	`33`	`+ private Integer contextLength; // Modelin bağlam penceresi uzunluğu`
`30`	`34`	`}`