Skip to content

Commit e36c537

Browse files
committed
feat(model): ModelDataFixer sınıfı eklendi; AIModel verilerindeki hataları düzeltmek için yeni bir yöntem tanımlandı
1 parent feb5c93 commit e36c537

File tree

3 files changed

+36
-12
lines changed

3 files changed

+36
-12
lines changed

.github/workflows/user-service-ci-cd.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,20 +64,18 @@ jobs:
6464
- name: Clean local Maven cache
6565
run: |
6666
echo "Cleaning local Maven cache for user-service and redis-client-lib"
67-
rm -rf ~/.m2/repository/com/craftpilot/user-service || true
68-
rm -rf ~/.m2/repository/com/craftpilot/redis-client-lib || true
67+
rm -rf ~/.m2/repository/com/craftpilot/userservice/ || true
68+
rm -rf ~/.m2/repository/com/craftpilot/redis-client-lib/ || true
6969
rm -rf ~/.m2/repository/org/mapstruct || true
70-
find . -name "*MapperImpl*.java" -delete || true
70+
# MapperImpl dosyalarını silme işlemini kaldırdık
7171
7272
- name: Prepare clean build context
7373
run: |
7474
mkdir -p /tmp/build-context
7575
cp -r ../redis-client-lib /tmp/build-context/
7676
cp -r . /tmp/build-context/user-service
77-
# Clean any generated files to prevent MapStruct issues
77+
# Sadece hedef klasörlerini temizleyelim, MapperImpl dosyalarını silmeyelim
7878
find /tmp/build-context -name "target" -type d -exec rm -rf {} + 2>/dev/null || true
79-
find /tmp/build-context -name "*MapperImpl*.java" -delete || true
80-
find /tmp/build-context -name "*.class" -delete || true
8179
8280
- name: Build and Push Docker image
8381
uses: docker/build-push-action@v4

user-service/Dockerfile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,12 @@ RUN cd /build/redis-client-lib && mvn clean install -DskipTests -B -ntp && \
3333
# Copy user-service
3434
COPY user-service/ /build/user-service/
3535

36-
# Build user-service - MapStruct sorununu çözen iyileştirilmiş derleme adımı
36+
# Build user-service - Düzeltilmiş ve daha güvenli derleme adımı
3737
WORKDIR /build/user-service
3838
RUN rm -rf target && \
39-
rm -rf /root/.m2/repository/com/craftpilot/userservice/ && \
40-
find . -name "*.class" -delete && \
41-
find . -name "MapperImpl.java" -delete && \
42-
find . -name "*Mapper*.java" -not -name "UserMapper.java" -not -name "UserPreferenceMapper.java" -delete && \
43-
mvn clean package -Dmaven.compiler.forceJavacCompilerUse=true -Dmapstruct.defaultComponentModel=spring -Dmapstruct.verbose=true -DskipTests -B -ntp
39+
rm -rf ~/.m2/repository/com/craftpilot/userservice/ && \
40+
# MapStruct ve diğer dosyaları silme işlemini kaldırıyoruz, bu işlemi maven temizleyecek
41+
mvn clean package -DskipTests -B -ntp
4442

4543
# Run stage
4644
FROM eclipse-temurin:21-jre-alpine
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
package com.craftpilot.userservice.util;
2+
3+
import com.craftpilot.userservice.model.AIModel;
4+
import com.craftpilot.userservice.model.AIModel.AIModelBuilder;
5+
import org.springframework.stereotype.Component;
6+
7+
@Component
8+
public class ModelDataFixer {
9+
10+
public AIModel fixAIModelData(AIModel model) {
11+
if (model == null) {
12+
return null;
13+
}
14+
15+
AIModelBuilder builder = model.toBuilder();
16+
17+
// AIModel verilerindeki olası hataları düzelt
18+
// Örneğin, isActive alanını kontrol et ve gerekirse düzelt
19+
if (builder.isActive() == null) {
20+
builder.active(true); // Varsayılan değeri true olarak ayarla
21+
}
22+
23+
// Diğer düzeltmeler...
24+
// builder.setSomeField(defaultValue);
25+
26+
return builder.build();
27+
}
28+
}

0 commit comments

Comments
 (0)