Publish user skill levels via Event

build.gradle

@@ -107,8 +107,8 @@ repositories {
 
 dependencies {
 
-	implementation 'de.unistuttgart.iste.meitrex:meitrex-common:1.2.6'
-	implementation 'de.unistuttgart.iste.meitrex:content_service:1.0.8'
+	implementation 'de.unistuttgart.iste.meitrex:meitrex-common:1.4.4'
+	implementation 'de.unistuttgart.iste.meitrex:content_service:1.5.0rc1'
 
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 	implementation 'org.springframework.boot:spring-boot-starter-graphql'
@@ -127,7 +127,7 @@ dependencies {
 	runtimeOnly 'org.postgresql:postgresql'
 	annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'
 	annotationProcessor 'org.projectlombok:lombok'
-	testImplementation 'de.unistuttgart.iste.meitrex:meitrex-common-test:1.2.6'
+	testImplementation 'de.unistuttgart.iste.meitrex:meitrex-common-test:1.4.4'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework:spring-webflux'
 	testImplementation 'org.springframework.graphql:spring-graphql-test'

src/main/java/de/unistuttgart/iste/meitrex/skilllevel_service/service/calculation/SkillLevelCalculator.java

@@ -1,8 +1,9 @@
 package de.unistuttgart.iste.meitrex.skilllevel_service.service.calculation;
 
 
+import de.unistuttgart.iste.meitrex.common.dapr.TopicPublisher;
 import de.unistuttgart.iste.meitrex.common.event.ItemResponse;
-import de.unistuttgart.iste.meitrex.common.event.LevelOfBloomsTaxonomy;
+import de.unistuttgart.iste.meitrex.common.event.skilllevels.UserSkillLevelChangedEvent;
 import de.unistuttgart.iste.meitrex.generated.dto.BloomLevel;
 import de.unistuttgart.iste.meitrex.skilllevel_service.persistence.entity.*;
 import de.unistuttgart.iste.meitrex.skilllevel_service.persistence.repository.AllSkillLevelsRepository;
@@ -34,6 +35,7 @@ public class SkillLevelCalculator {
     private final BloomLevelAbilityRepository bloomLevelAbilityRepository;
 
     private final AllSkillLevelsRepository allSkillLevelsRepository;
+    private final TopicPublisher topicPublisher;
 
     private final static float ALPHA = 0.05f;
     private final static float BETA = 1f;
@@ -82,8 +84,7 @@ private void calculate(final UUID userId, final ItemResponse response) {
             skillAbilities.add(ability.getAbility());
         }
         List<Float> bloomLevelAbilities = new ArrayList<Float>();
-        for (LevelOfBloomsTaxonomy levelOfBloomsTaxonomy : response.getLevelsOfBloomsTaxonomy()) {
-            BloomLevel level = mapLevelOfBloomsTaxonomyToBloomLevel(levelOfBloomsTaxonomy);
+        for (BloomLevel level : response.getLevelsOfBloomsTaxonomy()) {
             BloomLevelAbilityEntity ability = bloomLevelAbilityRepository.findByUserIdAndBloomLevel(userId, level);
             if (ability == null) {
                 ability = createBloomAbility(userId, level);
@@ -103,8 +104,7 @@ private void calculate(final UUID userId, final ItemResponse response) {
         for (UUID skillId : response.getSkillIds()) {
             updateSkillAbility(userId, skillId, difficulty, correctResponse, alpha);
         }
-        for (LevelOfBloomsTaxonomy levelOfBloomsTaxonomy : response.getLevelsOfBloomsTaxonomy()) {
-            BloomLevel level = mapLevelOfBloomsTaxonomyToBloomLevel(levelOfBloomsTaxonomy);
+        for (BloomLevel level : response.getLevelsOfBloomsTaxonomy()) {
             updateBloomLevelAbilities(userId, level, difficulty, correctResponse, alpha);
         }
         updateSkillLevels(response, userId, prediction);
@@ -119,8 +119,7 @@ private void calculate(final UUID userId, final ItemResponse response) {
      */
     private void updateSkillLevels(ItemResponse response, UUID userId, float prediction) {
         for (UUID skillId : response.getSkillIds()) {
-            for (LevelOfBloomsTaxonomy levelOfBloomsTaxonomy : response.getLevelsOfBloomsTaxonomy()) {
-                BloomLevel level = mapLevelOfBloomsTaxonomyToBloomLevel(levelOfBloomsTaxonomy);
+            for (BloomLevel level : response.getLevelsOfBloomsTaxonomy()) {
                 updateSkillLevel(userId, skillId, level, response.getItemId(), response.getResponse(), prediction);
             }
         }
@@ -170,6 +169,13 @@ private void updateSkillLevel(UUID userId, UUID skillId, BloomLevel bloomLevel,
         }
         setSkillLevelEntityBySkillType(entity, bloomLevel, skillLevelEntity);
         allSkillLevelsRepository.save(entity);
+        topicPublisher.notifyUserSkillLevelChanged(UserSkillLevelChangedEvent.builder()
+                .userId(userId)
+                .skillId(skillId)
+                .bloomLevel(bloomLevel)
+                .oldValue(oldAbility)
+                .newValue(newAbility)
+                .build());
     }
 
     /**
@@ -415,21 +421,4 @@ private SkillLevelEntity initializeSkillLevelEntity(final float initialValue) {
         skillLevelEntity.setLog(new ArrayList<>());
         return skillLevelEntity;
     }
-
-    /***
-     * maps the Level of Blooms Taxonomy from Dapr Topic to the same Level of Blooms Taxonomy of the DTO
-     * @param levelOfBloomsOfBloomsTaxonomy level of blooms Taxonomy
-     * @return mapped level for the DTO
-     */
-    private BloomLevel mapLevelOfBloomsTaxonomyToBloomLevel(LevelOfBloomsTaxonomy levelOfBloomsOfBloomsTaxonomy) {
-        return switch (levelOfBloomsOfBloomsTaxonomy) {
-            case LevelOfBloomsTaxonomy.UNDERSTAND -> BloomLevel.UNDERSTAND;
-            case LevelOfBloomsTaxonomy.REMEMBER -> BloomLevel.REMEMBER;
-            case LevelOfBloomsTaxonomy.APPLY -> BloomLevel.APPLY;
-            case LevelOfBloomsTaxonomy.ANALYZE -> BloomLevel.ANALYZE;
-            case LevelOfBloomsTaxonomy.EVALUATE -> BloomLevel.EVALUATE;
-            case LevelOfBloomsTaxonomy.CREATE -> BloomLevel.CREATE;
-        };
-    }
-
 }

src/main/resources/application.properties

@@ -4,6 +4,8 @@ spring.profiles.active=prod
 spring.graphql.graphiql.enabled=true
 spring.graphql.graphiql.path=/graphiql
 
+spring.graphql.schema.locations=classpath*:graphql/common/**/,classpath:graphql/**
+
 # increase max request header size because we transmit authorization data in the header and this might get large
 # if the user is in a lot of courses
 server.max-http-request-header-size=64000