add models to communicate with lecture interface 2#3
Draft
Conversation
…n send their view models without parsing and sending multiple requests
Contributor
|
I'm vetoing against this PR. |
Contributor
|
@IlijazM there has been widespread confusion about this naming scheme. |
Contributor
good that we test. Deletion currently fails. |
maexled
reviewed
Sep 28, 2022
Comment on lines
+96
to
+141
| public ConfigurationDTO build(final ConfigurationVM configurationVM) { | ||
| Set<Code> codesToPersist = new HashSet<>(configurationVM.getCodes().size()); | ||
| for (CodeVM codeVM : configurationVM.getCodes()) { | ||
| List<Word> wordsToPersistToCode = new ArrayList<>(codeVM.getWords().size()); | ||
| Set<Bug> bugsToPersistToSolution = new HashSet<>(); | ||
| bugsToPersistToSolution = new HashSet<>(); | ||
| for (List<WordVM> row : codeVM.getWords()) { | ||
| // check if the row only contains blank strings | ||
| // the first row will never contain only blank strings since it comes from the lecture interface | ||
| if (row.stream().allMatch(wordVM -> wordVM.getCorrectValue().isBlank())) { | ||
| continue; | ||
| } | ||
| // if it is not the first row in the code we add a new line | ||
| if (codeVM.getWords().indexOf(row) != 0) { | ||
| wordsToPersistToCode.add(wordRepository.save(new Word(null, "\n"))); | ||
| } | ||
| for (WordVM wordVM : row) { | ||
| // check if the word is blank | ||
| // the first word will never be blank since it comes from the lecture interface | ||
| if (wordVM.getCorrectValue().isBlank()) { | ||
| continue; | ||
| } | ||
| // if it is not the first word in the row we add a space | ||
| if (row.indexOf(wordVM) != 0) { | ||
| wordsToPersistToCode.add(wordRepository.save(new Word(null, " "))); | ||
| } | ||
| String displayValue = wordVM.getDisplayValue() != null ? wordVM.getDisplayValue() : wordVM.getCorrectValue(); | ||
| Word word = new Word(null, displayValue); | ||
| word = wordRepository.save(word); | ||
| wordsToPersistToCode.add(word); | ||
| if (wordVM.getErrorType() != null) { | ||
| Bug bug = new Bug(word, wordVM.getErrorType(), wordVM.getCorrectValue()); | ||
| bug = bugRepository.save(bug); | ||
| bugsToPersistToSolution.add(bug); | ||
| } | ||
| } | ||
| } | ||
| Code code = new Code(null, wordsToPersistToCode); | ||
| codesToPersist.add(code); | ||
| Solution solution = new Solution(null, bugsToPersistToSolution, code); | ||
| code = codeRepository.save(code); | ||
| solution = solutionRepository.save(solution); | ||
| } | ||
| Configuration configuration = new Configuration(null, codesToPersist); | ||
| return configurationMapper.toDTO(configurationRepository.save(configuration)); | ||
| } |
Contributor
There was a problem hiding this comment.
way too long method, also javadoc missing
Comment on lines
+171
to
+216
| public ConfigurationVM getViewModel(UUID id) { | ||
| log.debug("get configuration view model {}", id); | ||
| final Configuration configuration = getConfiguration(id); | ||
| final ConfigurationVM configurationVM = new ConfigurationVM(new ArrayList<>()); | ||
| for (Code code : configuration.getCodes()) { | ||
| final CodeVM codeVM = new CodeVM(new ArrayList<>()); | ||
| final Solution solution = solutionRepository | ||
| .findByCodeId(code.getId()) | ||
| .orElseThrow(() -> | ||
| new ResponseStatusException( | ||
| HttpStatus.NOT_FOUND, | ||
| String.format("Solution with code id %s not found.", code.getId()) | ||
| ) | ||
| ); | ||
|
|
||
| List<WordVM> row = new ArrayList<>(); | ||
| for (Word word : code.getWords()) { | ||
| if (word.getWord().equals("\n")) { | ||
| codeVM.getWords().add(row); | ||
| row = new ArrayList<>(); | ||
| continue; | ||
| } | ||
| Optional<Bug> bug = solution | ||
| .getBugs() | ||
| .stream() | ||
| .filter(b -> b.getWord().getId().equals(word.getId())) | ||
| .findFirst(); | ||
| if (word.getWord().equals(" ") && bug.isEmpty()) { | ||
| continue; | ||
| } | ||
| final WordVM wordVM = new WordVM(); | ||
| if (bug.isPresent()) { | ||
| wordVM.setErrorType(bug.get().getErrorType()); | ||
| wordVM.setCorrectValue(bug.get().getCorrectValue()); | ||
| wordVM.setDisplayValue(word.getWord()); | ||
| } else { | ||
| wordVM.setCorrectValue(word.getWord()); | ||
| } | ||
| row.add(wordVM); | ||
| } | ||
| codeVM.getWords().add(row); | ||
| configurationVM.getCodes().add(codeVM); | ||
| } | ||
|
|
||
| return configurationVM; | ||
| } |
Contributor
There was a problem hiding this comment.
too long method, split it up, add java doc
Contributor
There was a problem hiding this comment.
And equals(" ") or equals("\n") WON'T scale well!
Those are error prone AF.
It's probably best to extract them into methods.
IlijazM
changed the title
IlijazM
changed the title
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Part of Gamify-IT/issues#299