-
Notifications
You must be signed in to change notification settings - Fork 4
Feature/#165 rest api new #173
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 72 commits
Commits
Show all changes
74 commits
Select commit
Hold shift + click to select a range
019bffd
Merge pull request #156 from doubleSlashde/release/v1.3
Death111 8241426
#165: Include REST API
mairKi f567ddd
#165_REST-API: Include Swagger
mairKi d2416da
#165_Zwischen Commit auslagerung in module
mairKi f04c9df
#165: Swagger v3 not working
mairKi 19ad014
Revert "#165: Swagger v3 not working"
mairKi 128be9c
Revert "#165_Zwischen Commit auslagerung in module"
mairKi 930e4f8
Revert "#165_REST-API: Include Swagger"
mairKi 9439929
#165: include GetMappig
mairKi 5964cae
#165: include post ang get Mapping
mairKi 58107d5
#165: Include PutMapping and code Refactoring
mairKi 871cb7a
#165: include updateWork and Refactoring
mairKi 05b369c
#165: Refactoring
mairKi 672bfad
#165: Include REST API Authentication
mairKi 96b3a16
#165: include authentication Flyway
mairKi cd8adbc
#165: Add UserRepository
mairKi 350b384
#165: Add AuthoritiesRepository
mairKi ba6e6e4
#165: Get all Works with api
mairKi 5621f1c
#165: Include authentikation with GUI
mairKi 26d46d0
#165: ON and OFF but OFF not Correct
mairKi b2d0e51
#165: include API AuthTest
mairKi cbe6a9f
#165: API Auth
mairKi 0d42f3c
#165: include Auth on Gui
mairKi 6d57a4a
#165: Zwischen Speicher
mairKi c7e18ad
IPTE-165: Authentikation freigabe für Post, PUT, ...
mairKi 76ccb87
IPTE-165: Include Deletmapping for Work ,Project and edit Work
mairKi fff79d1
IPTE-156: Get Curret Project ID and Delete Mapping with default query
mairKi ed4b4ca
IPTE-165: Include Change API Port
mairKi 0bfa224
IPTE-165: in clude Rest API Port, Current
mairKi 2b06ec8
IPTE-156: ON OFF
mairKi 584f2df
IPTE-165: Code Refactoring
mairKi 2e83a1d
IPTE-165: include DTO
mairKi bed209c
IPTE-165: Include ColorDTO
mairKi 6a99f80
IPTE-165: Refactoring Transfer to own packages
mairKi 8562439
IPTE-165: Clean Code
mairKi 36b93e7
IPTE-165: Refactoring WorksController
mairKi bb4ba0b
IPTE-165: Refactoring ProjectController and Transfer ProjectColorDTO …
mairKi 49a3db6
IPTE-165: Remove Button in GUI
mairKi 3fcb8aa
IPTE-165: Port Default OFF
mairKi bea1723
IPTE-165: Code Refactoring
mairKi 49428b1
IPTE-165: Code Refactoring
mairKi f94c978
IPTE-165: Pull Request
mairKi 4480dc8
IPTE-165: Test Refactoring
mairKi 49630a3
IPTE-165: ON-OFF API Status
mairKi 2555d54
Revert "IPTE-165: ON-OFF API Status"
mairKi 1dcf40d
IPTE-165: Code Refactoring ON OFF Username
mairKi e875ab4
IPTE-165: Code Refatoring include getUser
mairKi 007a337
IPTE-165: Clean pom.xml
mairKi fb2535f
IPTE-165: Clean Code
mairKi 8a51e63
Merge branch 'feature/update_dependencies' into feature/#165_Rest-API…
mairKi e0ac484
#165Rest-API-New: Fix User Bug
mairKi 0c80e5c
#165Rest-API-New: Include license header
mairKi ed66096
#165Rest-API-New: Clean Code
mairKi 0e340ac
#165_Rest-API-New: Merge Request
mairKi 4afbc5e
IPTE-165: Clean Code
mairKi 4fa51be
#165: Zwischen Kommit mit funktionality Login
mairKi 07df243
#165: Clean Code
mairKi 8a6a6e4
#165: Code Refactoring
mairKi d2c9b19
Include a new Class LoginController and LoginControllerTest
mairKi 284b278
#165: Code Refactoring
mairKi 6f752e0
#165 Pull Request
mairKi 484bc3b
#165: Pull Request
mairKi 498047f
Merge branch 'develop' into feature/#165_Rest-API-New
mairKi 75b2bf9
Merge branch 'master' into feature/#165_Rest-API-New
mairKi 820e5f6
Merge branch 'develop' into feature/#165_Rest-API-New
Death111 310bffc
#165: fix test. use string to transfer color instead of double rgba v…
Death111 884c060
#165: add openapi + swagger ui
Death111 20b8444
#165: switched some if statements to be easier redable. started to ma…
Death111 f8c9dac
#165: fix issue where all application.properties were persisted in se…
Death111 0a67fb3
#165: wrapping writting calls from api in a wrapper. adapted rest calls
Death111 1fd80c2
#165: migrate SecurityConfiguration
Death111 d747c50
#165: format code
Death111 eee8ff7
#165: using close instead of stop to properly close application with …
Death111 ec823f7
#165: added filter options for get work
Death111 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,3 +30,4 @@ logs/ | |
|
|
||
| config.xml | ||
| /db/ | ||
| application.properties | ||
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
56 changes: 56 additions & 0 deletions
56
src/main/java/de/doubleslash/keeptime/REST_API/DTO/ColorDTO.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| // Copyright 2024 doubleSlash Net Business GmbH | ||
| // | ||
| // This file is part of KeepTime. | ||
| // KeepTime is free software: you can redistribute it and/or modify | ||
| // it under the terms of the GNU General Public License as published by | ||
| // the Free Software Foundation, either version 3 of the License, or | ||
| // (at your option) any later version. | ||
| // | ||
| // This program is distributed in the hope that it will be useful, | ||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| // GNU General Public License for more details. | ||
| // | ||
| // You should have received a copy of the GNU General Public License | ||
| // along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
|
|
||
| package de.doubleslash.keeptime.REST_API.DTO; | ||
|
|
||
| public class ColorDTO { | ||
| private double red; | ||
| private double green; | ||
| private double blue; | ||
| private double opacity; | ||
|
|
||
| public double getRed() { | ||
| return red; | ||
| } | ||
|
|
||
| public void setRed(double red) { | ||
| this.red = red; | ||
| } | ||
|
|
||
| public double getGreen() { | ||
| return green; | ||
| } | ||
|
|
||
| public void setGreen(double green) { | ||
| this.green = green; | ||
| } | ||
|
|
||
| public double getBlue() { | ||
| return blue; | ||
| } | ||
|
|
||
| public void setBlue(double blue) { | ||
| this.blue = blue; | ||
| } | ||
|
|
||
| public double getOpacity() { | ||
| return opacity; | ||
| } | ||
|
|
||
| public void setOpacity(double opacity) { | ||
| this.opacity = opacity; | ||
| } | ||
| } |
106 changes: 106 additions & 0 deletions
106
src/main/java/de/doubleslash/keeptime/REST_API/DTO/ProjectColorDTO.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| // Copyright 2024 doubleSlash Net Business GmbH | ||
| // | ||
| // This file is part of KeepTime. | ||
| // KeepTime is free software: you can redistribute it and/or modify | ||
| // it under the terms of the GNU General Public License as published by | ||
| // the Free Software Foundation, either version 3 of the License, or | ||
| // (at your option) any later version. | ||
| // | ||
| // This program is distributed in the hope that it will be useful, | ||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| // GNU General Public License for more details. | ||
| // | ||
| // You should have received a copy of the GNU General Public License | ||
| // along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
|
|
||
| package de.doubleslash.keeptime.REST_API.DTO; | ||
|
|
||
| public class ProjectColorDTO { | ||
| private long id; | ||
| private String name; | ||
| private String description; | ||
| private ColorDTO color; | ||
| private boolean isWork; | ||
| private boolean isDefault; | ||
| private boolean isEnabled; | ||
| private int index; | ||
|
|
||
|
|
||
| public ProjectColorDTO( long id, String name, String description, ColorDTO color, boolean isWork, int index, boolean isDefault) { | ||
| this.id= id; | ||
| this.name = name; | ||
| this.description = description; | ||
| this.color = color; | ||
| this.isWork = isWork; | ||
| this.index = index; | ||
| this.isDefault = isDefault; | ||
| this.isEnabled = true; | ||
| } | ||
|
|
||
| public long getId() { | ||
| return id; | ||
| } | ||
|
|
||
| public void setId(final long id) { | ||
| this.id = id; | ||
| } | ||
|
|
||
| public String getName() { | ||
| return name; | ||
| } | ||
|
|
||
| public void setName(String name) { | ||
| this.name = name; | ||
| } | ||
|
|
||
| public String getDescription() { | ||
| return description; | ||
| } | ||
|
|
||
| public void setDescription(String description) { | ||
| this.description = description; | ||
| } | ||
|
|
||
| public ColorDTO getColor() { | ||
| return color; | ||
| } | ||
|
|
||
| public void setColor(ColorDTO color) { | ||
| this.color = color; | ||
| } | ||
|
|
||
| public boolean isWork() { | ||
| return isWork; | ||
| } | ||
|
|
||
| public void setWork(boolean isWork) { | ||
| this.isWork = isWork; | ||
| } | ||
|
|
||
| public boolean isDefault() { | ||
| return isDefault; | ||
| } | ||
|
|
||
| public void setDefault(boolean isDefault) { | ||
| this.isDefault = isDefault; | ||
| } | ||
|
|
||
| public boolean isEnabled() { | ||
| return isEnabled; | ||
| } | ||
|
|
||
| public void setEnabled(boolean isEnabled) { | ||
| this.isEnabled = isEnabled; | ||
| } | ||
|
|
||
| public int getIndex() { | ||
| return index; | ||
| } | ||
|
|
||
| public void setIndex(int index) { | ||
| this.index = index; | ||
| } | ||
|
|
||
|
|
||
| } |
33 changes: 33 additions & 0 deletions
33
src/main/java/de/doubleslash/keeptime/REST_API/DTO/ProjectDTO.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| // Copyright 2024 doubleSlash Net Business GmbH | ||
| // | ||
| // This file is part of KeepTime. | ||
| // KeepTime is free software: you can redistribute it and/or modify | ||
| // it under the terms of the GNU General Public License as published by | ||
| // the Free Software Foundation, either version 3 of the License, or | ||
| // (at your option) any later version. | ||
| // | ||
| // This program is distributed in the hope that it will be useful, | ||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| // GNU General Public License for more details. | ||
| // | ||
| // You should have received a copy of the GNU General Public License | ||
| // along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
|
|
||
| package de.doubleslash.keeptime.REST_API.DTO; | ||
|
|
||
| public class ProjectDTO { | ||
| private long id; | ||
|
|
||
| public ProjectDTO(final long id) { | ||
| this.id = id; | ||
| } | ||
|
|
||
| public long getId() { | ||
| return id; | ||
| } | ||
|
|
||
| public void setId(final long id) { | ||
| this.id = id; | ||
| } | ||
| } |
75 changes: 75 additions & 0 deletions
75
src/main/java/de/doubleslash/keeptime/REST_API/DTO/WorkDTO.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| // Copyright 2024 doubleSlash Net Business GmbH | ||
| // | ||
| // This file is part of KeepTime. | ||
| // KeepTime is free software: you can redistribute it and/or modify | ||
| // it under the terms of the GNU General Public License as published by | ||
| // the Free Software Foundation, either version 3 of the License, or | ||
| // (at your option) any later version. | ||
| // | ||
| // This program is distributed in the hope that it will be useful, | ||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| // GNU General Public License for more details. | ||
| // | ||
| // You should have received a copy of the GNU General Public License | ||
| // along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
|
|
||
| package de.doubleslash.keeptime.REST_API.DTO; | ||
|
|
||
| import java.time.LocalDateTime; | ||
|
|
||
| public class WorkDTO { | ||
| private long id; | ||
| private LocalDateTime startTime; | ||
| private LocalDateTime endTime; | ||
| private ProjectDTO project; | ||
| private String notes; | ||
|
|
||
| public WorkDTO(long id, LocalDateTime startTime, LocalDateTime endTime, ProjectDTO project, String notes) { | ||
| this.id = id; | ||
| this.startTime = startTime; | ||
| this.endTime = endTime; | ||
| this.project = project; | ||
| this.notes = notes; | ||
| } | ||
|
|
||
| public long getId() { | ||
| return id; | ||
| } | ||
|
|
||
| public void setId(long id) { | ||
| this.id = id; | ||
| } | ||
|
|
||
| public LocalDateTime getStartTime() { | ||
| return startTime; | ||
| } | ||
|
|
||
| public void setStartTime(LocalDateTime startTime) { | ||
| this.startTime = startTime; | ||
| } | ||
|
|
||
| public LocalDateTime getEndTime() { | ||
| return endTime; | ||
| } | ||
|
|
||
| public void setEndTime(LocalDateTime endTime) { | ||
| this.endTime = endTime; | ||
| } | ||
|
|
||
| public ProjectDTO getProject() { | ||
| return project; | ||
| } | ||
|
|
||
| public void setProject(ProjectDTO project) { | ||
| this.project = project; | ||
| } | ||
|
|
||
| public String getNotes() { | ||
| return notes; | ||
| } | ||
|
|
||
| public void setNotes(String notes) { | ||
| this.notes = notes; | ||
| } | ||
| } |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.