Integrating the push notification system into all parts of the system

.github/workflows/mobile-ci.yml

@@ -21,16 +21,19 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v5
 
-      - name: Setup Java 17
+      - name: Setup Java 25
         uses: actions/setup-java@v5
         with:
-          java-version: '17'
+          java-version: '25'
           distribution: 'temurin'
           cache: 'gradle'
 
       - name: Make gradlew executable
         run: chmod +x gradlew
 
+      - name: Create google-services.json
+        run: echo "${{ secrets.GOOGLE_SERVICES_JSON }}" | base64 --decode > app/google-services.json
+
 
       - name: Build Android App
-        run: ./gradlew assembleDebug lintDebug testDebugUnitTest --no-daemon
+        run: ./gradlew spotlessCheck assembleDebug lintDebug testDebugUnitTest --no-daemon

.gitignore

@@ -2,4 +2,7 @@
 *.iml
 *.iws
 
-.vscode/
+.vscode/
+
+firebase-adminsdk.json
+google-services.json

backend/compose-messaging.yaml

@@ -41,8 +41,12 @@ services:
           echo "Broker not ready, retrying in 2s..."
           sleep 2
         done
+
         /opt/kafka/bin/kafka-topics.sh --bootstrap-server kafka:9092 --create --if-not-exists --topic s3-events --partitions 3 --replication-factor 1
-        echo "Topic s3-events created."
+
+        /opt/kafka/bin/kafka-topics.sh --bootstrap-server kafka:9092 --create --if-not-exists --topic analysis-results --partitions 3 --replication-factor 1
+
+        echo "Topics s3-events and analysis-results created."
 
 
 

backend/settings.gradle

@@ -1,4 +1,5 @@
 rootProject.name = 'backend'
 include 'smartjam-api'
 include 'smartjam-analyzer'
-include 'smartjam-common'
+include 'smartjam-common'
+include 'smartjam-notification'

backend/smartjam-analyzer/src/main/java/com/smartjam/smartjamanalyzer/SmartjamAnalyzerApplication.java → backend/smartjam-analyzer/src/main/java/com/smartjam/analyzer/SmartjamAnalyzerApplication.java

@@ -1,4 +1,4 @@
-package com.smartjam.smartjamanalyzer;
+package com.smartjam.analyzer;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

backend/smartjam-analyzer/src/main/java/com/smartjam/smartjamanalyzer/api/kafka/S3StorageListener.java → backend/smartjam-analyzer/src/main/java/com/smartjam/analyzer/api/kafka/S3StorageListener.java

@@ -1,10 +1,10 @@
-package com.smartjam.smartjamanalyzer.api.kafka;
+package com.smartjam.analyzer.api.kafka;
 
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
 
-import com.smartjam.common.dto.s3.S3EventDto;
-import com.smartjam.smartjamanalyzer.application.AudioAnalysisUseCase;
+import com.smartjam.analyzer.application.AudioAnalysisUseCase;
+import com.smartjam.common.dto.s3.S3Event;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.kafka.annotation.KafkaListener;
@@ -32,14 +32,14 @@ public class S3StorageListener {
             topics = "s3-events",
             groupId = "smartjam-analyzer-group",
             concurrency = "3",
-            properties = {"spring.json.value.default.type=com.smartjam.common.dto.s3.S3EventDto"})
-    public void onFileUploaded(S3EventDto event, Acknowledgment ack) {
+            properties = {"spring.json.value.default.type=com.smartjam.common.dto.s3.S3Event"})
+    public void onFileUploaded(S3Event event, Acknowledgment ack) {
         if (event == null || event.records() == null || event.records().isEmpty()) {
             if (ack != null) ack.acknowledge();
             return;
         }
 
-        for (S3EventDto.S3Record s3Record : event.records()) {
+        for (S3Event.S3Record s3Record : event.records()) {
 
             try {
 
@@ -51,17 +51,17 @@ public void onFileUploaded(S3EventDto event, Acknowledgment ack) {
                 analysisUseCase.execute(bucket, fileKey);
 
             } catch (Exception e) {
-                log.error("Ошибка при разборе события S3: {}", e.getMessage());
+                log.error("Ошибка при разборе события S3: {}", e.getMessage(), e);
 
-                throw new RuntimeException(e);
+                throw e;
             }
         }
         if (ack != null) {
             ack.acknowledge();
         }
     }
 
-    private boolean isValid(S3EventDto.S3Record r) {
+    private boolean isValid(S3Event.S3Record r) {
         return r != null
                 && r.s3() != null
                 && r.s3().bucket() != null

backend/smartjam-analyzer/src/main/java/com/smartjam/smartjamanalyzer/application/AudioAnalysisUseCase.java → backend/smartjam-analyzer/src/main/java/com/smartjam/analyzer/application/AudioAnalysisUseCase.java

@@ -1,12 +1,15 @@
-package com.smartjam.smartjamanalyzer.application;
+package com.smartjam.analyzer.application;
 
 import java.nio.file.Path;
 import java.util.UUID;
 
+import com.smartjam.analyzer.domain.exception.AnalysisFatalException;
+import com.smartjam.analyzer.domain.model.AnalysisResult;
+import com.smartjam.analyzer.domain.model.FeatureSequence;
+import com.smartjam.analyzer.domain.port.*;
+import com.smartjam.common.dto.analysis.AnalysisFinishedEvent;
+import com.smartjam.common.dto.analysis.AnalysisType;
 import com.smartjam.common.model.AudioProcessingStatus;
-import com.smartjam.smartjamanalyzer.domain.model.AnalysisResult;
-import com.smartjam.smartjamanalyzer.domain.model.FeatureSequence;
-import com.smartjam.smartjamanalyzer.domain.port.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -30,6 +33,8 @@ public class AudioAnalysisUseCase {
     private final ResultRepository resultRepository;
     private final DebugVisualizer debugVisualizer;
 
+    private final AnalysisEventPublisher eventPublisher;
+
     public void execute(String bucket, String fileKey) {
 
         if (!BUCKET_REFERENCES.equals(bucket) && !BUCKET_SUBMISSIONS.equals(bucket)) {
@@ -74,15 +79,27 @@ public void execute(String bucket, String fileKey) {
 
             log.info("Результаты обработки {}: \n{}", fileKey, watch.prettyPrint());
 
+        } catch (AnalysisFatalException e) {
+            log.error("Fatal analysis error for file {}: {}", fileKey, e.getMessage(), e);
+
+            updateStatus(bucket, entityId, AudioProcessingStatus.FAILED, e.getMessage());
+            eventPublisher.publish(AnalysisFinishedEvent.builder()
+                    .targetId(entityId)
+                    .type(BUCKET_REFERENCES.equals(bucket) ? AnalysisType.REFERENCE : AnalysisType.SUBMISSION)
+                    .status(AudioProcessingStatus.FAILED)
+                    .errorMessage(e.getMessage())
+                    .build());
         } catch (Exception e) {
 
             String errorMsg =
                     e.getMessage() != null ? e.getMessage() : e.getClass().getSimpleName();
 
-            log.error("Ошибка в UseCase для файла {}: {}", fileKey, errorMsg, e);
+            log.error("Technical error for file {}: {}\n Retrying...", fileKey, errorMsg, e);
+
             updateStatus(bucket, entityId, AudioProcessingStatus.FAILED, errorMsg);
 
-            throw new RuntimeException("Business logic failed", e);
+            throw new RuntimeException("Technical failure, retrying...", e); // Хотелось бы сюда
+            // DLT и не ходить в базу при каждом ретрае
         }
     }
 
@@ -101,6 +118,12 @@ private void updateStatus(String bucket, UUID id, AudioProcessingStatus status,
     private void handleTeacherReference(UUID assignmentId, FeatureSequence teacherFeatures) {
         log.info("Сохраняем извлеченные признаки учителя для задания: {}", assignmentId);
         referenceRepository.save(assignmentId, teacherFeatures);
+
+        eventPublisher.publish(AnalysisFinishedEvent.builder()
+                .targetId(assignmentId)
+                .type(AnalysisType.REFERENCE)
+                .status(AudioProcessingStatus.COMPLETED)
+                .build());
     }
 
     private void handleStudentSubmission(UUID submissionId, FeatureSequence studentFeatures) {
@@ -109,17 +132,24 @@ private void handleStudentSubmission(UUID submissionId, FeatureSequence studentF
         UUID assignmentId = resultRepository
                 .findAssignmentIdBySubmissionId(submissionId)
                 .orElseThrow(() ->
-                        new IllegalStateException("Submission " + submissionId + " is not linked to any assignment"));
+                        new AnalysisFatalException("Submission " + submissionId + " is not linked to any assignment"));
 
         FeatureSequence teacherFeatures = referenceRepository
                 .findFeaturesById(assignmentId)
-                .orElseThrow(() -> new IllegalStateException(
+                .orElseThrow(() -> new AnalysisFatalException(
                         "Teacher reference features not found for assignment: " + assignmentId));
 
         AnalysisResult result = performanceEvaluator.evaluate(teacherFeatures, studentFeatures);
 
         resultRepository.save(submissionId, result);
 
+        eventPublisher.publish(AnalysisFinishedEvent.builder()
+                .targetId(submissionId)
+                .type(AnalysisType.SUBMISSION)
+                .status(AudioProcessingStatus.COMPLETED)
+                .totalScore(result.totalScore())
+                .build());
+
         try {
             debugVisualizer.generateHeatmap(result, "debug_" + submissionId + ".png");
         } catch (Exception e) {

backend/smartjam-analyzer/src/main/java/com/smartjam/analyzer/domain/exception/AnalysisFatalException.java

@@ -0,0 +1,11 @@
+package com.smartjam.analyzer.domain.exception;
+
+/**
+ * Exception thrown when a non-recoverable error occurs during audio analysis. Indicates that the process cannot be
+ * successfully retried (e.g., missing metadata in DB).
+ */
+public class AnalysisFatalException extends RuntimeException {
+    public AnalysisFatalException(String message) {
+        super(message);
+    }
+}

backend/smartjam-analyzer/src/main/java/com/smartjam/smartjamanalyzer/domain/model/AnalysisResult.java → backend/smartjam-analyzer/src/main/java/com/smartjam/analyzer/domain/model/AnalysisResult.java

@@ -1,4 +1,4 @@
-package com.smartjam.smartjamanalyzer.domain.model;
+package com.smartjam.analyzer.domain.model;
 
 import java.util.List;
 

backend/smartjam-analyzer/src/main/java/com/smartjam/smartjamanalyzer/domain/model/FeatureSequence.java → backend/smartjam-analyzer/src/main/java/com/smartjam/analyzer/domain/model/FeatureSequence.java

@@ -1,4 +1,4 @@
-package com.smartjam.smartjamanalyzer.domain.model;
+package com.smartjam.analyzer.domain.model;
 
 import java.util.List;
 

backend/smartjam-analyzer/src/main/java/com/smartjam/analyzer/domain/port/AnalysisEventPublisher.java

@@ -0,0 +1,7 @@
+package com.smartjam.analyzer.domain.port;
+
+import com.smartjam.common.dto.analysis.AnalysisFinishedEvent;
+
+public interface AnalysisEventPublisher {
+    void publish(AnalysisFinishedEvent event);
+}

backend/smartjam-analyzer/src/main/java/com/smartjam/smartjamanalyzer/domain/port/AudioConverter.java → backend/smartjam-analyzer/src/main/java/com/smartjam/analyzer/domain/port/AudioConverter.java

@@ -1,4 +1,4 @@
-package com.smartjam.smartjamanalyzer.domain.port;
+package com.smartjam.analyzer.domain.port;
 
 import java.nio.file.Path;
 

backend/smartjam-analyzer/src/main/java/com/smartjam/smartjamanalyzer/domain/port/AudioStorage.java → backend/smartjam-analyzer/src/main/java/com/smartjam/analyzer/domain/port/AudioStorage.java

@@ -1,4 +1,4 @@
-package com.smartjam.smartjamanalyzer.domain.port;
+package com.smartjam.analyzer.domain.port;
 
 import java.nio.file.Path;
 

backend/smartjam-analyzer/src/main/java/com/smartjam/smartjamanalyzer/domain/port/DebugVisualizer.java → backend/smartjam-analyzer/src/main/java/com/smartjam/analyzer/domain/port/DebugVisualizer.java

@@ -1,6 +1,6 @@
-package com.smartjam.smartjamanalyzer.domain.port;
+package com.smartjam.analyzer.domain.port;
 
-import com.smartjam.smartjamanalyzer.domain.model.AnalysisResult;
+import com.smartjam.analyzer.domain.model.AnalysisResult;
 
 /**
  * Port for generating visual artifacts of the analysis process. Typically used for debugging and fine-tuning DTW

backend/smartjam-analyzer/src/main/java/com/smartjam/smartjamanalyzer/domain/port/FeatureExtractor.java → backend/smartjam-analyzer/src/main/java/com/smartjam/analyzer/domain/port/FeatureExtractor.java

@@ -1,8 +1,8 @@
-package com.smartjam.smartjamanalyzer.domain.port;
+package com.smartjam.analyzer.domain.port;
 
 import java.nio.file.Path;
 
-import com.smartjam.smartjamanalyzer.domain.model.FeatureSequence;
+import com.smartjam.analyzer.domain.model.FeatureSequence;
 
 /** Port for extracting musical features from an audio file. */
 public interface FeatureExtractor {

backend/smartjam-analyzer/src/main/java/com/smartjam/analyzer/domain/port/PerformanceEvaluator.java

@@ -0,0 +1,8 @@
+package com.smartjam.analyzer.domain.port;
+
+import com.smartjam.analyzer.domain.model.AnalysisResult;
+import com.smartjam.analyzer.domain.model.FeatureSequence;
+
+public interface PerformanceEvaluator {
+    AnalysisResult evaluate(FeatureSequence reference, FeatureSequence student);
+}

backend/smartjam-analyzer/src/main/java/com/smartjam/smartjamanalyzer/domain/port/ReferenceRepository.java → backend/smartjam-analyzer/src/main/java/com/smartjam/analyzer/domain/port/ReferenceRepository.java

@@ -1,10 +1,10 @@
-package com.smartjam.smartjamanalyzer.domain.port;
+package com.smartjam.analyzer.domain.port;
 
 import java.util.Optional;
 import java.util.UUID;
 
+import com.smartjam.analyzer.domain.model.FeatureSequence;
 import com.smartjam.common.model.AudioProcessingStatus;
-import com.smartjam.smartjamanalyzer.domain.model.FeatureSequence;
 
 /** Domain port for managing teacher reference features. */
 public interface ReferenceRepository {

backend/smartjam-analyzer/src/main/java/com/smartjam/smartjamanalyzer/domain/port/ResultRepository.java → backend/smartjam-analyzer/src/main/java/com/smartjam/analyzer/domain/port/ResultRepository.java

@@ -1,10 +1,10 @@
-package com.smartjam.smartjamanalyzer.domain.port;
+package com.smartjam.analyzer.domain.port;
 
 import java.util.Optional;
 import java.util.UUID;
 
+import com.smartjam.analyzer.domain.model.AnalysisResult;
 import com.smartjam.common.model.AudioProcessingStatus;
-import com.smartjam.smartjamanalyzer.domain.model.AnalysisResult;
 
 /**
  * Port for managing student submissions and their analysis results. Handles the persistence of evaluation scores and

backend/smartjam-analyzer/src/main/java/com/smartjam/smartjamanalyzer/domain/port/Workspace.java → backend/smartjam-analyzer/src/main/java/com/smartjam/analyzer/domain/port/Workspace.java

@@ -1,4 +1,4 @@
-package com.smartjam.smartjamanalyzer.domain.port;
+package com.smartjam.analyzer.domain.port;
 
 import java.io.IOException;
 import java.nio.file.Path;

backend/smartjam-analyzer/src/main/java/com/smartjam/smartjamanalyzer/domain/port/WorkspaceFactory.java → backend/smartjam-analyzer/src/main/java/com/smartjam/analyzer/domain/port/WorkspaceFactory.java

@@ -1,4 +1,4 @@
-package com.smartjam.smartjamanalyzer.domain.port;
+package com.smartjam.analyzer.domain.port;
 
 /**
  * Factory port for creating isolated {@link Workspace} instances. This abstraction allows business logic to acquire

backend/smartjam-analyzer/src/main/java/com/smartjam/smartjamanalyzer/domain/service/DtwPerformanceEvaluator.java → backend/smartjam-analyzer/src/main/java/com/smartjam/analyzer/domain/service/DtwPerformanceEvaluator.java

@@ -1,14 +1,14 @@
-package com.smartjam.smartjamanalyzer.domain.service;
+package com.smartjam.analyzer.domain.service;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import com.smartjam.analyzer.domain.model.AnalysisResult;
+import com.smartjam.analyzer.domain.model.FeatureSequence;
+import com.smartjam.analyzer.domain.port.PerformanceEvaluator;
 import com.smartjam.common.model.FeedbackEvent;
 import com.smartjam.common.model.FeedbackType;
-import com.smartjam.smartjamanalyzer.domain.model.AnalysisResult;
-import com.smartjam.smartjamanalyzer.domain.model.FeatureSequence;
-import com.smartjam.smartjamanalyzer.domain.port.PerformanceEvaluator;
 
 /**
  * Performance evaluator using Dynamic Time Warping (DTW) and Cosine Similarity. Provides granular scoring for pitch and

backend/smartjam-analyzer/src/main/java/com/smartjam/smartjamanalyzer/infrastructure/analysis/DspProperties.java → backend/smartjam-analyzer/src/main/java/com/smartjam/analyzer/infrastructure/analysis/DspProperties.java

@@ -1,4 +1,4 @@
-package com.smartjam.smartjamanalyzer.infrastructure.analysis;
+package com.smartjam.analyzer.infrastructure.analysis;
 
 import jakarta.validation.constraints.Min;
 

backend/smartjam-analyzer/src/main/java/com/smartjam/smartjamanalyzer/infrastructure/analysis/DtwConfig.java → backend/smartjam-analyzer/src/main/java/com/smartjam/analyzer/infrastructure/analysis/DtwConfig.java

@@ -1,7 +1,7 @@
-package com.smartjam.smartjamanalyzer.infrastructure.analysis;
+package com.smartjam.analyzer.infrastructure.analysis;
 
-import com.smartjam.smartjamanalyzer.domain.port.PerformanceEvaluator;
-import com.smartjam.smartjamanalyzer.domain.service.DtwPerformanceEvaluator;
+import com.smartjam.analyzer.domain.port.PerformanceEvaluator;
+import com.smartjam.analyzer.domain.service.DtwPerformanceEvaluator;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;

backend/smartjam-analyzer/src/main/java/com/smartjam/smartjamanalyzer/infrastructure/analysis/TarsosFeatureExtractor.java → backend/smartjam-analyzer/src/main/java/com/smartjam/analyzer/infrastructure/analysis/TarsosFeatureExtractor.java

@@ -1,4 +1,4 @@
-package com.smartjam.smartjamanalyzer.infrastructure.analysis;
+package com.smartjam.analyzer.infrastructure.analysis;
 
 import java.io.File;
 import java.nio.file.Path;
@@ -10,8 +10,8 @@
 import be.tarsos.dsp.AudioProcessor;
 import be.tarsos.dsp.ConstantQ;
 import be.tarsos.dsp.io.jvm.AudioDispatcherFactory;
-import com.smartjam.smartjamanalyzer.domain.model.FeatureSequence;
-import com.smartjam.smartjamanalyzer.domain.port.FeatureExtractor;
+import com.smartjam.analyzer.domain.model.FeatureSequence;
+import com.smartjam.analyzer.domain.port.FeatureExtractor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;

backend/smartjam-analyzer/src/main/java/com/smartjam/smartjamanalyzer/infrastructure/converter/FFmpegConfig.java → backend/smartjam-analyzer/src/main/java/com/smartjam/analyzer/infrastructure/converter/FFmpegConfig.java

@@ -1,4 +1,4 @@
-package com.smartjam.smartjamanalyzer.infrastructure.converter;
+package com.smartjam.analyzer.infrastructure.converter;
 
 import java.io.IOException;