diff --git a/backend/pom.xml b/backend/pom.xml index 773d0ca6b..2de634f33 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.5 + 3.2.0 pt.ulisboa.tecnico.socialsoftware diff --git a/backend/src/main/java/pt/ulisboa/tecnico/socialsoftware/tutor/answer/AnswerService.java b/backend/src/main/java/pt/ulisboa/tecnico/socialsoftware/tutor/answer/AnswerService.java index ec57b5a6d..4dbfc1cc7 100644 --- a/backend/src/main/java/pt/ulisboa/tecnico/socialsoftware/tutor/answer/AnswerService.java +++ b/backend/src/main/java/pt/ulisboa/tecnico/socialsoftware/tutor/answer/AnswerService.java @@ -236,7 +236,7 @@ private void writeQuestionAnswer(QuestionAnswer questionAnswer, List new TutorException(QUESTION_ANSWER_NOT_FOUND, questionAnswer.getId())); questionAnswer.setTimeTaken(statementAnswerDto.getTimeTaken()); - AnswerDetails answer = questionAnswer.setAnswerDetails(statementAnswerDto); + AnswerDetails answer = questionAnswer.setAnswerDetailsByStatementAnswerDto(statementAnswerDto); if (answer != null) { answerDetailsRepository.save(answer); } diff --git a/backend/src/main/java/pt/ulisboa/tecnico/socialsoftware/tutor/answer/domain/QuestionAnswer.java b/backend/src/main/java/pt/ulisboa/tecnico/socialsoftware/tutor/answer/domain/QuestionAnswer.java index 78638a734..89f003a77 100644 --- a/backend/src/main/java/pt/ulisboa/tecnico/socialsoftware/tutor/answer/domain/QuestionAnswer.java +++ b/backend/src/main/java/pt/ulisboa/tecnico/socialsoftware/tutor/answer/domain/QuestionAnswer.java @@ -115,7 +115,7 @@ public void setAnswerDetails(AnswerDetails answerDetails) { } } - public AnswerDetails setAnswerDetails(StatementAnswerDto statementAnswerDto) { + public AnswerDetails setAnswerDetailsByStatementAnswerDto(StatementAnswerDto statementAnswerDto) { this.answerDetails = statementAnswerDto.getAnswerDetails(this); if (this.answerDetails != null) { this.answerDetails.setQuestionAnswer(this); diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 15fed2b48..ce4f4ac5a 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -56,7 +56,7 @@ "babel-jest": "~27.5.1", "codecov": "~4.0.0-0", "compression-webpack-plugin": "~10.0.0", - "cypress": "^13.5.1", + "cypress": "^13.6.0", "eslint": "~8.39.0", "eslint-plugin-prettier": "~4.2.1", "eslint-plugin-vue": "~9.11.0", @@ -6924,9 +6924,9 @@ "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==" }, "node_modules/cypress": { - "version": "13.5.1", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.5.1.tgz", - "integrity": "sha512-yqLViT0D/lPI8Kkm7ciF/x/DCK/H/DnogdGyiTnQgX4OVR2aM30PtK+kvklTOD1u3TuItiD9wUQAF8EYWtyZug==", + "version": "13.6.0", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.6.0.tgz", + "integrity": "sha512-quIsnFmtj4dBUEJYU4OH0H12bABJpSujvWexC24Ju1gTlKMJbeT6tTO0vh7WNfiBPPjoIXLN+OUqVtiKFs6SGw==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -25610,9 +25610,9 @@ "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==" }, "cypress": { - "version": "13.5.1", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.5.1.tgz", - "integrity": "sha512-yqLViT0D/lPI8Kkm7ciF/x/DCK/H/DnogdGyiTnQgX4OVR2aM30PtK+kvklTOD1u3TuItiD9wUQAF8EYWtyZug==", + "version": "13.6.0", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.6.0.tgz", + "integrity": "sha512-quIsnFmtj4dBUEJYU4OH0H12bABJpSujvWexC24Ju1gTlKMJbeT6tTO0vh7WNfiBPPjoIXLN+OUqVtiKFs6SGw==", "dev": true, "requires": { "@cypress/request": "^3.0.0", diff --git a/frontend/package.json b/frontend/package.json index 89f0786d8..d64fa5e07 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -61,7 +61,7 @@ "babel-jest": "~27.5.1", "codecov": "~4.0.0-0", "compression-webpack-plugin": "~10.0.0", - "cypress": "^13.5.1", + "cypress": "^13.6.0", "eslint": "~8.39.0", "eslint-plugin-prettier": "~4.2.1", "eslint-plugin-vue": "~9.11.0",