diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 71cfcd9..fceed17 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -1,11 +1,13 @@ name: Building Docker Image on: - workflow_run: - workflows: - - Testing CI pipeline - types: - - completed + workflow_dispatch: +# enable when deployment is ready +# workflow_run: +# workflows: +# - Testing CI pipeline +# types: +# - completed jobs: docker-build: diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index d07452f..330cc57 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -6,25 +6,32 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Set up JDK 17 - uses: actions/setup-java@v3 + - name: Set up JDK 21 + uses: actions/setup-java@v4 with: - java-version: '17' + java-version: '21' distribution: 'temurin' - name: Validate Gradle wrapper - uses: gradle/wrapper-validation-action@ccb4328a959376b642e027874838f60f8e596de3 + uses: gradle/wrapper-validation-action@v2 - name: Run chmod to make gradlew executable run: chmod +x gradlew - + - name: Cache SonarCloud packages + uses: actions/cache@v4 + with: + path: ~/.sonar/cache + key: ${{ runner.os }}-sonar + restore-keys: ${{ runner.os }}-sonar - name: Execute tests env: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629 + uses: gradle/gradle-build-action@v3 with: arguments: cleanTest test jacocoTestReport sonar + + diff --git a/Dockerfile b/Dockerfile index 4d0ee21..7881dc4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:experimental -FROM gradle:7.6.2-jdk17 AS build +FROM gradle:8-jdk21 AS build WORKDIR /workspace/app # Copy only gradle files to container so we can install them diff --git a/build.gradle b/build.gradle index 194c2e2..866e340 100644 --- a/build.gradle +++ b/build.gradle @@ -1,16 +1,16 @@ plugins { id 'java' - id 'org.springframework.boot' version '3.0.6' - id 'io.spring.dependency-management' version '1.1.0' - id "io.github.kobylynskyi.graphql.codegen" version "5.7.2" - id "org.sonarqube" version "4.0.0.2929" + id 'org.springframework.boot' version '3.+' + id 'io.spring.dependency-management' version '1.+' + id "io.github.kobylynskyi.graphql.codegen" version "5.+" + id "org.sonarqube" version "5.+" id "jacoco" } -group = 'de.unistuttgart.iste.gits' +group = 'de.unistuttgart.iste.meitrex' version = '0.0.1-SNAPSHOT' -sourceCompatibility = '17' +sourceCompatibility = '21' def jacocoEnabled = System.properties.getProperty("jacocoEnabled") ?: "true" @@ -26,7 +26,27 @@ sonarqube { property("sonar.organization", "meitrex") property("sonar.host.url", "https://sonarcloud.io") } +} + +// workaround to fetch schema files from external repositories +// as gradle only supports java dependencies +def fetchFilesFromRepo(String repository, List files) { + def baseurl = "https://raw.githubusercontent.com/MEITREX/" + def fileUrl = "${baseurl}${repository}/main/src/main/resources/graphql/" + def outputDir = "src/main/resources/graphql" + + files.each { file -> + tasks.register("fetchExternalSchema-${file.capitalize()}", Exec) { + commandLine 'curl', "${fileUrl}${file}", '-o', "${outputDir}/${repository}/${file}" + } + } +} + +fetchFilesFromRepo("common", ["directives.graphqls", "scalars.graphqls", "sortFilterPagination.graphqls"]) +// run this task to fetch the latest schema files from the external github repositories +tasks.register("fetchAllExternalSchemas", Task) { + dependsOn tasks.matching { it.name.startsWith("fetchExternalSchema-") } } // Automatically generate DTOs from GraphQL schema: @@ -34,7 +54,7 @@ graphqlCodegen { // all config options: // https://github.com/kobylynskyi/graphql-java-codegen/blob/main/docs/codegen-options.md outputDir = new File("$buildDir/generated") - packageName = "de.unistuttgart.iste.gits.generated.dto" + packageName = "de.unistuttgart.iste.meitrex.generated.dto" generatedAnnotation = "jakarta.annotation.Generated" modelValidationAnnotation = "jakarta.validation.constraints.NotNull" generateApis = false // set to false as the generator does not support spring boot graphQL @@ -48,6 +68,7 @@ graphqlCodegen { ] generateEqualsAndHashCode = true generateToString = true + fieldsWithResolvers = ["@OnDemand"] } // Automatically generate GraphQL code on project build: @@ -56,6 +77,16 @@ compileJava.dependsOn 'graphqlCodegen' // Add generated sources to your project source sets: sourceSets.main.java.srcDir "$buildDir/generated" +// Automatically generate API documentation on project build: +// Remark: Only works on Windows +tasks.register('generateApiDocs', Exec) { + commandLine 'cmd', '/c', 'generate_api_doc.bat' +} + +tasks.named('assemble') { + finalizedBy('generateApiDocs') +} + configurations { compileOnly { extendsFrom annotationProcessor @@ -67,16 +98,15 @@ repositories { } dependencies { - implementation 'de.unistuttgart.iste.gits:gits-common:0.6.4' - implementation 'com.google.code.findbugs:jsr305:3.0.2' // removes a gradle warning about an unknown annotation + implementation 'de.unistuttgart.iste.meitrex:meitrex-common:1.0.6' implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-graphql' implementation 'org.springframework.boot:spring-boot-starter-validation' implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'org.modelmapper:modelmapper:3.+' - implementation 'com.graphql-java:graphql-java-extended-scalars:20.0' - implementation 'com.graphql-java:graphql-java-extended-validation:20.0' + implementation 'com.graphql-java:graphql-java-extended-scalars:22.0' + implementation 'com.graphql-java:graphql-java-extended-validation:22.0' implementation 'io.dapr:dapr-sdk:1.9.0' // Dapr's core SDK with all features, except Actors. implementation 'io.dapr:dapr-sdk-springboot:1.9.0' // Dapr's SDK integration with SpringBoot compileOnly 'org.projectlombok:lombok' @@ -84,18 +114,16 @@ dependencies { runtimeOnly 'org.postgresql:postgresql' annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor' annotationProcessor 'org.projectlombok:lombok' - testImplementation 'de.unistuttgart.iste.gits:gits-common-test:0.3.2' + testImplementation 'de.unistuttgart.iste.meitrex:meitrex-common-test:1.0.6' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework:spring-webflux' testImplementation 'org.springframework.graphql:spring-graphql-test' - testImplementation "org.mockito:mockito-core:3.+" + testImplementation "org.mockito:mockito-core:5.+" testImplementation 'org.hamcrest:hamcrest:2.+' - testImplementation "org.testcontainers:postgresql:1.18.3" - testImplementation "org.testcontainers:junit-jupiter:1.18.3" + testImplementation "org.testcontainers:postgresql:1.+" + testImplementation "org.testcontainers:junit-jupiter:1.+" } tasks.named('test') { useJUnitPlatform() } - -tasks.withType(Test).configureEach { testLogging.showStandardStreams = true } diff --git a/components/pubsub.yaml b/components/pubsub.yaml index 3b231c3..25b4fe0 100644 --- a/components/pubsub.yaml +++ b/components/pubsub.yaml @@ -1,7 +1,7 @@ apiVersion: dapr.io/v1alpha1 kind: Component metadata: - name: gits + name: meitrex spec: type: pubsub.redis version: v1 diff --git a/generate_api_doc.bat b/generate_api_doc.bat index 8eac2a1..d4f2984 100644 --- a/generate_api_doc.bat +++ b/generate_api_doc.bat @@ -1,16 +1,27 @@ @echo off echo Generating API documentation... -echo This requires the service to be running +echo This requires npm to be installed! REM clear old docs del api.md +REM Delete the combined file +del combined.graphql -set port=9001 set title=Quiz Service API REM install graphql-markdown if not installed if not exist node_modules\graphql-markdown ( - start cmd /C npm install graphql-markdown + echo Installing graphql-markdown, run this script again after installation + npm install graphql-markdown ) -npx graphql-markdown "http://localhost:%port%/graphql" --title "%title%" > api.md +REM Concatenate all graphql files into one +for /r src\main\resources\graphql %%i in (*.graphqls) do type "%%i" >> combined.graphql + +REM Run npx in a separate cmd instance +cmd /c npx graphql-markdown combined.graphql --title "%title%" > api.md + +echo API documentation generated. + +REM Delete the combined file +del combined.graphql diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5083229..509c4a2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/jacoco.gradle b/jacoco.gradle index c7852e4..e7e99ec 100644 --- a/jacoco.gradle +++ b/jacoco.gradle @@ -1,16 +1,15 @@ jacoco { - toolVersion = "0.8.8" + toolVersion = "0.8.11" } test { finalizedBy jacocoTestReport } - jacocoTestReport { reports { - xml.enabled true - html.enabled true + xml.required.set(true) + html.required.set(true) html.outputLocation = layout.buildDirectory.dir('jacocoHtml') } } diff --git a/settings.gradle b/settings.gradle index 1143ee6..e6cff1c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,9 +2,9 @@ rootProject.name = 'quiz_service' sourceControl { gitRepository(uri('https://github.com/MEITREX/common')) { - producesModule('de.unistuttgart.iste.gits:gits-common') + producesModule('de.unistuttgart.iste.meitrex:meitrex-common') } gitRepository(uri('https://github.com/MEITREX/common_test')) { - producesModule('de.unistuttgart.iste.gits:gits-common-test') + producesModule('de.unistuttgart.iste.meitrex:meitrex-common-test') } } \ No newline at end of file diff --git a/src/main/java/de/unistuttgart/iste/gits/quiz_service/QuizServiceApplication.java b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/QuizServiceApplication.java similarity index 87% rename from src/main/java/de/unistuttgart/iste/gits/quiz_service/QuizServiceApplication.java rename to src/main/java/de/unistuttgart/iste/meitrex/quiz_service/QuizServiceApplication.java index 9c0533a..5489317 100644 --- a/src/main/java/de/unistuttgart/iste/gits/quiz_service/QuizServiceApplication.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/QuizServiceApplication.java @@ -1,4 +1,4 @@ -package de.unistuttgart.iste.gits.quiz_service; +package de.unistuttgart.iste.meitrex.quiz_service; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/src/main/java/de/unistuttgart/iste/gits/quiz_service/config/DevTopicPublisherConfiguration.java b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/config/DevTopicPublisherConfiguration.java similarity index 66% rename from src/main/java/de/unistuttgart/iste/gits/quiz_service/config/DevTopicPublisherConfiguration.java rename to src/main/java/de/unistuttgart/iste/meitrex/quiz_service/config/DevTopicPublisherConfiguration.java index a456918..1f2486e 100644 --- a/src/main/java/de/unistuttgart/iste/gits/quiz_service/config/DevTopicPublisherConfiguration.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/config/DevTopicPublisherConfiguration.java @@ -1,9 +1,11 @@ -package de.unistuttgart.iste.gits.quiz_service.config; +package de.unistuttgart.iste.meitrex.quiz_service.config; -import de.unistuttgart.iste.gits.common.dapr.MockTopicPublisher; -import de.unistuttgart.iste.gits.common.dapr.TopicPublisher; +import de.unistuttgart.iste.meitrex.common.dapr.MockTopicPublisher; +import de.unistuttgart.iste.meitrex.common.dapr.TopicPublisher; import lombok.extern.slf4j.Slf4j; -import org.springframework.context.annotation.*; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Profile; /** * This is a dev-config for the TopicPublisher. It is intended to be used for development only. diff --git a/src/main/java/de/unistuttgart/iste/gits/quiz_service/config/GraphQlScalarsAndValidationConfiguration.java b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/config/GraphQlScalarsAndValidationConfiguration.java similarity index 95% rename from src/main/java/de/unistuttgart/iste/gits/quiz_service/config/GraphQlScalarsAndValidationConfiguration.java rename to src/main/java/de/unistuttgart/iste/meitrex/quiz_service/config/GraphQlScalarsAndValidationConfiguration.java index 53e695c..3758529 100644 --- a/src/main/java/de/unistuttgart/iste/gits/quiz_service/config/GraphQlScalarsAndValidationConfiguration.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/config/GraphQlScalarsAndValidationConfiguration.java @@ -1,4 +1,4 @@ -package de.unistuttgart.iste.gits.quiz_service.config; +package de.unistuttgart.iste.meitrex.quiz_service.config; import graphql.scalars.ExtendedScalars; import graphql.validation.rules.OnValidationErrorStrategy; diff --git a/src/main/java/de/unistuttgart/iste/gits/quiz_service/config/ModelMapperConfiguration.java b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/config/ModelMapperConfiguration.java similarity index 87% rename from src/main/java/de/unistuttgart/iste/gits/quiz_service/config/ModelMapperConfiguration.java rename to src/main/java/de/unistuttgart/iste/meitrex/quiz_service/config/ModelMapperConfiguration.java index f573350..d321a21 100644 --- a/src/main/java/de/unistuttgart/iste/gits/quiz_service/config/ModelMapperConfiguration.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/config/ModelMapperConfiguration.java @@ -1,4 +1,4 @@ -package de.unistuttgart.iste.gits.quiz_service.config; +package de.unistuttgart.iste.meitrex.quiz_service.config; import org.modelmapper.ModelMapper; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/de/unistuttgart/iste/gits/quiz_service/config/RequestHeaderUserInterceptor.java b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/config/RequestHeaderUserInterceptor.java similarity index 64% rename from src/main/java/de/unistuttgart/iste/gits/quiz_service/config/RequestHeaderUserInterceptor.java rename to src/main/java/de/unistuttgart/iste/meitrex/quiz_service/config/RequestHeaderUserInterceptor.java index b3f892e..e57c324 100644 --- a/src/main/java/de/unistuttgart/iste/gits/quiz_service/config/RequestHeaderUserInterceptor.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/config/RequestHeaderUserInterceptor.java @@ -1,10 +1,12 @@ -package de.unistuttgart.iste.gits.quiz_service.config; +package de.unistuttgart.iste.meitrex.quiz_service.config; -import de.unistuttgart.iste.gits.common.user_handling.RequestHeaderUserProcessor; +import de.unistuttgart.iste.meitrex.common.user_handling.RequestHeaderUserProcessor; import lombok.SneakyThrows; import org.jetbrains.annotations.NotNull; import org.springframework.context.annotation.Configuration; -import org.springframework.graphql.server.*; +import org.springframework.graphql.server.WebGraphQlInterceptor; +import org.springframework.graphql.server.WebGraphQlRequest; +import org.springframework.graphql.server.WebGraphQlResponse; import reactor.core.publisher.Mono; /** diff --git a/src/main/java/de/unistuttgart/iste/gits/quiz_service/config/TopicPublisherConfiguration.java b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/config/TopicPublisherConfiguration.java similarity index 81% rename from src/main/java/de/unistuttgart/iste/gits/quiz_service/config/TopicPublisherConfiguration.java rename to src/main/java/de/unistuttgart/iste/meitrex/quiz_service/config/TopicPublisherConfiguration.java index 5a4bb5e..258dcd3 100644 --- a/src/main/java/de/unistuttgart/iste/gits/quiz_service/config/TopicPublisherConfiguration.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/config/TopicPublisherConfiguration.java @@ -1,6 +1,6 @@ -package de.unistuttgart.iste.gits.quiz_service.config; +package de.unistuttgart.iste.meitrex.quiz_service.config; -import de.unistuttgart.iste.gits.common.dapr.TopicPublisher; +import de.unistuttgart.iste.meitrex.common.dapr.TopicPublisher; import io.dapr.client.DaprClientBuilder; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/de/unistuttgart/iste/gits/quiz_service/controller/QuizController.java b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/controller/QuizController.java similarity index 92% rename from src/main/java/de/unistuttgart/iste/gits/quiz_service/controller/QuizController.java rename to src/main/java/de/unistuttgart/iste/meitrex/quiz_service/controller/QuizController.java index 8de92e3..a35da3a 100644 --- a/src/main/java/de/unistuttgart/iste/gits/quiz_service/controller/QuizController.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/controller/QuizController.java @@ -1,11 +1,11 @@ -package de.unistuttgart.iste.gits.quiz_service.controller; - -import de.unistuttgart.iste.gits.common.exception.NoAccessToCourseException; -import de.unistuttgart.iste.gits.common.user_handling.LoggedInUser; -import de.unistuttgart.iste.gits.common.user_handling.LoggedInUser.UserRoleInCourse; -import de.unistuttgart.iste.gits.generated.dto.*; -import de.unistuttgart.iste.gits.quiz_service.persistence.entity.QuizEntity; -import de.unistuttgart.iste.gits.quiz_service.service.QuizService; +package de.unistuttgart.iste.meitrex.quiz_service.controller; + +import de.unistuttgart.iste.meitrex.common.exception.NoAccessToCourseException; +import de.unistuttgart.iste.meitrex.common.user_handling.LoggedInUser; +import de.unistuttgart.iste.meitrex.common.user_handling.LoggedInUser.UserRoleInCourse; +import de.unistuttgart.iste.meitrex.generated.dto.*; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.QuizEntity; +import de.unistuttgart.iste.meitrex.quiz_service.service.QuizService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.graphql.data.method.annotation.*; @@ -14,7 +14,7 @@ import java.util.List; import java.util.UUID; -import static de.unistuttgart.iste.gits.common.user_handling.UserCourseAccessValidator.validateUserHasAccessToCourse; +import static de.unistuttgart.iste.meitrex.common.user_handling.UserCourseAccessValidator.validateUserHasAccessToCourse; @Slf4j @Controller diff --git a/src/main/java/de/unistuttgart/iste/gits/quiz_service/controller/SubscriptionController.java b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/controller/SubscriptionController.java similarity index 70% rename from src/main/java/de/unistuttgart/iste/gits/quiz_service/controller/SubscriptionController.java rename to src/main/java/de/unistuttgart/iste/meitrex/quiz_service/controller/SubscriptionController.java index d3ebc42..b989fba 100644 --- a/src/main/java/de/unistuttgart/iste/gits/quiz_service/controller/SubscriptionController.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/controller/SubscriptionController.java @@ -1,12 +1,14 @@ -package de.unistuttgart.iste.gits.quiz_service.controller; +package de.unistuttgart.iste.meitrex.quiz_service.controller; -import de.unistuttgart.iste.gits.common.event.ContentChangeEvent; -import de.unistuttgart.iste.gits.quiz_service.service.QuizService; +import de.unistuttgart.iste.meitrex.common.event.ContentChangeEvent; +import de.unistuttgart.iste.meitrex.quiz_service.service.QuizService; import io.dapr.Topic; import io.dapr.client.domain.CloudEvent; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; import reactor.core.publisher.Mono; /** diff --git a/src/main/java/de/unistuttgart/iste/gits/quiz_service/exception/ExceptionResolver.java b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/exception/ExceptionResolver.java similarity index 83% rename from src/main/java/de/unistuttgart/iste/gits/quiz_service/exception/ExceptionResolver.java rename to src/main/java/de/unistuttgart/iste/meitrex/quiz_service/exception/ExceptionResolver.java index b4d42e4..a2ff9a3 100644 --- a/src/main/java/de/unistuttgart/iste/gits/quiz_service/exception/ExceptionResolver.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/exception/ExceptionResolver.java @@ -1,6 +1,6 @@ -package de.unistuttgart.iste.gits.quiz_service.exception; +package de.unistuttgart.iste.meitrex.quiz_service.exception; -import de.unistuttgart.iste.gits.common.exception.ExceptionToGraphQlErrorConverter; +import de.unistuttgart.iste.meitrex.common.exception.ExceptionToGraphQlErrorConverter; import graphql.GraphQLError; import graphql.schema.DataFetchingEnvironment; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/de/unistuttgart/iste/gits/quiz_service/persistence/entity/AssociationEmbeddable.java b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/persistence/entity/AssociationEmbeddable.java similarity index 71% rename from src/main/java/de/unistuttgart/iste/gits/quiz_service/persistence/entity/AssociationEmbeddable.java rename to src/main/java/de/unistuttgart/iste/meitrex/quiz_service/persistence/entity/AssociationEmbeddable.java index ec98cdd..73ad483 100644 --- a/src/main/java/de/unistuttgart/iste/gits/quiz_service/persistence/entity/AssociationEmbeddable.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/persistence/entity/AssociationEmbeddable.java @@ -1,8 +1,11 @@ -package de.unistuttgart.iste.gits.quiz_service.persistence.entity; +package de.unistuttgart.iste.meitrex.quiz_service.persistence.entity; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; @Embeddable @Data diff --git a/src/main/java/de/unistuttgart/iste/gits/quiz_service/persistence/entity/AssociationQuestionEntity.java b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/persistence/entity/AssociationQuestionEntity.java similarity index 75% rename from src/main/java/de/unistuttgart/iste/gits/quiz_service/persistence/entity/AssociationQuestionEntity.java rename to src/main/java/de/unistuttgart/iste/meitrex/quiz_service/persistence/entity/AssociationQuestionEntity.java index 8135fbd..e7a1a89 100644 --- a/src/main/java/de/unistuttgart/iste/gits/quiz_service/persistence/entity/AssociationQuestionEntity.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/persistence/entity/AssociationQuestionEntity.java @@ -1,6 +1,8 @@ -package de.unistuttgart.iste.gits.quiz_service.persistence.entity; +package de.unistuttgart.iste.meitrex.quiz_service.persistence.entity; -import jakarta.persistence.*; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; import lombok.*; import lombok.experimental.SuperBuilder; diff --git a/src/main/java/de/unistuttgart/iste/gits/quiz_service/persistence/entity/ClozeElementEmbeddable.java b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/persistence/entity/ClozeElementEmbeddable.java similarity index 66% rename from src/main/java/de/unistuttgart/iste/gits/quiz_service/persistence/entity/ClozeElementEmbeddable.java rename to src/main/java/de/unistuttgart/iste/meitrex/quiz_service/persistence/entity/ClozeElementEmbeddable.java index dea6171..25b83c1 100644 --- a/src/main/java/de/unistuttgart/iste/gits/quiz_service/persistence/entity/ClozeElementEmbeddable.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/persistence/entity/ClozeElementEmbeddable.java @@ -1,8 +1,11 @@ -package de.unistuttgart.iste.gits.quiz_service.persistence.entity; +package de.unistuttgart.iste.meitrex.quiz_service.persistence.entity; -import de.unistuttgart.iste.gits.generated.dto.ClozeElementType; +import de.unistuttgart.iste.meitrex.generated.dto.ClozeElementType; import jakarta.persistence.*; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; @Embeddable @Data diff --git a/src/main/java/de/unistuttgart/iste/gits/quiz_service/persistence/entity/ClozeQuestionEntity.java b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/persistence/entity/ClozeQuestionEntity.java similarity index 77% rename from src/main/java/de/unistuttgart/iste/gits/quiz_service/persistence/entity/ClozeQuestionEntity.java rename to src/main/java/de/unistuttgart/iste/meitrex/quiz_service/persistence/entity/ClozeQuestionEntity.java index 6ab9e87..4575ace 100644 --- a/src/main/java/de/unistuttgart/iste/gits/quiz_service/persistence/entity/ClozeQuestionEntity.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/persistence/entity/ClozeQuestionEntity.java @@ -1,7 +1,9 @@ -package de.unistuttgart.iste.gits.quiz_service.persistence.entity; +package de.unistuttgart.iste.meitrex.quiz_service.persistence.entity; -import jakarta.persistence.*; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; import lombok.*; import lombok.experimental.SuperBuilder; diff --git a/src/main/java/de/unistuttgart/iste/gits/quiz_service/persistence/entity/ExactAnswerQuestionEntity.java b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/persistence/entity/ExactAnswerQuestionEntity.java similarity index 76% rename from src/main/java/de/unistuttgart/iste/gits/quiz_service/persistence/entity/ExactAnswerQuestionEntity.java rename to src/main/java/de/unistuttgart/iste/meitrex/quiz_service/persistence/entity/ExactAnswerQuestionEntity.java index a407efc..e046ff2 100644 --- a/src/main/java/de/unistuttgart/iste/gits/quiz_service/persistence/entity/ExactAnswerQuestionEntity.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/persistence/entity/ExactAnswerQuestionEntity.java @@ -1,6 +1,8 @@ -package de.unistuttgart.iste.gits.quiz_service.persistence.entity; +package de.unistuttgart.iste.meitrex.quiz_service.persistence.entity; -import jakarta.persistence.*; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; import lombok.*; import lombok.experimental.SuperBuilder; diff --git a/src/main/java/de/unistuttgart/iste/gits/quiz_service/persistence/entity/MultipleChoiceAnswerEmbeddable.java b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/persistence/entity/MultipleChoiceAnswerEmbeddable.java similarity index 71% rename from src/main/java/de/unistuttgart/iste/gits/quiz_service/persistence/entity/MultipleChoiceAnswerEmbeddable.java rename to src/main/java/de/unistuttgart/iste/meitrex/quiz_service/persistence/entity/MultipleChoiceAnswerEmbeddable.java index 662c293..fac55af 100644 --- a/src/main/java/de/unistuttgart/iste/gits/quiz_service/persistence/entity/MultipleChoiceAnswerEmbeddable.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/persistence/entity/MultipleChoiceAnswerEmbeddable.java @@ -1,8 +1,11 @@ -package de.unistuttgart.iste.gits.quiz_service.persistence.entity; +package de.unistuttgart.iste.meitrex.quiz_service.persistence.entity; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; @Embeddable @Data diff --git a/src/main/java/de/unistuttgart/iste/gits/quiz_service/persistence/entity/MultipleChoiceQuestionEntity.java b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/persistence/entity/MultipleChoiceQuestionEntity.java similarity index 77% rename from src/main/java/de/unistuttgart/iste/gits/quiz_service/persistence/entity/MultipleChoiceQuestionEntity.java rename to src/main/java/de/unistuttgart/iste/meitrex/quiz_service/persistence/entity/MultipleChoiceQuestionEntity.java index e5c95f1..7dafef8 100644 --- a/src/main/java/de/unistuttgart/iste/gits/quiz_service/persistence/entity/MultipleChoiceQuestionEntity.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/persistence/entity/MultipleChoiceQuestionEntity.java @@ -1,11 +1,18 @@ -package de.unistuttgart.iste.gits.quiz_service.persistence.entity; - -import de.unistuttgart.iste.gits.generated.dto.QuestionType; -import jakarta.persistence.*; -import lombok.*; +package de.unistuttgart.iste.meitrex.quiz_service.persistence.entity; + +import de.unistuttgart.iste.meitrex.generated.dto.QuestionType; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import lombok.Builder; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; import lombok.experimental.SuperBuilder; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; @Entity(name = "MultipleChoiceQuestion") @ToString(callSuper = true) diff --git a/src/main/java/de/unistuttgart/iste/gits/quiz_service/persistence/entity/NumericQuestionEntity.java b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/persistence/entity/NumericQuestionEntity.java similarity index 90% rename from src/main/java/de/unistuttgart/iste/gits/quiz_service/persistence/entity/NumericQuestionEntity.java rename to src/main/java/de/unistuttgart/iste/meitrex/quiz_service/persistence/entity/NumericQuestionEntity.java index a127881..44768e6 100644 --- a/src/main/java/de/unistuttgart/iste/gits/quiz_service/persistence/entity/NumericQuestionEntity.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/persistence/entity/NumericQuestionEntity.java @@ -1,4 +1,4 @@ -package de.unistuttgart.iste.gits.quiz_service.persistence.entity; +package de.unistuttgart.iste.meitrex.quiz_service.persistence.entity; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/de/unistuttgart/iste/gits/quiz_service/persistence/entity/QuestionEntity.java b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/persistence/entity/QuestionEntity.java similarity index 83% rename from src/main/java/de/unistuttgart/iste/gits/quiz_service/persistence/entity/QuestionEntity.java rename to src/main/java/de/unistuttgart/iste/meitrex/quiz_service/persistence/entity/QuestionEntity.java index cfc29b9..305e8a9 100644 --- a/src/main/java/de/unistuttgart/iste/gits/quiz_service/persistence/entity/QuestionEntity.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/persistence/entity/QuestionEntity.java @@ -1,11 +1,17 @@ -package de.unistuttgart.iste.gits.quiz_service.persistence.entity; +package de.unistuttgart.iste.meitrex.quiz_service.persistence.entity; -import de.unistuttgart.iste.gits.generated.dto.QuestionType; +import de.unistuttgart.iste.meitrex.generated.dto.QuestionType; import jakarta.persistence.*; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.UUID; @Entity(name = "Question") @Data diff --git a/src/main/java/de/unistuttgart/iste/gits/quiz_service/persistence/entity/QuestionStatisticEntity.java b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/persistence/entity/QuestionStatisticEntity.java similarity index 52% rename from src/main/java/de/unistuttgart/iste/gits/quiz_service/persistence/entity/QuestionStatisticEntity.java rename to src/main/java/de/unistuttgart/iste/meitrex/quiz_service/persistence/entity/QuestionStatisticEntity.java index 422f9e8..f5cf7f4 100644 --- a/src/main/java/de/unistuttgart/iste/gits/quiz_service/persistence/entity/QuestionStatisticEntity.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/persistence/entity/QuestionStatisticEntity.java @@ -1,7 +1,13 @@ -package de.unistuttgart.iste.gits.quiz_service.persistence.entity; +package de.unistuttgart.iste.meitrex.quiz_service.persistence.entity; -import jakarta.persistence.*; -import lombok.*; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; import java.util.UUID; diff --git a/src/main/java/de/unistuttgart/iste/gits/quiz_service/persistence/entity/QuizEntity.java b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/persistence/entity/QuizEntity.java similarity index 70% rename from src/main/java/de/unistuttgart/iste/gits/quiz_service/persistence/entity/QuizEntity.java rename to src/main/java/de/unistuttgart/iste/meitrex/quiz_service/persistence/entity/QuizEntity.java index 059b513..ffed4eb 100644 --- a/src/main/java/de/unistuttgart/iste/gits/quiz_service/persistence/entity/QuizEntity.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/persistence/entity/QuizEntity.java @@ -1,10 +1,15 @@ -package de.unistuttgart.iste.gits.quiz_service.persistence.entity; +package de.unistuttgart.iste.meitrex.quiz_service.persistence.entity; -import de.unistuttgart.iste.gits.generated.dto.QuestionPoolingMode; +import de.unistuttgart.iste.meitrex.generated.dto.QuestionPoolingMode; import jakarta.persistence.*; -import lombok.*; - -import java.util.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; @Entity(name = "Quiz") @Data diff --git a/src/main/java/de/unistuttgart/iste/gits/quiz_service/persistence/entity/SelfAssessmentQuestionEntity.java b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/persistence/entity/SelfAssessmentQuestionEntity.java similarity index 88% rename from src/main/java/de/unistuttgart/iste/gits/quiz_service/persistence/entity/SelfAssessmentQuestionEntity.java rename to src/main/java/de/unistuttgart/iste/meitrex/quiz_service/persistence/entity/SelfAssessmentQuestionEntity.java index 80a0e06..bbb7a92 100644 --- a/src/main/java/de/unistuttgart/iste/gits/quiz_service/persistence/entity/SelfAssessmentQuestionEntity.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/persistence/entity/SelfAssessmentQuestionEntity.java @@ -1,4 +1,4 @@ -package de.unistuttgart.iste.gits.quiz_service.persistence.entity; +package de.unistuttgart.iste.meitrex.quiz_service.persistence.entity; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/de/unistuttgart/iste/gits/quiz_service/persistence/mapper/QuizMapper.java b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/persistence/mapper/QuizMapper.java similarity index 97% rename from src/main/java/de/unistuttgart/iste/gits/quiz_service/persistence/mapper/QuizMapper.java rename to src/main/java/de/unistuttgart/iste/meitrex/quiz_service/persistence/mapper/QuizMapper.java index 0ccd22a..3c1dab9 100644 --- a/src/main/java/de/unistuttgart/iste/gits/quiz_service/persistence/mapper/QuizMapper.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/persistence/mapper/QuizMapper.java @@ -1,12 +1,14 @@ -package de.unistuttgart.iste.gits.quiz_service.persistence.mapper; +package de.unistuttgart.iste.meitrex.quiz_service.persistence.mapper; -import de.unistuttgart.iste.gits.generated.dto.*; -import de.unistuttgart.iste.gits.quiz_service.persistence.entity.*; +import de.unistuttgart.iste.meitrex.generated.dto.*; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.*; import lombok.RequiredArgsConstructor; import org.modelmapper.ModelMapper; import org.springframework.stereotype.Component; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; @Component @RequiredArgsConstructor diff --git a/src/main/java/de/unistuttgart/iste/gits/quiz_service/persistence/repository/QuizRepository.java b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/persistence/repository/QuizRepository.java similarity index 59% rename from src/main/java/de/unistuttgart/iste/gits/quiz_service/persistence/repository/QuizRepository.java rename to src/main/java/de/unistuttgart/iste/meitrex/quiz_service/persistence/repository/QuizRepository.java index e1eb96f..5475700 100644 --- a/src/main/java/de/unistuttgart/iste/gits/quiz_service/persistence/repository/QuizRepository.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/persistence/repository/QuizRepository.java @@ -1,6 +1,6 @@ -package de.unistuttgart.iste.gits.quiz_service.persistence.repository; +package de.unistuttgart.iste.meitrex.quiz_service.persistence.repository; -import de.unistuttgart.iste.gits.quiz_service.persistence.entity.QuizEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.QuizEntity; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/de/unistuttgart/iste/gits/quiz_service/service/QuizService.java b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/service/QuizService.java similarity index 94% rename from src/main/java/de/unistuttgart/iste/gits/quiz_service/service/QuizService.java rename to src/main/java/de/unistuttgart/iste/meitrex/quiz_service/service/QuizService.java index 2e3f1a0..8c4a1f9 100644 --- a/src/main/java/de/unistuttgart/iste/gits/quiz_service/service/QuizService.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/service/QuizService.java @@ -1,13 +1,17 @@ -package de.unistuttgart.iste.gits.quiz_service.service; - -import de.unistuttgart.iste.gits.common.dapr.TopicPublisher; -import de.unistuttgart.iste.gits.common.event.*; -import de.unistuttgart.iste.gits.common.exception.IncompleteEventMessageException; -import de.unistuttgart.iste.gits.generated.dto.*; -import de.unistuttgart.iste.gits.quiz_service.persistence.entity.*; -import de.unistuttgart.iste.gits.quiz_service.persistence.mapper.QuizMapper; -import de.unistuttgart.iste.gits.quiz_service.persistence.repository.QuizRepository; -import de.unistuttgart.iste.gits.quiz_service.validation.QuizValidator; +package de.unistuttgart.iste.meitrex.quiz_service.service; + +import de.unistuttgart.iste.meitrex.common.dapr.TopicPublisher; +import de.unistuttgart.iste.meitrex.common.event.ContentChangeEvent; +import de.unistuttgart.iste.meitrex.common.event.ContentProgressedEvent; +import de.unistuttgart.iste.meitrex.common.event.CrudOperation; +import de.unistuttgart.iste.meitrex.common.exception.IncompleteEventMessageException; +import de.unistuttgart.iste.meitrex.generated.dto.*; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.QuestionEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.QuestionStatisticEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.QuizEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.mapper.QuizMapper; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.repository.QuizRepository; +import de.unistuttgart.iste.meitrex.quiz_service.validation.QuizValidator; import jakarta.persistence.EntityNotFoundException; import jakarta.transaction.Transactional; import jakarta.validation.ValidationException; @@ -16,12 +20,15 @@ import org.springframework.stereotype.Service; import java.text.MessageFormat; -import java.util.*; +import java.util.Collections; +import java.util.List; +import java.util.Optional; +import java.util.UUID; import java.util.function.Consumer; import java.util.function.Function; -import static de.unistuttgart.iste.gits.common.util.GitsCollectionUtils.count; -import static de.unistuttgart.iste.gits.common.util.GitsCollectionUtils.countAsInt; +import static de.unistuttgart.iste.meitrex.common.util.MeitrexCollectionUtils.count; +import static de.unistuttgart.iste.meitrex.common.util.MeitrexCollectionUtils.countAsInt; @Service @RequiredArgsConstructor diff --git a/src/main/java/de/unistuttgart/iste/gits/quiz_service/validation/QuizValidator.java b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/validation/QuizValidator.java similarity index 92% rename from src/main/java/de/unistuttgart/iste/gits/quiz_service/validation/QuizValidator.java rename to src/main/java/de/unistuttgart/iste/meitrex/quiz_service/validation/QuizValidator.java index 84cc3ee..2523e0d 100644 --- a/src/main/java/de/unistuttgart/iste/gits/quiz_service/validation/QuizValidator.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/quiz_service/validation/QuizValidator.java @@ -1,14 +1,14 @@ -package de.unistuttgart.iste.gits.quiz_service.validation; +package de.unistuttgart.iste.meitrex.quiz_service.validation; -import de.unistuttgart.iste.gits.generated.dto.*; -import de.unistuttgart.iste.gits.quiz_service.persistence.entity.QuizEntity; +import de.unistuttgart.iste.meitrex.generated.dto.*; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.QuizEntity; import jakarta.validation.ValidationException; import org.springframework.stereotype.Component; import java.util.List; -import static de.unistuttgart.iste.gits.generated.dto.ClozeElementType.BLANK; -import static de.unistuttgart.iste.gits.generated.dto.ClozeElementType.TEXT; +import static de.unistuttgart.iste.meitrex.generated.dto.ClozeElementType.BLANK; +import static de.unistuttgart.iste.meitrex.generated.dto.ClozeElementType.TEXT; @Component public class QuizValidator { diff --git a/src/main/resources/graphql/common/directives.graphqls b/src/main/resources/graphql/common/directives.graphqls index 4cf44c4..5b85062 100644 --- a/src/main/resources/graphql/common/directives.graphqls +++ b/src/main/resources/graphql/common/directives.graphqls @@ -14,4 +14,10 @@ directive @Positive(message : String = "graphql.validation.Positive.message") on directive @PositiveOrZero(message : String = "graphql.validation.PositiveOrZero.message") on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION directive @Range(min : Int = 0, max : Int = 2147483647, message : String = "graphql.validation.Range.message") on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION directive @Size(min : Int = 0, max : Int = 2147483647, message : String = "graphql.validation.Size.message") on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION -directive @ContainerSize(min : Int = 0, max : Int = 2147483647, message : String = "graphql.validation.ContainerSize.message") on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION \ No newline at end of file +directive @ContainerSize(min : Int = 0, max : Int = 2147483647, message : String = "graphql.validation.ContainerSize.message") on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION + +""" +The @OnDemand directive is used to mark fields that are only internally resolved when requested. +Implementation Note: This will cause the code generator to omit the field from the generated DTOs. +""" +directive @OnDemand on FIELD_DEFINITION \ No newline at end of file diff --git a/src/test/java/de/unistuttgart/iste/gits/quiz_service/TestData.java b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/TestData.java similarity index 95% rename from src/test/java/de/unistuttgart/iste/gits/quiz_service/TestData.java rename to src/test/java/de/unistuttgart/iste/meitrex/quiz_service/TestData.java index 7f6f16a..4f15ccc 100644 --- a/src/test/java/de/unistuttgart/iste/gits/quiz_service/TestData.java +++ b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/TestData.java @@ -1,7 +1,9 @@ -package de.unistuttgart.iste.gits.quiz_service; +package de.unistuttgart.iste.meitrex.quiz_service; -import de.unistuttgart.iste.gits.generated.dto.*; -import de.unistuttgart.iste.gits.quiz_service.persistence.entity.*; +import de.unistuttgart.iste.meitrex.generated.dto.ClozeElementType; +import de.unistuttgart.iste.meitrex.generated.dto.QuestionPoolingMode; +import de.unistuttgart.iste.meitrex.generated.dto.QuestionType; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.*; import java.util.*; import java.util.stream.Stream; diff --git a/src/test/java/de/unistuttgart/iste/gits/quiz_service/api/AuthorizationTest.java b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/AuthorizationTest.java similarity index 72% rename from src/test/java/de/unistuttgart/iste/gits/quiz_service/api/AuthorizationTest.java rename to src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/AuthorizationTest.java index a58f5c5..da32738 100644 --- a/src/test/java/de/unistuttgart/iste/gits/quiz_service/api/AuthorizationTest.java +++ b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/AuthorizationTest.java @@ -1,17 +1,17 @@ -package de.unistuttgart.iste.gits.quiz_service.api; - - -import de.unistuttgart.iste.gits.common.testutil.AuthorizationAsserts; -import de.unistuttgart.iste.gits.common.testutil.GraphQlApiTest; -import de.unistuttgart.iste.gits.common.testutil.InjectCurrentUserHeader; -import de.unistuttgart.iste.gits.common.testutil.TablesToDelete; -import de.unistuttgart.iste.gits.common.user_handling.LoggedInUser; -import de.unistuttgart.iste.gits.generated.dto.ClozeElementInput; -import de.unistuttgart.iste.gits.generated.dto.ClozeElementType; -import de.unistuttgart.iste.gits.generated.dto.CreateClozeQuestionInput; -import de.unistuttgart.iste.gits.quiz_service.TestData; -import de.unistuttgart.iste.gits.quiz_service.persistence.entity.QuizEntity; -import de.unistuttgart.iste.gits.quiz_service.persistence.repository.QuizRepository; +package de.unistuttgart.iste.meitrex.quiz_service.api; + + +import de.unistuttgart.iste.meitrex.common.testutil.AuthorizationAsserts; +import de.unistuttgart.iste.meitrex.common.testutil.GraphQlApiTest; +import de.unistuttgart.iste.meitrex.common.testutil.InjectCurrentUserHeader; +import de.unistuttgart.iste.meitrex.common.testutil.TablesToDelete; +import de.unistuttgart.iste.meitrex.common.user_handling.LoggedInUser; +import de.unistuttgart.iste.meitrex.generated.dto.ClozeElementInput; +import de.unistuttgart.iste.meitrex.generated.dto.ClozeElementType; +import de.unistuttgart.iste.meitrex.generated.dto.CreateClozeQuestionInput; +import de.unistuttgart.iste.meitrex.quiz_service.TestData; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.QuizEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.repository.QuizRepository; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.graphql.test.tester.GraphQlTester; @@ -21,7 +21,7 @@ import java.util.List; import java.util.UUID; -import static de.unistuttgart.iste.gits.common.testutil.TestUsers.userWithMembershipInCourseWithId; +import static de.unistuttgart.iste.meitrex.common.testutil.TestUsers.userWithMembershipInCourseWithId; @GraphQlApiTest @TablesToDelete({"quiz"}) diff --git a/src/test/java/de/unistuttgart/iste/gits/quiz_service/api/QuizFragments.java b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/QuizFragments.java similarity index 97% rename from src/test/java/de/unistuttgart/iste/gits/quiz_service/api/QuizFragments.java rename to src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/QuizFragments.java index a3cfd2d..2da744e 100644 --- a/src/test/java/de/unistuttgart/iste/gits/quiz_service/api/QuizFragments.java +++ b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/QuizFragments.java @@ -1,4 +1,4 @@ -package de.unistuttgart.iste.gits.quiz_service.api; +package de.unistuttgart.iste.meitrex.quiz_service.api; /** * This class contains GraphQL fragments for quiz queries. diff --git a/src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/CreateQuizMutationTest.java b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/CreateQuizMutationTest.java similarity index 81% rename from src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/CreateQuizMutationTest.java rename to src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/CreateQuizMutationTest.java index e6b9497..01beaae 100644 --- a/src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/CreateQuizMutationTest.java +++ b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/CreateQuizMutationTest.java @@ -1,10 +1,12 @@ -package de.unistuttgart.iste.gits.quiz_service.api.mutation; +package de.unistuttgart.iste.meitrex.quiz_service.api.mutation; -import de.unistuttgart.iste.gits.common.testutil.GraphQlApiTest; -import de.unistuttgart.iste.gits.common.testutil.TablesToDelete; -import de.unistuttgart.iste.gits.generated.dto.*; -import de.unistuttgart.iste.gits.quiz_service.api.QuizFragments; -import de.unistuttgart.iste.gits.quiz_service.persistence.repository.QuizRepository; +import de.unistuttgart.iste.meitrex.common.testutil.GraphQlApiTest; +import de.unistuttgart.iste.meitrex.common.testutil.TablesToDelete; +import de.unistuttgart.iste.meitrex.generated.dto.CreateQuizInput; +import de.unistuttgart.iste.meitrex.generated.dto.MultipleChoiceQuestion; +import de.unistuttgart.iste.meitrex.generated.dto.QuestionPoolingMode; +import de.unistuttgart.iste.meitrex.quiz_service.api.QuizFragments; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.repository.QuizRepository; import jakarta.transaction.Transactional; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -14,7 +16,7 @@ import java.util.List; import java.util.UUID; -import static de.unistuttgart.iste.gits.quiz_service.matcher.QuizEntityToCreateInputMatcher.matchesCreateQuizInput; +import static de.unistuttgart.iste.meitrex.quiz_service.matcher.QuizEntityToCreateInputMatcher.matchesCreateQuizInput; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.is; diff --git a/src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/DeleteQuizMutationTest.java b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/DeleteQuizMutationTest.java similarity index 87% rename from src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/DeleteQuizMutationTest.java rename to src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/DeleteQuizMutationTest.java index ff696b0..f9e357b 100644 --- a/src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/DeleteQuizMutationTest.java +++ b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/DeleteQuizMutationTest.java @@ -1,9 +1,9 @@ -package de.unistuttgart.iste.gits.quiz_service.api.mutation; +package de.unistuttgart.iste.meitrex.quiz_service.api.mutation; -import de.unistuttgart.iste.gits.common.testutil.GraphQlApiTest; -import de.unistuttgart.iste.gits.generated.dto.QuestionPoolingMode; -import de.unistuttgart.iste.gits.quiz_service.persistence.entity.QuizEntity; -import de.unistuttgart.iste.gits.quiz_service.persistence.repository.QuizRepository; +import de.unistuttgart.iste.meitrex.common.testutil.GraphQlApiTest; +import de.unistuttgart.iste.meitrex.generated.dto.QuestionPoolingMode; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.QuizEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.repository.QuizRepository; import graphql.ErrorType; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -12,7 +12,7 @@ import java.util.List; import java.util.UUID; -import static de.unistuttgart.iste.gits.quiz_service.TestData.*; +import static de.unistuttgart.iste.meitrex.quiz_service.TestData.*; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; diff --git a/src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizAddAssociationQuestionTest.java b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizAddAssociationQuestionTest.java similarity index 82% rename from src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizAddAssociationQuestionTest.java rename to src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizAddAssociationQuestionTest.java index 6b6c3ff..2b78231 100644 --- a/src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizAddAssociationQuestionTest.java +++ b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizAddAssociationQuestionTest.java @@ -1,14 +1,19 @@ -package de.unistuttgart.iste.gits.quiz_service.api.mutation; - -import de.unistuttgart.iste.gits.common.testutil.GraphQlApiTest; -import de.unistuttgart.iste.gits.common.testutil.InjectCurrentUserHeader; -import de.unistuttgart.iste.gits.common.testutil.TablesToDelete; -import de.unistuttgart.iste.gits.common.user_handling.LoggedInUser; -import de.unistuttgart.iste.gits.generated.dto.*; -import de.unistuttgart.iste.gits.quiz_service.TestData; -import de.unistuttgart.iste.gits.quiz_service.api.QuizFragments; -import de.unistuttgart.iste.gits.quiz_service.persistence.entity.*; -import de.unistuttgart.iste.gits.quiz_service.persistence.repository.QuizRepository; +package de.unistuttgart.iste.meitrex.quiz_service.api.mutation; + +import de.unistuttgart.iste.meitrex.common.testutil.GraphQlApiTest; +import de.unistuttgart.iste.meitrex.common.testutil.InjectCurrentUserHeader; +import de.unistuttgart.iste.meitrex.common.testutil.TablesToDelete; +import de.unistuttgart.iste.meitrex.common.user_handling.LoggedInUser; +import de.unistuttgart.iste.meitrex.generated.dto.AssociationInput; +import de.unistuttgart.iste.meitrex.generated.dto.CreateAssociationQuestionInput; +import de.unistuttgart.iste.meitrex.generated.dto.SingleAssociation; +import de.unistuttgart.iste.meitrex.quiz_service.TestData; +import de.unistuttgart.iste.meitrex.quiz_service.api.QuizFragments; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.AssociationEmbeddable; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.AssociationQuestionEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.QuestionEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.QuizEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.repository.QuizRepository; import jakarta.transaction.Transactional; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -18,11 +23,10 @@ import java.util.List; import java.util.UUID; +import static de.unistuttgart.iste.meitrex.common.testutil.TestUsers.userWithMembershipInCourseWithId; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; -import static de.unistuttgart.iste.gits.common.testutil.TestUsers.userWithMembershipInCourseWithId; - @GraphQlApiTest @TablesToDelete({"association_question_correct_associations", "association_question", "quiz_question_pool", "question", "quiz"}) diff --git a/src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizAddClozeQuestionTest.java b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizAddClozeQuestionTest.java similarity index 92% rename from src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizAddClozeQuestionTest.java rename to src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizAddClozeQuestionTest.java index f0583ca..ae53bf3 100644 --- a/src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizAddClozeQuestionTest.java +++ b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizAddClozeQuestionTest.java @@ -1,14 +1,18 @@ -package de.unistuttgart.iste.gits.quiz_service.api.mutation; - -import de.unistuttgart.iste.gits.common.testutil.GraphQlApiTest; -import de.unistuttgart.iste.gits.common.testutil.InjectCurrentUserHeader; -import de.unistuttgart.iste.gits.common.testutil.TablesToDelete; -import de.unistuttgart.iste.gits.common.user_handling.LoggedInUser; -import de.unistuttgart.iste.gits.generated.dto.*; -import de.unistuttgart.iste.gits.quiz_service.TestData; -import de.unistuttgart.iste.gits.quiz_service.api.QuizFragments; -import de.unistuttgart.iste.gits.quiz_service.persistence.entity.*; -import de.unistuttgart.iste.gits.quiz_service.persistence.repository.QuizRepository; +package de.unistuttgart.iste.meitrex.quiz_service.api.mutation; + +import de.unistuttgart.iste.meitrex.common.testutil.GraphQlApiTest; +import de.unistuttgart.iste.meitrex.common.testutil.InjectCurrentUserHeader; +import de.unistuttgart.iste.meitrex.common.testutil.TablesToDelete; +import de.unistuttgart.iste.meitrex.common.user_handling.LoggedInUser; +import de.unistuttgart.iste.meitrex.generated.dto.ClozeElementInput; +import de.unistuttgart.iste.meitrex.generated.dto.ClozeElementType; +import de.unistuttgart.iste.meitrex.generated.dto.CreateClozeQuestionInput; +import de.unistuttgart.iste.meitrex.quiz_service.TestData; +import de.unistuttgart.iste.meitrex.quiz_service.api.QuizFragments; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.ClozeQuestionEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.QuestionEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.QuizEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.repository.QuizRepository; import graphql.ErrorType; import jakarta.transaction.Transactional; import org.junit.jupiter.api.Test; @@ -19,9 +23,9 @@ import java.util.List; import java.util.UUID; +import static de.unistuttgart.iste.meitrex.common.testutil.TestUsers.userWithMembershipInCourseWithId; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; -import static de.unistuttgart.iste.gits.common.testutil.TestUsers.userWithMembershipInCourseWithId; @GraphQlApiTest diff --git a/src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizAddExactAnswerQuestionTest.java b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizAddExactAnswerQuestionTest.java similarity index 79% rename from src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizAddExactAnswerQuestionTest.java rename to src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizAddExactAnswerQuestionTest.java index 7cd4c69..42d66ba 100644 --- a/src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizAddExactAnswerQuestionTest.java +++ b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizAddExactAnswerQuestionTest.java @@ -1,14 +1,16 @@ -package de.unistuttgart.iste.gits.quiz_service.api.mutation; - -import de.unistuttgart.iste.gits.common.testutil.GraphQlApiTest; -import de.unistuttgart.iste.gits.common.testutil.InjectCurrentUserHeader; -import de.unistuttgart.iste.gits.common.testutil.TablesToDelete; -import de.unistuttgart.iste.gits.common.user_handling.LoggedInUser; -import de.unistuttgart.iste.gits.generated.dto.CreateExactAnswerQuestionInput; -import de.unistuttgart.iste.gits.quiz_service.TestData; -import de.unistuttgart.iste.gits.quiz_service.api.QuizFragments; -import de.unistuttgart.iste.gits.quiz_service.persistence.entity.*; -import de.unistuttgart.iste.gits.quiz_service.persistence.repository.QuizRepository; +package de.unistuttgart.iste.meitrex.quiz_service.api.mutation; + +import de.unistuttgart.iste.meitrex.common.testutil.GraphQlApiTest; +import de.unistuttgart.iste.meitrex.common.testutil.InjectCurrentUserHeader; +import de.unistuttgart.iste.meitrex.common.testutil.TablesToDelete; +import de.unistuttgart.iste.meitrex.common.user_handling.LoggedInUser; +import de.unistuttgart.iste.meitrex.generated.dto.CreateExactAnswerQuestionInput; +import de.unistuttgart.iste.meitrex.quiz_service.TestData; +import de.unistuttgart.iste.meitrex.quiz_service.api.QuizFragments; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.ExactAnswerQuestionEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.QuestionEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.QuizEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.repository.QuizRepository; import jakarta.transaction.Transactional; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -18,9 +20,9 @@ import java.util.List; import java.util.UUID; +import static de.unistuttgart.iste.meitrex.common.testutil.TestUsers.userWithMembershipInCourseWithId; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; -import static de.unistuttgart.iste.gits.common.testutil.TestUsers.userWithMembershipInCourseWithId; @GraphQlApiTest diff --git a/src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizAddMultipleChoiceQuestionTest.java b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizAddMultipleChoiceQuestionTest.java similarity index 88% rename from src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizAddMultipleChoiceQuestionTest.java rename to src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizAddMultipleChoiceQuestionTest.java index 85213a8..36b8742 100644 --- a/src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizAddMultipleChoiceQuestionTest.java +++ b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizAddMultipleChoiceQuestionTest.java @@ -1,14 +1,16 @@ -package de.unistuttgart.iste.gits.quiz_service.api.mutation; - -import de.unistuttgart.iste.gits.common.testutil.GraphQlApiTest; -import de.unistuttgart.iste.gits.common.testutil.InjectCurrentUserHeader; -import de.unistuttgart.iste.gits.common.testutil.TablesToDelete; -import de.unistuttgart.iste.gits.common.user_handling.LoggedInUser; -import de.unistuttgart.iste.gits.generated.dto.*; -import de.unistuttgart.iste.gits.quiz_service.TestData; -import de.unistuttgart.iste.gits.quiz_service.api.QuizFragments; -import de.unistuttgart.iste.gits.quiz_service.persistence.entity.QuizEntity; -import de.unistuttgart.iste.gits.quiz_service.persistence.repository.QuizRepository; +package de.unistuttgart.iste.meitrex.quiz_service.api.mutation; + +import de.unistuttgart.iste.meitrex.common.testutil.GraphQlApiTest; +import de.unistuttgart.iste.meitrex.common.testutil.InjectCurrentUserHeader; +import de.unistuttgart.iste.meitrex.common.testutil.TablesToDelete; +import de.unistuttgart.iste.meitrex.common.user_handling.LoggedInUser; +import de.unistuttgart.iste.meitrex.generated.dto.CreateMultipleChoiceQuestionInput; +import de.unistuttgart.iste.meitrex.generated.dto.MultipleChoiceAnswerInput; +import de.unistuttgart.iste.meitrex.generated.dto.MultipleChoiceQuestion; +import de.unistuttgart.iste.meitrex.quiz_service.TestData; +import de.unistuttgart.iste.meitrex.quiz_service.api.QuizFragments; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.QuizEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.repository.QuizRepository; import graphql.ErrorType; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -17,12 +19,12 @@ import java.util.List; import java.util.UUID; -import static de.unistuttgart.iste.gits.quiz_service.TestData.createMultipleChoiceQuestion; -import static de.unistuttgart.iste.gits.quiz_service.matcher.MultipleChoiceQuestionDtoToCreateInputMatcher.matchesInput; -import static de.unistuttgart.iste.gits.quiz_service.matcher.MultipleChoiceQuestionDtoToEntityMatcher.matchesEntity; +import static de.unistuttgart.iste.meitrex.common.testutil.TestUsers.userWithMembershipInCourseWithId; +import static de.unistuttgart.iste.meitrex.quiz_service.TestData.createMultipleChoiceQuestion; +import static de.unistuttgart.iste.meitrex.quiz_service.matcher.MultipleChoiceQuestionDtoToCreateInputMatcher.matchesInput; +import static de.unistuttgart.iste.meitrex.quiz_service.matcher.MultipleChoiceQuestionDtoToEntityMatcher.matchesEntity; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; -import static de.unistuttgart.iste.gits.common.testutil.TestUsers.userWithMembershipInCourseWithId; @GraphQlApiTest @TablesToDelete({"multiple_choice_question_answers", "multiple_choice_question", "quiz_question_pool", "question", "quiz"}) diff --git a/src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizAddNumericQuestionTest.java b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizAddNumericQuestionTest.java similarity index 78% rename from src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizAddNumericQuestionTest.java rename to src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizAddNumericQuestionTest.java index 94a14c6..437b293 100644 --- a/src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizAddNumericQuestionTest.java +++ b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizAddNumericQuestionTest.java @@ -1,14 +1,16 @@ -package de.unistuttgart.iste.gits.quiz_service.api.mutation; - -import de.unistuttgart.iste.gits.common.testutil.GraphQlApiTest; -import de.unistuttgart.iste.gits.common.testutil.InjectCurrentUserHeader; -import de.unistuttgart.iste.gits.common.testutil.TablesToDelete; -import de.unistuttgart.iste.gits.common.user_handling.LoggedInUser; -import de.unistuttgart.iste.gits.generated.dto.CreateNumericQuestionInput; -import de.unistuttgart.iste.gits.quiz_service.TestData; -import de.unistuttgart.iste.gits.quiz_service.api.QuizFragments; -import de.unistuttgart.iste.gits.quiz_service.persistence.entity.*; -import de.unistuttgart.iste.gits.quiz_service.persistence.repository.QuizRepository; +package de.unistuttgart.iste.meitrex.quiz_service.api.mutation; + +import de.unistuttgart.iste.meitrex.common.testutil.GraphQlApiTest; +import de.unistuttgart.iste.meitrex.common.testutil.InjectCurrentUserHeader; +import de.unistuttgart.iste.meitrex.common.testutil.TablesToDelete; +import de.unistuttgart.iste.meitrex.common.user_handling.LoggedInUser; +import de.unistuttgart.iste.meitrex.generated.dto.CreateNumericQuestionInput; +import de.unistuttgart.iste.meitrex.quiz_service.TestData; +import de.unistuttgart.iste.meitrex.quiz_service.api.QuizFragments; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.NumericQuestionEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.QuestionEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.QuizEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.repository.QuizRepository; import jakarta.transaction.Transactional; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -18,7 +20,7 @@ import java.util.List; import java.util.UUID; -import static de.unistuttgart.iste.gits.common.testutil.TestUsers.userWithMembershipInCourseWithId; +import static de.unistuttgart.iste.meitrex.common.testutil.TestUsers.userWithMembershipInCourseWithId; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; diff --git a/src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizAddSelfAssessmentQuestionTest.java b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizAddSelfAssessmentQuestionTest.java similarity index 77% rename from src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizAddSelfAssessmentQuestionTest.java rename to src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizAddSelfAssessmentQuestionTest.java index 57fa9b6..5ae9220 100644 --- a/src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizAddSelfAssessmentQuestionTest.java +++ b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizAddSelfAssessmentQuestionTest.java @@ -1,12 +1,16 @@ -package de.unistuttgart.iste.gits.quiz_service.api.mutation; - -import de.unistuttgart.iste.gits.common.testutil.*; -import de.unistuttgart.iste.gits.common.user_handling.LoggedInUser; -import de.unistuttgart.iste.gits.generated.dto.CreateSelfAssessmentQuestionInput; -import de.unistuttgart.iste.gits.quiz_service.TestData; -import de.unistuttgart.iste.gits.quiz_service.api.QuizFragments; -import de.unistuttgart.iste.gits.quiz_service.persistence.entity.*; -import de.unistuttgart.iste.gits.quiz_service.persistence.repository.QuizRepository; +package de.unistuttgart.iste.meitrex.quiz_service.api.mutation; + +import de.unistuttgart.iste.meitrex.common.testutil.GraphQlApiTest; +import de.unistuttgart.iste.meitrex.common.testutil.InjectCurrentUserHeader; +import de.unistuttgart.iste.meitrex.common.testutil.TablesToDelete; +import de.unistuttgart.iste.meitrex.common.user_handling.LoggedInUser; +import de.unistuttgart.iste.meitrex.generated.dto.CreateSelfAssessmentQuestionInput; +import de.unistuttgart.iste.meitrex.quiz_service.TestData; +import de.unistuttgart.iste.meitrex.quiz_service.api.QuizFragments; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.QuestionEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.QuizEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.SelfAssessmentQuestionEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.repository.QuizRepository; import jakarta.transaction.Transactional; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -16,7 +20,7 @@ import java.util.List; import java.util.UUID; -import static de.unistuttgart.iste.gits.common.testutil.TestUsers.userWithMembershipInCourseWithId; +import static de.unistuttgart.iste.meitrex.common.testutil.TestUsers.userWithMembershipInCourseWithId; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; diff --git a/src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizRemoveQuestionTest.java b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizRemoveQuestionTest.java similarity index 80% rename from src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizRemoveQuestionTest.java rename to src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizRemoveQuestionTest.java index 0c4c3ca..e9ee922 100644 --- a/src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizRemoveQuestionTest.java +++ b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizRemoveQuestionTest.java @@ -1,15 +1,15 @@ -package de.unistuttgart.iste.gits.quiz_service.api.mutation; +package de.unistuttgart.iste.meitrex.quiz_service.api.mutation; -import de.unistuttgart.iste.gits.common.testutil.GraphQlApiTest; -import de.unistuttgart.iste.gits.common.testutil.InjectCurrentUserHeader; -import de.unistuttgart.iste.gits.common.testutil.TablesToDelete; -import de.unistuttgart.iste.gits.common.user_handling.LoggedInUser; -import de.unistuttgart.iste.gits.generated.dto.MultipleChoiceQuestion; -import de.unistuttgart.iste.gits.quiz_service.TestData; -import de.unistuttgart.iste.gits.quiz_service.api.QuizFragments; -import de.unistuttgart.iste.gits.quiz_service.persistence.entity.MultipleChoiceQuestionEntity; -import de.unistuttgart.iste.gits.quiz_service.persistence.entity.QuizEntity; -import de.unistuttgart.iste.gits.quiz_service.persistence.repository.QuizRepository; +import de.unistuttgart.iste.meitrex.common.testutil.GraphQlApiTest; +import de.unistuttgart.iste.meitrex.common.testutil.InjectCurrentUserHeader; +import de.unistuttgart.iste.meitrex.common.testutil.TablesToDelete; +import de.unistuttgart.iste.meitrex.common.user_handling.LoggedInUser; +import de.unistuttgart.iste.meitrex.generated.dto.MultipleChoiceQuestion; +import de.unistuttgart.iste.meitrex.quiz_service.TestData; +import de.unistuttgart.iste.meitrex.quiz_service.api.QuizFragments; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.MultipleChoiceQuestionEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.QuizEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.repository.QuizRepository; import jakarta.transaction.Transactional; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -19,9 +19,9 @@ import java.util.List; import java.util.UUID; -import static de.unistuttgart.iste.gits.common.testutil.TestUsers.userWithMembershipInCourseWithId; -import static de.unistuttgart.iste.gits.quiz_service.TestData.createMultipleChoiceQuestion; -import static de.unistuttgart.iste.gits.quiz_service.matcher.MultipleChoiceQuestionDtoToEntityMatcher.matchesEntity; +import static de.unistuttgart.iste.meitrex.common.testutil.TestUsers.userWithMembershipInCourseWithId; +import static de.unistuttgart.iste.meitrex.quiz_service.TestData.createMultipleChoiceQuestion; +import static de.unistuttgart.iste.meitrex.quiz_service.matcher.MultipleChoiceQuestionDtoToEntityMatcher.matchesEntity; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; diff --git a/src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizSwitchQuestionsTest.java b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizSwitchQuestionsTest.java similarity index 82% rename from src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizSwitchQuestionsTest.java rename to src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizSwitchQuestionsTest.java index a416deb..2be0379 100644 --- a/src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizSwitchQuestionsTest.java +++ b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizSwitchQuestionsTest.java @@ -1,15 +1,15 @@ -package de.unistuttgart.iste.gits.quiz_service.api.mutation; - -import de.unistuttgart.iste.gits.common.testutil.GraphQlApiTest; -import de.unistuttgart.iste.gits.common.testutil.InjectCurrentUserHeader; -import de.unistuttgart.iste.gits.common.testutil.TablesToDelete; -import de.unistuttgart.iste.gits.common.user_handling.LoggedInUser; -import de.unistuttgart.iste.gits.generated.dto.MultipleChoiceQuestion; -import de.unistuttgart.iste.gits.quiz_service.TestData; -import de.unistuttgart.iste.gits.quiz_service.api.QuizFragments; -import de.unistuttgart.iste.gits.quiz_service.persistence.entity.QuestionEntity; -import de.unistuttgart.iste.gits.quiz_service.persistence.entity.QuizEntity; -import de.unistuttgart.iste.gits.quiz_service.persistence.repository.QuizRepository; +package de.unistuttgart.iste.meitrex.quiz_service.api.mutation; + +import de.unistuttgart.iste.meitrex.common.testutil.GraphQlApiTest; +import de.unistuttgart.iste.meitrex.common.testutil.InjectCurrentUserHeader; +import de.unistuttgart.iste.meitrex.common.testutil.TablesToDelete; +import de.unistuttgart.iste.meitrex.common.user_handling.LoggedInUser; +import de.unistuttgart.iste.meitrex.generated.dto.MultipleChoiceQuestion; +import de.unistuttgart.iste.meitrex.quiz_service.TestData; +import de.unistuttgart.iste.meitrex.quiz_service.api.QuizFragments; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.QuestionEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.QuizEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.repository.QuizRepository; import jakarta.transaction.Transactional; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -19,9 +19,9 @@ import java.util.List; import java.util.UUID; -import static de.unistuttgart.iste.gits.common.testutil.TestUsers.userWithMembershipInCourseWithId; -import static de.unistuttgart.iste.gits.quiz_service.TestData.createMultipleChoiceQuestion; -import static de.unistuttgart.iste.gits.quiz_service.matcher.MultipleChoiceQuestionDtoToEntityMatcher.matchesEntity; +import static de.unistuttgart.iste.meitrex.common.testutil.TestUsers.userWithMembershipInCourseWithId; +import static de.unistuttgart.iste.meitrex.quiz_service.TestData.createMultipleChoiceQuestion; +import static de.unistuttgart.iste.meitrex.quiz_service.matcher.MultipleChoiceQuestionDtoToEntityMatcher.matchesEntity; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; diff --git a/src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizTest.java b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizTest.java similarity index 80% rename from src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizTest.java rename to src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizTest.java index f881959..d629874 100644 --- a/src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizTest.java +++ b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizTest.java @@ -1,12 +1,12 @@ -package de.unistuttgart.iste.gits.quiz_service.api.mutation; +package de.unistuttgart.iste.meitrex.quiz_service.api.mutation; -import de.unistuttgart.iste.gits.common.testutil.GraphQlApiTest; -import de.unistuttgart.iste.gits.common.testutil.InjectCurrentUserHeader; -import de.unistuttgart.iste.gits.common.testutil.TablesToDelete; -import de.unistuttgart.iste.gits.common.user_handling.LoggedInUser; -import de.unistuttgart.iste.gits.generated.dto.QuestionPoolingMode; -import de.unistuttgart.iste.gits.quiz_service.persistence.entity.QuizEntity; -import de.unistuttgart.iste.gits.quiz_service.persistence.repository.QuizRepository; +import de.unistuttgart.iste.meitrex.common.testutil.GraphQlApiTest; +import de.unistuttgart.iste.meitrex.common.testutil.InjectCurrentUserHeader; +import de.unistuttgart.iste.meitrex.common.testutil.TablesToDelete; +import de.unistuttgart.iste.meitrex.common.user_handling.LoggedInUser; +import de.unistuttgart.iste.meitrex.generated.dto.QuestionPoolingMode; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.QuizEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.repository.QuizRepository; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.graphql.test.tester.GraphQlTester; @@ -14,8 +14,8 @@ import java.util.List; import java.util.UUID; -import static de.unistuttgart.iste.gits.common.testutil.TestUsers.userWithMembershipInCourseWithId; -import static de.unistuttgart.iste.gits.quiz_service.TestData.createMultipleChoiceQuestion; +import static de.unistuttgart.iste.meitrex.common.testutil.TestUsers.userWithMembershipInCourseWithId; +import static de.unistuttgart.iste.meitrex.quiz_service.TestData.createMultipleChoiceQuestion; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; diff --git a/src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizUpdateAssociationQuestionTest.java b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizUpdateAssociationQuestionTest.java similarity index 75% rename from src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizUpdateAssociationQuestionTest.java rename to src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizUpdateAssociationQuestionTest.java index 68af810..fe12303 100644 --- a/src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizUpdateAssociationQuestionTest.java +++ b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizUpdateAssociationQuestionTest.java @@ -1,15 +1,17 @@ -package de.unistuttgart.iste.gits.quiz_service.api.mutation; +package de.unistuttgart.iste.meitrex.quiz_service.api.mutation; -import de.unistuttgart.iste.gits.common.testutil.GraphQlApiTest; -import de.unistuttgart.iste.gits.common.testutil.InjectCurrentUserHeader; -import de.unistuttgart.iste.gits.common.testutil.TablesToDelete; -import de.unistuttgart.iste.gits.common.user_handling.LoggedInUser; -import de.unistuttgart.iste.gits.generated.dto.*; -import de.unistuttgart.iste.gits.quiz_service.TestData; -import de.unistuttgart.iste.gits.quiz_service.api.QuizFragments; -import de.unistuttgart.iste.gits.quiz_service.persistence.entity.AssociationQuestionEntity; -import de.unistuttgart.iste.gits.quiz_service.persistence.entity.QuizEntity; -import de.unistuttgart.iste.gits.quiz_service.persistence.repository.QuizRepository; +import de.unistuttgart.iste.meitrex.common.testutil.GraphQlApiTest; +import de.unistuttgart.iste.meitrex.common.testutil.InjectCurrentUserHeader; +import de.unistuttgart.iste.meitrex.common.testutil.TablesToDelete; +import de.unistuttgart.iste.meitrex.common.user_handling.LoggedInUser; +import de.unistuttgart.iste.meitrex.generated.dto.AssociationInput; +import de.unistuttgart.iste.meitrex.generated.dto.SingleAssociation; +import de.unistuttgart.iste.meitrex.generated.dto.UpdateAssociationQuestionInput; +import de.unistuttgart.iste.meitrex.quiz_service.TestData; +import de.unistuttgart.iste.meitrex.quiz_service.api.QuizFragments; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.AssociationQuestionEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.QuizEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.repository.QuizRepository; import jakarta.transaction.Transactional; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -19,9 +21,9 @@ import java.util.List; import java.util.UUID; -import static de.unistuttgart.iste.gits.common.testutil.TestUsers.userWithMembershipInCourseWithId; -import static de.unistuttgart.iste.gits.quiz_service.TestData.association; -import static de.unistuttgart.iste.gits.quiz_service.TestData.createAssociationQuestion; +import static de.unistuttgart.iste.meitrex.common.testutil.TestUsers.userWithMembershipInCourseWithId; +import static de.unistuttgart.iste.meitrex.quiz_service.TestData.association; +import static de.unistuttgart.iste.meitrex.quiz_service.TestData.createAssociationQuestion; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; diff --git a/src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizUpdateClozeQuestionTest.java b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizUpdateClozeQuestionTest.java similarity index 84% rename from src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizUpdateClozeQuestionTest.java rename to src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizUpdateClozeQuestionTest.java index f0cb479..90b0f89 100644 --- a/src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizUpdateClozeQuestionTest.java +++ b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizUpdateClozeQuestionTest.java @@ -1,15 +1,15 @@ -package de.unistuttgart.iste.gits.quiz_service.api.mutation; - -import de.unistuttgart.iste.gits.common.testutil.GraphQlApiTest; -import de.unistuttgart.iste.gits.common.testutil.InjectCurrentUserHeader; -import de.unistuttgart.iste.gits.common.testutil.TablesToDelete; -import de.unistuttgart.iste.gits.common.user_handling.LoggedInUser; -import de.unistuttgart.iste.gits.generated.dto.*; -import de.unistuttgart.iste.gits.quiz_service.TestData; -import de.unistuttgart.iste.gits.quiz_service.api.QuizFragments; -import de.unistuttgart.iste.gits.quiz_service.persistence.entity.ClozeQuestionEntity; -import de.unistuttgart.iste.gits.quiz_service.persistence.entity.QuizEntity; -import de.unistuttgart.iste.gits.quiz_service.persistence.repository.QuizRepository; +package de.unistuttgart.iste.meitrex.quiz_service.api.mutation; + +import de.unistuttgart.iste.meitrex.common.testutil.GraphQlApiTest; +import de.unistuttgart.iste.meitrex.common.testutil.InjectCurrentUserHeader; +import de.unistuttgart.iste.meitrex.common.testutil.TablesToDelete; +import de.unistuttgart.iste.meitrex.common.user_handling.LoggedInUser; +import de.unistuttgart.iste.meitrex.generated.dto.*; +import de.unistuttgart.iste.meitrex.quiz_service.TestData; +import de.unistuttgart.iste.meitrex.quiz_service.api.QuizFragments; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.ClozeQuestionEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.QuizEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.repository.QuizRepository; import jakarta.transaction.Transactional; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -19,8 +19,8 @@ import java.util.List; import java.util.UUID; -import static de.unistuttgart.iste.gits.common.testutil.TestUsers.userWithMembershipInCourseWithId; -import static de.unistuttgart.iste.gits.quiz_service.TestData.*; +import static de.unistuttgart.iste.meitrex.common.testutil.TestUsers.userWithMembershipInCourseWithId; +import static de.unistuttgart.iste.meitrex.quiz_service.TestData.*; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; diff --git a/src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizUpdateExactAnswerQuestionTest.java b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizUpdateExactAnswerQuestionTest.java similarity index 78% rename from src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizUpdateExactAnswerQuestionTest.java rename to src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizUpdateExactAnswerQuestionTest.java index 53b87d7..e956c9d 100644 --- a/src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizUpdateExactAnswerQuestionTest.java +++ b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizUpdateExactAnswerQuestionTest.java @@ -1,15 +1,15 @@ -package de.unistuttgart.iste.gits.quiz_service.api.mutation; +package de.unistuttgart.iste.meitrex.quiz_service.api.mutation; -import de.unistuttgart.iste.gits.common.testutil.GraphQlApiTest; -import de.unistuttgart.iste.gits.common.testutil.InjectCurrentUserHeader; -import de.unistuttgart.iste.gits.common.testutil.TablesToDelete; -import de.unistuttgart.iste.gits.common.user_handling.LoggedInUser; -import de.unistuttgart.iste.gits.generated.dto.UpdateExactAnswerQuestionInput; -import de.unistuttgart.iste.gits.quiz_service.TestData; -import de.unistuttgart.iste.gits.quiz_service.api.QuizFragments; -import de.unistuttgart.iste.gits.quiz_service.persistence.entity.ExactAnswerQuestionEntity; -import de.unistuttgart.iste.gits.quiz_service.persistence.entity.QuizEntity; -import de.unistuttgart.iste.gits.quiz_service.persistence.repository.QuizRepository; +import de.unistuttgart.iste.meitrex.common.testutil.GraphQlApiTest; +import de.unistuttgart.iste.meitrex.common.testutil.InjectCurrentUserHeader; +import de.unistuttgart.iste.meitrex.common.testutil.TablesToDelete; +import de.unistuttgart.iste.meitrex.common.user_handling.LoggedInUser; +import de.unistuttgart.iste.meitrex.generated.dto.UpdateExactAnswerQuestionInput; +import de.unistuttgart.iste.meitrex.quiz_service.TestData; +import de.unistuttgart.iste.meitrex.quiz_service.api.QuizFragments; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.ExactAnswerQuestionEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.QuizEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.repository.QuizRepository; import jakarta.transaction.Transactional; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -19,8 +19,8 @@ import java.util.List; import java.util.UUID; -import static de.unistuttgart.iste.gits.common.testutil.TestUsers.userWithMembershipInCourseWithId; -import static de.unistuttgart.iste.gits.quiz_service.TestData.createExactAnswerQuestion; +import static de.unistuttgart.iste.meitrex.common.testutil.TestUsers.userWithMembershipInCourseWithId; +import static de.unistuttgart.iste.meitrex.quiz_service.TestData.createExactAnswerQuestion; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; diff --git a/src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizUpdateMultipleChoiceQuestionTest.java b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizUpdateMultipleChoiceQuestionTest.java similarity index 70% rename from src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizUpdateMultipleChoiceQuestionTest.java rename to src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizUpdateMultipleChoiceQuestionTest.java index 760518a..574022e 100644 --- a/src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizUpdateMultipleChoiceQuestionTest.java +++ b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizUpdateMultipleChoiceQuestionTest.java @@ -1,14 +1,16 @@ -package de.unistuttgart.iste.gits.quiz_service.api.mutation; +package de.unistuttgart.iste.meitrex.quiz_service.api.mutation; -import de.unistuttgart.iste.gits.common.testutil.GraphQlApiTest; -import de.unistuttgart.iste.gits.common.testutil.InjectCurrentUserHeader; -import de.unistuttgart.iste.gits.common.testutil.TablesToDelete; -import de.unistuttgart.iste.gits.common.user_handling.LoggedInUser; -import de.unistuttgart.iste.gits.generated.dto.*; -import de.unistuttgart.iste.gits.quiz_service.TestData; -import de.unistuttgart.iste.gits.quiz_service.api.QuizFragments; -import de.unistuttgart.iste.gits.quiz_service.persistence.entity.QuizEntity; -import de.unistuttgart.iste.gits.quiz_service.persistence.repository.QuizRepository; +import de.unistuttgart.iste.meitrex.common.testutil.GraphQlApiTest; +import de.unistuttgart.iste.meitrex.common.testutil.InjectCurrentUserHeader; +import de.unistuttgart.iste.meitrex.common.testutil.TablesToDelete; +import de.unistuttgart.iste.meitrex.common.user_handling.LoggedInUser; +import de.unistuttgart.iste.meitrex.generated.dto.MultipleChoiceAnswerInput; +import de.unistuttgart.iste.meitrex.generated.dto.MultipleChoiceQuestion; +import de.unistuttgart.iste.meitrex.generated.dto.UpdateMultipleChoiceQuestionInput; +import de.unistuttgart.iste.meitrex.quiz_service.TestData; +import de.unistuttgart.iste.meitrex.quiz_service.api.QuizFragments; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.QuizEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.repository.QuizRepository; import jakarta.transaction.Transactional; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -18,10 +20,10 @@ import java.util.List; import java.util.UUID; -import static de.unistuttgart.iste.gits.common.testutil.TestUsers.userWithMembershipInCourseWithId; -import static de.unistuttgart.iste.gits.quiz_service.TestData.createMultipleChoiceQuestion; -import static de.unistuttgart.iste.gits.quiz_service.matcher.MultipleChoiceQuestionDtoToUpdateInputMatcher.matchesInput; -import static de.unistuttgart.iste.gits.quiz_service.matcher.MultipleChoiceQuestionEntityToUpdateInputMatcher.matchesUpdateQuizInput; +import static de.unistuttgart.iste.meitrex.common.testutil.TestUsers.userWithMembershipInCourseWithId; +import static de.unistuttgart.iste.meitrex.quiz_service.TestData.createMultipleChoiceQuestion; +import static de.unistuttgart.iste.meitrex.quiz_service.matcher.MultipleChoiceQuestionDtoToUpdateInputMatcher.matchesInput; +import static de.unistuttgart.iste.meitrex.quiz_service.matcher.MultipleChoiceQuestionEntityToUpdateInputMatcher.matchesUpdateQuizInput; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; diff --git a/src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizUpdateNumericQuestionTest.java b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizUpdateNumericQuestionTest.java similarity index 77% rename from src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizUpdateNumericQuestionTest.java rename to src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizUpdateNumericQuestionTest.java index 5350107..b1dbf66 100644 --- a/src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizUpdateNumericQuestionTest.java +++ b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizUpdateNumericQuestionTest.java @@ -1,15 +1,15 @@ -package de.unistuttgart.iste.gits.quiz_service.api.mutation; +package de.unistuttgart.iste.meitrex.quiz_service.api.mutation; -import de.unistuttgart.iste.gits.common.testutil.GraphQlApiTest; -import de.unistuttgart.iste.gits.common.testutil.InjectCurrentUserHeader; -import de.unistuttgart.iste.gits.common.testutil.TablesToDelete; -import de.unistuttgart.iste.gits.common.user_handling.LoggedInUser; -import de.unistuttgart.iste.gits.generated.dto.UpdateNumericQuestionInput; -import de.unistuttgart.iste.gits.quiz_service.TestData; -import de.unistuttgart.iste.gits.quiz_service.api.QuizFragments; -import de.unistuttgart.iste.gits.quiz_service.persistence.entity.NumericQuestionEntity; -import de.unistuttgart.iste.gits.quiz_service.persistence.entity.QuizEntity; -import de.unistuttgart.iste.gits.quiz_service.persistence.repository.QuizRepository; +import de.unistuttgart.iste.meitrex.common.testutil.GraphQlApiTest; +import de.unistuttgart.iste.meitrex.common.testutil.InjectCurrentUserHeader; +import de.unistuttgart.iste.meitrex.common.testutil.TablesToDelete; +import de.unistuttgart.iste.meitrex.common.user_handling.LoggedInUser; +import de.unistuttgart.iste.meitrex.generated.dto.UpdateNumericQuestionInput; +import de.unistuttgart.iste.meitrex.quiz_service.TestData; +import de.unistuttgart.iste.meitrex.quiz_service.api.QuizFragments; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.NumericQuestionEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.QuizEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.repository.QuizRepository; import jakarta.transaction.Transactional; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -19,8 +19,8 @@ import java.util.List; import java.util.UUID; -import static de.unistuttgart.iste.gits.common.testutil.TestUsers.userWithMembershipInCourseWithId; -import static de.unistuttgart.iste.gits.quiz_service.TestData.createNumericQuestion; +import static de.unistuttgart.iste.meitrex.common.testutil.TestUsers.userWithMembershipInCourseWithId; +import static de.unistuttgart.iste.meitrex.quiz_service.TestData.createNumericQuestion; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; diff --git a/src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizUpdateSelfAssessmentQuestionTest.java b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizUpdateSelfAssessmentQuestionTest.java similarity index 76% rename from src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizUpdateSelfAssessmentQuestionTest.java rename to src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizUpdateSelfAssessmentQuestionTest.java index 9e62343..b38cb15 100644 --- a/src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutateQuizUpdateSelfAssessmentQuestionTest.java +++ b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutateQuizUpdateSelfAssessmentQuestionTest.java @@ -1,15 +1,15 @@ -package de.unistuttgart.iste.gits.quiz_service.api.mutation; +package de.unistuttgart.iste.meitrex.quiz_service.api.mutation; -import de.unistuttgart.iste.gits.common.testutil.GraphQlApiTest; -import de.unistuttgart.iste.gits.common.testutil.InjectCurrentUserHeader; -import de.unistuttgart.iste.gits.common.testutil.TablesToDelete; -import de.unistuttgart.iste.gits.common.user_handling.LoggedInUser; -import de.unistuttgart.iste.gits.generated.dto.UpdateSelfAssessmentQuestionInput; -import de.unistuttgart.iste.gits.quiz_service.TestData; -import de.unistuttgart.iste.gits.quiz_service.api.QuizFragments; -import de.unistuttgart.iste.gits.quiz_service.persistence.entity.QuizEntity; -import de.unistuttgart.iste.gits.quiz_service.persistence.entity.SelfAssessmentQuestionEntity; -import de.unistuttgart.iste.gits.quiz_service.persistence.repository.QuizRepository; +import de.unistuttgart.iste.meitrex.common.testutil.GraphQlApiTest; +import de.unistuttgart.iste.meitrex.common.testutil.InjectCurrentUserHeader; +import de.unistuttgart.iste.meitrex.common.testutil.TablesToDelete; +import de.unistuttgart.iste.meitrex.common.user_handling.LoggedInUser; +import de.unistuttgart.iste.meitrex.generated.dto.UpdateSelfAssessmentQuestionInput; +import de.unistuttgart.iste.meitrex.quiz_service.TestData; +import de.unistuttgart.iste.meitrex.quiz_service.api.QuizFragments; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.QuizEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.SelfAssessmentQuestionEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.repository.QuizRepository; import jakarta.transaction.Transactional; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -19,8 +19,8 @@ import java.util.List; import java.util.UUID; -import static de.unistuttgart.iste.gits.common.testutil.TestUsers.userWithMembershipInCourseWithId; -import static de.unistuttgart.iste.gits.quiz_service.TestData.createSelfAssessmentQuestion; +import static de.unistuttgart.iste.meitrex.common.testutil.TestUsers.userWithMembershipInCourseWithId; +import static de.unistuttgart.iste.meitrex.quiz_service.TestData.createSelfAssessmentQuestion; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; diff --git a/src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutationLogQuizCompletionTest.java b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutationLogQuizCompletionTest.java similarity index 77% rename from src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutationLogQuizCompletionTest.java rename to src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutationLogQuizCompletionTest.java index 7cc6bff..102ddf7 100644 --- a/src/test/java/de/unistuttgart/iste/gits/quiz_service/api/mutation/MutationLogQuizCompletionTest.java +++ b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/mutation/MutationLogQuizCompletionTest.java @@ -1,20 +1,20 @@ -package de.unistuttgart.iste.gits.quiz_service.api.mutation; - -import de.unistuttgart.iste.gits.common.dapr.TopicPublisher; -import de.unistuttgart.iste.gits.common.event.ContentProgressedEvent; -import de.unistuttgart.iste.gits.common.testutil.GraphQlApiTest; -import de.unistuttgart.iste.gits.common.testutil.InjectCurrentUserHeader; -import de.unistuttgart.iste.gits.common.testutil.MockTestPublisherConfiguration; -import de.unistuttgart.iste.gits.common.testutil.TablesToDelete; -import de.unistuttgart.iste.gits.common.user_handling.LoggedInUser; -import de.unistuttgart.iste.gits.generated.dto.QuestionCompletedInput; -import de.unistuttgart.iste.gits.generated.dto.QuestionPoolingMode; -import de.unistuttgart.iste.gits.generated.dto.QuizCompletedInput; -import de.unistuttgart.iste.gits.generated.dto.QuizCompletionFeedback; -import de.unistuttgart.iste.gits.quiz_service.TestData; -import de.unistuttgart.iste.gits.quiz_service.persistence.entity.QuestionEntity; -import de.unistuttgart.iste.gits.quiz_service.persistence.entity.QuizEntity; -import de.unistuttgart.iste.gits.quiz_service.persistence.repository.QuizRepository; +package de.unistuttgart.iste.meitrex.quiz_service.api.mutation; + +import de.unistuttgart.iste.meitrex.common.dapr.TopicPublisher; +import de.unistuttgart.iste.meitrex.common.event.ContentProgressedEvent; +import de.unistuttgart.iste.meitrex.common.testutil.GraphQlApiTest; +import de.unistuttgart.iste.meitrex.common.testutil.InjectCurrentUserHeader; +import de.unistuttgart.iste.meitrex.common.testutil.MockTestPublisherConfiguration; +import de.unistuttgart.iste.meitrex.common.testutil.TablesToDelete; +import de.unistuttgart.iste.meitrex.common.user_handling.LoggedInUser; +import de.unistuttgart.iste.meitrex.generated.dto.QuestionCompletedInput; +import de.unistuttgart.iste.meitrex.generated.dto.QuestionPoolingMode; +import de.unistuttgart.iste.meitrex.generated.dto.QuizCompletedInput; +import de.unistuttgart.iste.meitrex.generated.dto.QuizCompletionFeedback; +import de.unistuttgart.iste.meitrex.quiz_service.TestData; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.QuestionEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.QuizEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.repository.QuizRepository; import jakarta.transaction.Transactional; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -25,7 +25,7 @@ import java.util.List; import java.util.UUID; -import static de.unistuttgart.iste.gits.common.testutil.TestUsers.userWithMembershipInCourseWithId; +import static de.unistuttgart.iste.meitrex.common.testutil.TestUsers.userWithMembershipInCourseWithId; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.mockito.Mockito.times; diff --git a/src/test/java/de/unistuttgart/iste/gits/quiz_service/api/query/QueryByIdTest.java b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/query/QueryByIdTest.java similarity index 94% rename from src/test/java/de/unistuttgart/iste/gits/quiz_service/api/query/QueryByIdTest.java rename to src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/query/QueryByIdTest.java index dad175b..3d9021f 100644 --- a/src/test/java/de/unistuttgart/iste/gits/quiz_service/api/query/QueryByIdTest.java +++ b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/api/query/QueryByIdTest.java @@ -1,14 +1,14 @@ -package de.unistuttgart.iste.gits.quiz_service.api.query; +package de.unistuttgart.iste.meitrex.quiz_service.api.query; import com.fasterxml.jackson.databind.ObjectMapper; -import de.unistuttgart.iste.gits.common.testutil.GraphQlApiTest; -import de.unistuttgart.iste.gits.common.testutil.InjectCurrentUserHeader; -import de.unistuttgart.iste.gits.common.testutil.TablesToDelete; -import de.unistuttgart.iste.gits.common.user_handling.LoggedInUser; -import de.unistuttgart.iste.gits.generated.dto.*; -import de.unistuttgart.iste.gits.quiz_service.api.QuizFragments; -import de.unistuttgart.iste.gits.quiz_service.persistence.entity.QuizEntity; -import de.unistuttgart.iste.gits.quiz_service.persistence.repository.QuizRepository; +import de.unistuttgart.iste.meitrex.common.testutil.GraphQlApiTest; +import de.unistuttgart.iste.meitrex.common.testutil.InjectCurrentUserHeader; +import de.unistuttgart.iste.meitrex.common.testutil.TablesToDelete; +import de.unistuttgart.iste.meitrex.common.user_handling.LoggedInUser; +import de.unistuttgart.iste.meitrex.generated.dto.*; +import de.unistuttgart.iste.meitrex.quiz_service.api.QuizFragments; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.QuizEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.repository.QuizRepository; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.graphql.test.tester.GraphQlTester; @@ -16,9 +16,9 @@ import java.util.List; import java.util.UUID; -import static de.unistuttgart.iste.gits.common.testutil.TestUsers.userWithMembershipInCourseWithId; -import static de.unistuttgart.iste.gits.quiz_service.TestData.*; -import static de.unistuttgart.iste.gits.quiz_service.matcher.MultipleChoiceQuestionDtoToEntityMatcher.matchesEntity; +import static de.unistuttgart.iste.meitrex.common.testutil.TestUsers.userWithMembershipInCourseWithId; +import static de.unistuttgart.iste.meitrex.quiz_service.TestData.*; +import static de.unistuttgart.iste.meitrex.quiz_service.matcher.MultipleChoiceQuestionDtoToEntityMatcher.matchesEntity; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; diff --git a/src/test/java/de/unistuttgart/iste/gits/quiz_service/matcher/MultipleChoiceAnswerDtoToEntityMatcher.java b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/matcher/MultipleChoiceAnswerDtoToEntityMatcher.java similarity index 87% rename from src/test/java/de/unistuttgart/iste/gits/quiz_service/matcher/MultipleChoiceAnswerDtoToEntityMatcher.java rename to src/test/java/de/unistuttgart/iste/meitrex/quiz_service/matcher/MultipleChoiceAnswerDtoToEntityMatcher.java index 9dc7c19..ffe4dba 100644 --- a/src/test/java/de/unistuttgart/iste/gits/quiz_service/matcher/MultipleChoiceAnswerDtoToEntityMatcher.java +++ b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/matcher/MultipleChoiceAnswerDtoToEntityMatcher.java @@ -1,7 +1,7 @@ -package de.unistuttgart.iste.gits.quiz_service.matcher; +package de.unistuttgart.iste.meitrex.quiz_service.matcher; -import de.unistuttgart.iste.gits.generated.dto.MultipleChoiceAnswer; -import de.unistuttgart.iste.gits.quiz_service.persistence.entity.MultipleChoiceAnswerEmbeddable; +import de.unistuttgart.iste.meitrex.generated.dto.MultipleChoiceAnswer; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.MultipleChoiceAnswerEmbeddable; import org.hamcrest.Description; import org.hamcrest.TypeSafeDiagnosingMatcher; diff --git a/src/test/java/de/unistuttgart/iste/gits/quiz_service/matcher/MultipleChoiceAnswerDtoToInputMatcher.java b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/matcher/MultipleChoiceAnswerDtoToInputMatcher.java similarity index 88% rename from src/test/java/de/unistuttgart/iste/gits/quiz_service/matcher/MultipleChoiceAnswerDtoToInputMatcher.java rename to src/test/java/de/unistuttgart/iste/meitrex/quiz_service/matcher/MultipleChoiceAnswerDtoToInputMatcher.java index 193c9d4..7f5f7f9 100644 --- a/src/test/java/de/unistuttgart/iste/gits/quiz_service/matcher/MultipleChoiceAnswerDtoToInputMatcher.java +++ b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/matcher/MultipleChoiceAnswerDtoToInputMatcher.java @@ -1,7 +1,7 @@ -package de.unistuttgart.iste.gits.quiz_service.matcher; +package de.unistuttgart.iste.meitrex.quiz_service.matcher; -import de.unistuttgart.iste.gits.generated.dto.MultipleChoiceAnswer; -import de.unistuttgart.iste.gits.generated.dto.MultipleChoiceAnswerInput; +import de.unistuttgart.iste.meitrex.generated.dto.MultipleChoiceAnswer; +import de.unistuttgart.iste.meitrex.generated.dto.MultipleChoiceAnswerInput; import org.hamcrest.Description; import org.hamcrest.TypeSafeDiagnosingMatcher; diff --git a/src/test/java/de/unistuttgart/iste/gits/quiz_service/matcher/MultipleChoiceAnswerEntityToInputMatcher.java b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/matcher/MultipleChoiceAnswerEntityToInputMatcher.java similarity index 87% rename from src/test/java/de/unistuttgart/iste/gits/quiz_service/matcher/MultipleChoiceAnswerEntityToInputMatcher.java rename to src/test/java/de/unistuttgart/iste/meitrex/quiz_service/matcher/MultipleChoiceAnswerEntityToInputMatcher.java index 834fb5f..18b6dc5 100644 --- a/src/test/java/de/unistuttgart/iste/gits/quiz_service/matcher/MultipleChoiceAnswerEntityToInputMatcher.java +++ b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/matcher/MultipleChoiceAnswerEntityToInputMatcher.java @@ -1,7 +1,7 @@ -package de.unistuttgart.iste.gits.quiz_service.matcher; +package de.unistuttgart.iste.meitrex.quiz_service.matcher; -import de.unistuttgart.iste.gits.generated.dto.MultipleChoiceAnswerInput; -import de.unistuttgart.iste.gits.quiz_service.persistence.entity.MultipleChoiceAnswerEmbeddable; +import de.unistuttgart.iste.meitrex.generated.dto.MultipleChoiceAnswerInput; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.MultipleChoiceAnswerEmbeddable; import org.hamcrest.Description; import org.hamcrest.TypeSafeDiagnosingMatcher; diff --git a/src/test/java/de/unistuttgart/iste/gits/quiz_service/matcher/MultipleChoiceQuestionDtoToCreateInputMatcher.java b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/matcher/MultipleChoiceQuestionDtoToCreateInputMatcher.java similarity index 89% rename from src/test/java/de/unistuttgart/iste/gits/quiz_service/matcher/MultipleChoiceQuestionDtoToCreateInputMatcher.java rename to src/test/java/de/unistuttgart/iste/meitrex/quiz_service/matcher/MultipleChoiceQuestionDtoToCreateInputMatcher.java index 7793c8f..5e94a68 100644 --- a/src/test/java/de/unistuttgart/iste/gits/quiz_service/matcher/MultipleChoiceQuestionDtoToCreateInputMatcher.java +++ b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/matcher/MultipleChoiceQuestionDtoToCreateInputMatcher.java @@ -1,6 +1,8 @@ -package de.unistuttgart.iste.gits.quiz_service.matcher; +package de.unistuttgart.iste.meitrex.quiz_service.matcher; -import de.unistuttgart.iste.gits.generated.dto.*; +import de.unistuttgart.iste.meitrex.generated.dto.CreateMultipleChoiceQuestionInput; +import de.unistuttgart.iste.meitrex.generated.dto.MultipleChoiceQuestion; +import de.unistuttgart.iste.meitrex.generated.dto.QuestionType; import org.hamcrest.Description; import org.hamcrest.TypeSafeDiagnosingMatcher; diff --git a/src/test/java/de/unistuttgart/iste/gits/quiz_service/matcher/MultipleChoiceQuestionDtoToEntityMatcher.java b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/matcher/MultipleChoiceQuestionDtoToEntityMatcher.java similarity index 87% rename from src/test/java/de/unistuttgart/iste/gits/quiz_service/matcher/MultipleChoiceQuestionDtoToEntityMatcher.java rename to src/test/java/de/unistuttgart/iste/meitrex/quiz_service/matcher/MultipleChoiceQuestionDtoToEntityMatcher.java index 8c13bf5..4afce0b 100644 --- a/src/test/java/de/unistuttgart/iste/gits/quiz_service/matcher/MultipleChoiceQuestionDtoToEntityMatcher.java +++ b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/matcher/MultipleChoiceQuestionDtoToEntityMatcher.java @@ -1,9 +1,9 @@ -package de.unistuttgart.iste.gits.quiz_service.matcher; +package de.unistuttgart.iste.meitrex.quiz_service.matcher; -import de.unistuttgart.iste.gits.generated.dto.MultipleChoiceQuestion; -import de.unistuttgart.iste.gits.generated.dto.QuestionType; -import de.unistuttgart.iste.gits.quiz_service.persistence.entity.MultipleChoiceQuestionEntity; -import de.unistuttgart.iste.gits.quiz_service.persistence.entity.QuestionEntity; +import de.unistuttgart.iste.meitrex.generated.dto.MultipleChoiceQuestion; +import de.unistuttgart.iste.meitrex.generated.dto.QuestionType; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.MultipleChoiceQuestionEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.QuestionEntity; import org.hamcrest.Description; import org.hamcrest.TypeSafeDiagnosingMatcher; diff --git a/src/test/java/de/unistuttgart/iste/gits/quiz_service/matcher/MultipleChoiceQuestionDtoToUpdateInputMatcher.java b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/matcher/MultipleChoiceQuestionDtoToUpdateInputMatcher.java similarity index 89% rename from src/test/java/de/unistuttgart/iste/gits/quiz_service/matcher/MultipleChoiceQuestionDtoToUpdateInputMatcher.java rename to src/test/java/de/unistuttgart/iste/meitrex/quiz_service/matcher/MultipleChoiceQuestionDtoToUpdateInputMatcher.java index dbd82ee..3659392 100644 --- a/src/test/java/de/unistuttgart/iste/gits/quiz_service/matcher/MultipleChoiceQuestionDtoToUpdateInputMatcher.java +++ b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/matcher/MultipleChoiceQuestionDtoToUpdateInputMatcher.java @@ -1,6 +1,8 @@ -package de.unistuttgart.iste.gits.quiz_service.matcher; +package de.unistuttgart.iste.meitrex.quiz_service.matcher; -import de.unistuttgart.iste.gits.generated.dto.*; +import de.unistuttgart.iste.meitrex.generated.dto.MultipleChoiceQuestion; +import de.unistuttgart.iste.meitrex.generated.dto.QuestionType; +import de.unistuttgart.iste.meitrex.generated.dto.UpdateMultipleChoiceQuestionInput; import org.hamcrest.Description; import org.hamcrest.TypeSafeDiagnosingMatcher; diff --git a/src/test/java/de/unistuttgart/iste/gits/quiz_service/matcher/MultipleChoiceQuestionEntityToUpdateInputMatcher.java b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/matcher/MultipleChoiceQuestionEntityToUpdateInputMatcher.java similarity index 87% rename from src/test/java/de/unistuttgart/iste/gits/quiz_service/matcher/MultipleChoiceQuestionEntityToUpdateInputMatcher.java rename to src/test/java/de/unistuttgart/iste/meitrex/quiz_service/matcher/MultipleChoiceQuestionEntityToUpdateInputMatcher.java index 46bb37d..a312962 100644 --- a/src/test/java/de/unistuttgart/iste/gits/quiz_service/matcher/MultipleChoiceQuestionEntityToUpdateInputMatcher.java +++ b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/matcher/MultipleChoiceQuestionEntityToUpdateInputMatcher.java @@ -1,9 +1,9 @@ -package de.unistuttgart.iste.gits.quiz_service.matcher; +package de.unistuttgart.iste.meitrex.quiz_service.matcher; -import de.unistuttgart.iste.gits.generated.dto.QuestionType; -import de.unistuttgart.iste.gits.generated.dto.UpdateMultipleChoiceQuestionInput; -import de.unistuttgart.iste.gits.quiz_service.persistence.entity.MultipleChoiceQuestionEntity; -import de.unistuttgart.iste.gits.quiz_service.persistence.entity.QuestionEntity; +import de.unistuttgart.iste.meitrex.generated.dto.QuestionType; +import de.unistuttgart.iste.meitrex.generated.dto.UpdateMultipleChoiceQuestionInput; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.MultipleChoiceQuestionEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.QuestionEntity; import org.hamcrest.Description; import org.hamcrest.TypeSafeDiagnosingMatcher; diff --git a/src/test/java/de/unistuttgart/iste/gits/quiz_service/matcher/QuizEntityToCreateInputMatcher.java b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/matcher/QuizEntityToCreateInputMatcher.java similarity index 89% rename from src/test/java/de/unistuttgart/iste/gits/quiz_service/matcher/QuizEntityToCreateInputMatcher.java rename to src/test/java/de/unistuttgart/iste/meitrex/quiz_service/matcher/QuizEntityToCreateInputMatcher.java index 9a7638f..813c9a8 100644 --- a/src/test/java/de/unistuttgart/iste/gits/quiz_service/matcher/QuizEntityToCreateInputMatcher.java +++ b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/matcher/QuizEntityToCreateInputMatcher.java @@ -1,7 +1,7 @@ -package de.unistuttgart.iste.gits.quiz_service.matcher; +package de.unistuttgart.iste.meitrex.quiz_service.matcher; -import de.unistuttgart.iste.gits.generated.dto.CreateQuizInput; -import de.unistuttgart.iste.gits.quiz_service.persistence.entity.QuizEntity; +import de.unistuttgart.iste.meitrex.generated.dto.CreateQuizInput; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.QuizEntity; import org.hamcrest.Description; import org.hamcrest.TypeSafeDiagnosingMatcher; diff --git a/src/test/java/de/unistuttgart/iste/gits/quiz_service/service/QuizServiceTest.java b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/service/QuizServiceTest.java similarity index 89% rename from src/test/java/de/unistuttgart/iste/gits/quiz_service/service/QuizServiceTest.java rename to src/test/java/de/unistuttgart/iste/meitrex/quiz_service/service/QuizServiceTest.java index 46ef020..0055549 100644 --- a/src/test/java/de/unistuttgart/iste/gits/quiz_service/service/QuizServiceTest.java +++ b/src/test/java/de/unistuttgart/iste/meitrex/quiz_service/service/QuizServiceTest.java @@ -1,19 +1,29 @@ -package de.unistuttgart.iste.gits.quiz_service.service; - -import de.unistuttgart.iste.gits.common.dapr.TopicPublisher; -import de.unistuttgart.iste.gits.common.event.*; -import de.unistuttgart.iste.gits.common.exception.IncompleteEventMessageException; -import de.unistuttgart.iste.gits.generated.dto.*; -import de.unistuttgart.iste.gits.quiz_service.TestData; -import de.unistuttgart.iste.gits.quiz_service.persistence.entity.*; -import de.unistuttgart.iste.gits.quiz_service.persistence.mapper.QuizMapper; -import de.unistuttgart.iste.gits.quiz_service.persistence.repository.QuizRepository; -import de.unistuttgart.iste.gits.quiz_service.validation.QuizValidator; +package de.unistuttgart.iste.meitrex.quiz_service.service; + +import de.unistuttgart.iste.meitrex.common.dapr.TopicPublisher; +import de.unistuttgart.iste.meitrex.common.event.ContentChangeEvent; +import de.unistuttgart.iste.meitrex.common.event.ContentProgressedEvent; +import de.unistuttgart.iste.meitrex.common.event.CrudOperation; +import de.unistuttgart.iste.meitrex.common.exception.IncompleteEventMessageException; +import de.unistuttgart.iste.meitrex.generated.dto.QuestionCompletedInput; +import de.unistuttgart.iste.meitrex.generated.dto.QuestionPoolingMode; +import de.unistuttgart.iste.meitrex.generated.dto.QuizCompletedInput; +import de.unistuttgart.iste.meitrex.generated.dto.QuizCompletionFeedback; +import de.unistuttgart.iste.meitrex.quiz_service.TestData; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.MultipleChoiceQuestionEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.QuestionEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.entity.QuizEntity; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.mapper.QuizMapper; +import de.unistuttgart.iste.meitrex.quiz_service.persistence.repository.QuizRepository; +import de.unistuttgart.iste.meitrex.quiz_service.validation.QuizValidator; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.modelmapper.ModelMapper; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.UUID; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is;