add contagem de atividades nas aulas

src/main/java/ages/alfa/dto/LessonDto.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.*;
 
 import javax.persistence.Column;
+import java.util.List;
 
 @Getter
 @Builder
@@ -16,5 +17,6 @@ public class LessonDto {
     private String text;
     private String title;
     private String description;
+    private List<ActivityDto> activityList;
 
 }

src/main/java/ages/alfa/dto/ModuleDto.java

@@ -16,7 +16,7 @@ public class ModuleDto {
     private Long classId;
     private int nivel;
     private List<LessonDto> lessonList;
-    private List<ActivityDto> activityList;
+//    private List<ActivityDto> activityList;
     private String title;
     private String description;
 

src/main/java/ages/alfa/model/entity/Lesson.java

@@ -37,7 +37,7 @@ public class Lesson implements IActivity, Serializable {
     @Column(name = "title", length = 256)
     private String title;
 
-
-
+    @Column(name = "activitys")
+    private Integer activitys;
 
 }
\ No newline at end of file

src/main/java/ages/alfa/service/impl/ModuleServiceImpl.java

@@ -29,7 +29,7 @@ public class ModuleServiceImpl implements ModuleService {
     private final AlternativeRepository alternativeRepository;
     private final ActivityRepository activityRepository;
 
-    public List<Module> findByClassId(Long classId){
+    public List<Module> findByClassId(Long classId) {
         return moduleRepository.findAll(Example.of(Module.builder().classId(classId).build()));
     }
 
@@ -37,6 +37,7 @@ public class ModuleServiceImpl implements ModuleService {
     public Module save(ModuleDto moduleDto) {
 
         Long lessonId = null;
+        int activitys = 0;
 
         Module newModule = Module.builder()
                 .classId(moduleDto.getClassId())
@@ -55,35 +56,37 @@ public class ModuleServiceImpl implements ModuleService {
                     .description(lessonDto.getDescription())
                     .text(lessonDto.getText())
                     .build();
+            newLesson.setActivitys(lessonDto.getActivityList().size());
             newLesson = lessonRepository.save(newLesson);
-            lessonId = newLesson.getId();
-        }
 
-        for (ActivityDto activityDto : moduleDto.getActivityList()) {
-            Activity newActivity = Activity.builder()
-                    .lessonId(lessonId)
-                    .moduleId(newModule.getId())
-                    .title(activityDto.getTitle())
-                    .description(activityDto.getDescription())
-                    .text(activityDto.getText())
-                    .urlImg(activityDto.getUrlImg())
-                    .typeId(activityDto.getTypeId())
-                    .build();
+            for (ActivityDto activityDto : lessonDto.getActivityList()) {
 
-            newActivity = activityRepository.save(newActivity);
-
-            for (AlternativeDto alternativeDto : activityDto.getAlternativeList()) {
-                Alternative newAlternative = Alternative.builder()
-                        .activityId(newActivity.getId())
-                        .correctAnswer(alternativeDto.isCorrectAnswer())
-                        .isImg(alternativeDto.isImg())
-                        .text(alternativeDto.getText())
+                Activity newActivity = Activity.builder()
+                        .lessonId(newLesson.getId())
+                        .moduleId(newModule.getId())
+                        .title(activityDto.getTitle())
+                        .description(activityDto.getDescription())
+                        .text(activityDto.getText())
+                        .urlImg(activityDto.getUrlImg())
+                        .typeId(activityDto.getTypeId())
                         .build();
-                alternativeRepository.save(newAlternative);
+
+                newActivity = activityRepository.save(newActivity);
+
+                for (AlternativeDto alternativeDto : activityDto.getAlternativeList()) {
+                    Alternative newAlternative = Alternative.builder()
+                            .activityId(newActivity.getId())
+                            .correctAnswer(alternativeDto.isCorrectAnswer())
+                            .isImg(alternativeDto.isImg())
+                            .text(alternativeDto.getText())
+                            .build();
+
+                    alternativeRepository.save(newAlternative);
+                }
             }
         }
+
         return newModule;
     }
 
-
-}
+}
\ No newline at end of file