Peer-at-Code/peer-at-code-backend
5
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'dev' of https://git.peerat.dev/Peer-at-Code/peer-at-code-backend into dev

Browse source
This commit is contained in:
jeffcheasey88 2023-09-16 12:17:47 +02:00
commit 3da54bbe17
4 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/dev/peerat/backend/model/Chapter.java
View file

@ -35,11 +35,10 @@ public class Chapter {
this.puzzles = puzzles;
}
public boolean isInCurrentTime(){
public boolean hasStarted(){
LocalDateTime now = LocalDateTime.now();
boolean show = true;
if(startDate != null) show &= now.isAfter(startDate.toLocalDateTime());
if(endDate != null) show &= now.isBefore(endDate.toLocalDateTime());
return show;
}

2
src/dev/peerat/backend/model/Puzzle.java
View file

@ -86,7 +86,7 @@ public class Puzzle {
return this.depend;
}
public boolean isInCurrentTime(){
public boolean hasStarted(){
LocalDateTime now = LocalDateTime.now();
boolean show = true;
if(startDate != null) show &= now.isAfter(startDate.toLocalDateTime());

4
src/dev/peerat/backend/routes/ChapterElement.java
View file

@ -33,7 +33,7 @@ public class ChapterElement implements Response {
JsonMap chapterJSON = new JsonMap();
chapterJSON.set("id", chapter.getId());
chapterJSON.set("name", chapter.getName());
boolean show = chapter.isInCurrentTime();
boolean show = chapter.hasStarted();
chapterJSON.set("show", show);
PeerAtUser user = context.getUser();
if(show){
@ -46,7 +46,7 @@ public class ChapterElement implements Response {
if (puzzle.getTags() != null) puzzleJSON.set("tags", puzzle.getJsonTags());
int score = this.databaseRepo.getScore(user.getId(), puzzle.getId());
if(score >= 0) puzzleJSON.set("score", score);
puzzleJSON.set("show", puzzle.isInCurrentTime());
puzzleJSON.set("show", puzzle.hasStarted());
puzzles.add(puzzleJSON);
}
chapterJSON.set("puzzles", puzzles);

2
src/dev/peerat/backend/routes/ChapterList.java
View file

@ -34,7 +34,7 @@ public class ChapterList implements Response {
JsonMap chapterJSON = new JsonMap();
chapterJSON.set("id", chapter.getId());
chapterJSON.set("name", chapter.getName());
chapterJSON.set("show", chapter.isInCurrentTime());
chapterJSON.set("show", chapter.hasStarted());
chaptersJSON.add(chapterJSON);
}
context.response(200);