Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
CTF
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Grzegorz
CTF
Commits
592b3bee
Commit
592b3bee
authored
Mar 20, 2016
by
Grzegorz Pietrusza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add completeted tasks endpoint
parent
827199c0
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
2 deletions
+25
-2
TasksRepository.java
...phoners/krakyournet/ctf/repositories/TasksRepository.java
+16
-2
SolutionsResource.java
...ephoners/krakyournet/ctf/resources/SolutionsResource.java
+9
-0
No files found.
service/src/main/java/com/telephoners/krakyournet/ctf/repositories/TasksRepository.java
View file @
592b3bee
package
com
.
telephoners
.
krakyournet
.
ctf
.
repositories
;
import
com.telephoners.krakyournet.ctf.core.ApplicationConfiguration
;
import
com.telephoners.krakyournet.ctf.helpers.DBObjectUtils
;
import
com.telephoners.krakyournet.ctf.beans.Flag
;
import
com.telephoners.krakyournet.ctf.beans.Solution
;
import
com.telephoners.krakyournet.ctf.beans.Team
;
import
com.telephoners.krakyournet.ctf.beans.User
;
import
com.telephoners.krakyournet.ctf.beans.tasks.Task
;
import
com.telephoners.krakyournet.ctf.core.ApplicationConfiguration
;
import
com.telephoners.krakyournet.ctf.helpers.DBObjectUtils
;
import
javafx.util.Pair
;
import
org.apache.commons.codec.binary.Hex
;
import
org.mongodb.morphia.Datastore
;
...
...
@@ -174,4 +174,18 @@ public class TasksRepository implements Repository
{
datastore
.
getCollection
(
Task
.
class
).
drop
();
}
//todo: should it be here?
public
List
<
Integer
>
getCompletedTasks
(
Team
team
)
{
Map
<
Integer
,
List
<
String
>>
teamSolutions
=
solutionsRepository
.
getTeamSolutions
(
team
);
return
getAll
().
stream
()
.
filter
(
task
->
{
int
numberOfFlags
=
task
.
getFlags
().
size
();
List
<
String
>
teamTaskSolutions
=
teamSolutions
.
get
(
task
.
getLevel
());
return
teamTaskSolutions
!=
null
&&
teamTaskSolutions
.
size
()
==
numberOfFlags
;
})
.
map
(
Task:
:
getLevel
)
.
collect
(
Collectors
.
toList
());
}
}
\ No newline at end of file
service/src/main/java/com/telephoners/krakyournet/ctf/resources/SolutionsResource.java
View file @
592b3bee
...
...
@@ -48,6 +48,14 @@ public class SolutionsResource
return
Response
.
status
(
Response
.
Status
.
NOT_ACCEPTABLE
).
build
();
}
@GET
@Path
(
"/completed"
)
public
List
<
Integer
>
getTeamCompletedTasks
(
@Auth
User
user
)
{
Optional
<
Team
>
team
=
teamsRepository
.
getTeamByUser
(
user
);
return
tasksRepository
.
getCompletedTasks
(
team
.
get
());
}
@GET
@Path
(
"/my"
)
public
Map
<
Integer
,
List
<
String
>>
getTeamSolutions
(
@Auth
User
user
)
...
...
@@ -58,6 +66,7 @@ public class SolutionsResource
@GET
@Path
(
"/all"
)
//todo: should return completed, not all flags?
public
Map
<
String
,
Map
<
Integer
,
List
<
String
>>>
getTeamsSolutions
()
{
return
teamsRepository
.
getAll
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment