Commit Graph
100 Commits
Author SHA1 Message Date
y0rune 2ec3699978 Added javadocs
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-12-23 14:26:29 +01:00
y0rune 507d9fddc0 Method body ready
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-12-23 14:21:16 +01:00
y0rune e647698591 Fix problem with admin test - cleaning database
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-12-23 14:06:02 +01:00
y0rune da46582fc0 Added check for admin user and test it
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-12-23 13:48:26 +01:00
y0rune 165dee5bd2 Updated gitlab-ci
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-12-23 12:56:37 +01:00
y0rune 76cf5c8e96 Merge pull request 'refresh-token' (#35) from refresh-token into master
Accepted
Reviewed-on: http://git.plannaplan.pl/filipizydorczyk/backend/pulls/35
2020-12-23 12:41:03 +01:00
y0rune e18f285dd6 Merge pull request 'email' (#34) from email into master
Reviewed-on: http://git.plannaplan.pl/filipizydorczyk/backend/pulls/34
2020-12-21 17:11:32 +01:00
y0rune 0d6ad184bc Merge pull request 'timeto-owner' (#33) from timeto-owner into master
Reviewed-on: http://git.plannaplan.pl/filipizydorczyk/backend/pulls/33
2020-12-20 15:15:03 +01:00
y0rune 48c23ad4f8 Merge pull request 'user-fix' (#32) from user-fix into master
Reviewed-on: http://git.plannaplan.pl/filipizydorczyk/backend/pulls/32
2020-12-18 17:28:02 +01:00
y0rune ca440a3fd5 Merge pull request 'turs' (#31) from turs into master
Reviewed-on: http://git.plannaplan.pl/filipizydorczyk/backend/pulls/31
2020-12-14 15:50:35 +01:00
y0rune 1cdb301adf Updated .git-ci
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-12-08 19:09:35 +01:00
y0rune c1dce7d3bb Merge pull request 'git-ci' (#29) from git-ci into master
Reviewed-on: http://git.plannaplan.pl/filipizydorczyk/backend/pulls/29
2020-12-08 19:01:57 +01:00
y0rune 2921c98c35 Updated .git-ci
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-12-08 19:02:02 +01:00
y0rune 181d93082c Updated .git-ci
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-12-08 18:42:18 +01:00
y0rune b495fd7f65 Updated .git-ci
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-12-08 18:41:08 +01:00
y0rune 086e4be458 Updated .git-ci
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-12-08 18:37:02 +01:00
y0rune 0c471162f2 Updated .git-ci
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-12-08 18:31:58 +01:00
y0rune 9f3e41e601 Updated .git-ci
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-12-08 18:31:07 +01:00
y0rune d85cdb9b22 Added gitci
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-12-08 18:26:35 +01:00
y0rune b412ee2a5b Merge pull request 'new-cas-configuration' (#27) from new-cas-configuration into master
Reviewed-on: http://git.plannaplan.pl/filipizydorczyk/backend/pulls/27
2020-12-07 21:10:49 +01:00
y0rune 2037f0bf07 Added
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-12-07 21:09:54 +01:00
y0rune 2dd1f70eee Updated 2020-12-04 17:15:08 +01:00
y0rune c70cac58b2 Updated
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-12-04 16:16:10 +01:00
y0rune 616f782155 Updated
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-12-04 15:54:49 +01:00
y0rune 6dfb99f253 Updated
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-12-04 15:42:28 +01:00
y0rune b897fce416 Fixed TokenController
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-12-03 17:14:39 +01:00
y0rune f4db74b899 Added test UserServiceTest - shouldCreateUser shouldReturnExistingUser
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-12-03 17:07:41 +01:00
y0rune 453907782a CAS Part 2
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-12-03 16:57:53 +01:00
y0rune 3ebfda5316 CAS Part 1
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-12-03 16:23:39 +01:00
y0rune b6c2e43975 Added cas module + add customuamcasvalidator + test passed
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-12-03 15:11:23 +01:00
y0rune 6298bb4765 Updated
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-12-02 15:00:18 +01:00
y0rune c24aa73bb0 CustomUAMCasValidatorTest
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-12-02 14:37:44 +01:00
y0rune 20d261635b Added CustomUAMCasValidator
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-12-02 13:51:07 +01:00
y0rune 1e3cccc991 Added CasValidator.java; Update DefaultUAMCasValidator
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-12-02 13:48:28 +01:00
y0rune cd96e74c29 Added folder cas
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-12-02 13:31:18 +01:00
y0rune 7d747b60a8 Renamed CasValidator -> DefaultUAMCasValidator
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-12-02 12:38:17 +01:00
y0rune b966b64fdb Resolved confilics with master
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-12-02 12:16:31 +01:00
y0rune 1d15d295e0 Merge pull request 'group-count' (#25) from group-count into master
Reviewed-on: http://git.plannaplan.pl/filipizydorczyk/backend/pulls/25
2020-12-02 11:58:42 +01:00
y0rune f8b12d831b Added CourseService into javadoc
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-12-02 11:14:30 +01:00
y0rune 20341d5441 Added CommisionService into javadoc
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-12-02 10:22:50 +01:00
y0rune 3faa228745 Added AssignmentService into javadoc
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-12-02 10:14:32 +01:00
y0rune e6fffba899 Added FileData into javadocs
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-12-01 21:31:06 +01:00
y0rune 708cedf7b4 Added ConfigData into javadocs 2020-12-01 21:16:47 +01:00
y0rune 96c903ed15 Added javadocs to User
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-12-01 21:13:05 +01:00
y0rune 160930c3c3 Added javadocs to Lecturer - fix errors
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-12-01 21:03:26 +01:00
y0rune 823f4af218 Added javadocs to Lecturer
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-12-01 20:59:16 +01:00
y0rune 911f2e54f5 Added Course into javadoc
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-11-27 17:05:47 +01:00
y0rune 7d5522e413 Added Course into javadoc
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-11-27 16:53:36 +01:00
y0rune 9ed4197005 Added Assignment
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-11-27 16:45:06 +01:00
y0rune dc3a554ed1 Added Assignment
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-11-27 16:40:39 +01:00
y0rune f6a8953c17 Added
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-11-27 16:18:30 +01:00
y0rune e752ad06cd mit
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-11-20 15:31:29 +01:00
y0rune 6d9c5a8a5d Added
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-11-20 14:55:20 +01:00
y0rune 85052f5728 Check it !!! UserRepository.java
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-11-20 14:53:45 +01:00
y0rune 50c1397db2 Added docs into repositories
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-11-20 14:50:07 +01:00
y0rune af8e2ced28 Added docs into services 2020-11-20 13:20:44 +01:00
y0rune 9ad8db527d Merge remote-tracking branch 'origin/master' into ZPI-163 2020-11-18 09:05:43 +01:00
y0rune bc6c55165e Added docs into branch
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-11-18 09:01:45 +01:00
y0rune 17e5625315 Updated
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-11-12 17:50:53 +01:00
y0rune 1ddeb83cb4 Merge pull request 'Token expiration added' (#22) from token-expiration into master
Reviewed-on: http://git.plannaplan.pl/filipizydorczyk/backend/pulls/22
2020-11-11 14:08:12 +01:00
y0rune 029300815e Added auth to swagger-ui
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-11-09 17:08:51 +01:00
y0rune 7c7045c0e1 Part3 has been ended. Renamed the test files. The test had status successed.
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-11-09 16:47:12 +01:00
y0rune 035de011f2 Part 2 has been ended. The Part 3: chanaged test 2020-11-08 17:20:00 +01:00
y0rune a30c3af09c Part 1
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-11-08 16:55:56 +01:00
y0rune 8ba148617a Merge pull request 'Added empty table' (#21) from ZPI-144 into master
Reviewed-on: http://git.plannaplan.pl/filipizydorczyk/backend/pulls/21
2020-11-05 16:14:31 +01:00
y0rune 48fdeb726f Added empty table
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-11-05 16:14:50 +01:00
y0rune bd4591f442 Merge pull request 'refactor-api-endpoints' (#20) from refactor-api-endpoints into master
Reviewed-on: http://git.plannaplan.pl/filipizydorczyk/backend/pulls/20
2020-11-05 15:34:26 +01:00
y0rune feff5c4b9c Merge pull request 'user-commisions-list' (#18) from user-commisions-list into master
Reviewed-on: http://git.plannaplan.pl/filipizydorczyk/backend/pulls/18
2020-11-05 14:55:55 +01:00
y0rune cbd9074a89 Merge pull request 'Made wepAppContex commont' (#19) from tests-refactor into master
Reviewed-on: http://git.plannaplan.pl/filipizydorczyk/backend/pulls/19
2020-11-05 14:40:16 +01:00
y0rune 9bff6460d6 Merge origin/deanery-plan-changing to master: With fixed restservice/.../App.java
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-10-30 17:34:32 +01:00
y0rune 1571bccb49 Changed api links in the Tests 2020-10-30 17:22:40 +01:00
y0rune 2b59c181e5 Refactor part 1
{{url}}/api/v1/courses/getCourses =>  {{url}}/api/v1/courses/all
{{url}}/api/v1/groups/getCourseGroups?id=13 => {{url}}/api/v1/groups/course/13
{{url}}/api/v1/courses/getCoursesWithGroups => {{url}}/api/v1/courses/all?groups=true
{{url}}/api/v1/commisions/add => {{url}}/api/v1/commisions/user
{{url}}/api/v1/commisions/getAllCommisions => {{url}}/api/v1/commisions/user
{{url}}/api/v1/assignments/getCurrentAssignments =>{{url}}/api/v1/assignments/user
{{url}}/api/v1/users/searchForStudents => {{url}}/api/v1/users/search

Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-10-30 16:42:57 +01:00
y0rune 4267fadf62 Deleted __pycache__
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-10-29 15:36:14 +01:00
y0rune 41f37ee9ad Merge pull request 'Added argv to python script' (#16) from python-change into master
Reviewed-on: http://git.plannaplan.pl/filipizydorczyk/backend/pulls/16
2020-10-29 15:32:54 +01:00
y0rune 4ca2837b59 Merge pull request 'Chenged newest plan response' (#14) from endpoint-changes into master
Reviewed-on: http://git.plannaplan.pl/filipizydorczyk/backend/pulls/14
2020-10-29 15:32:31 +01:00
y0rune 953168a452 Added argv to python script
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-10-29 15:22:31 +01:00
y0rune f71715fd6b Merge pull request 'scurity-roles' (#13) from scurity-roles into master
Reviewed-on: http://git.plannaplan.pl/filipizydorczyk/backend/pulls/13
LGMT
2020-10-24 18:01:29 +02:00
y0rune 603dadd9c1 Mapping of getCourseGroups
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-10-20 19:02:18 +02:00
y0rune a20bc89fc6 Added GetCourseGroupsResponse(-Test)
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-10-16 16:13:40 +02:00
y0rune 9c02a0b596 Merge pull request 'refactor' (#11) from refactor into master
Reviewed-on: http://git.plannaplan.pl/filipizydorczyk/backend/pulls/11
2020-10-15 18:14:13 +02:00
y0rune 6be6bd0184 Added LecturerServiceTest with createAndDeleteLecturer
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-09-16 17:41:36 +02:00
y0rune 1cff3ceb74 Added delete method into LecturerService
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-09-16 17:35:39 +02:00
y0rune a717a85a80 Created test GroupServiceTest.java. It contains createAndDeleteGroup
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-09-16 17:33:39 +02:00
y0rune d5e32a487b Added delete method in GroupService
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-09-16 17:23:33 +02:00
y0rune 551011db1c Zmiana nazwy z Remove na Delete, dodanie testu na usuwanie.
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-09-16 17:21:01 +02:00
y0rune 283be6603d Dodanie usuniecie kursu.
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-09-16 17:15:56 +02:00
y0rune 43660c4fe9 Dodanie nowego testu do dodawnia kursu.
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-09-16 17:14:37 +02:00
y0rune 579da3f038 Merge pull request 'security' (#9) from security into master
Reviewed-on: http://git.plannaplan.pl/filipizydorczyk/backend/pulls/9
2020-09-15 17:27:04 +02:00
y0rune 408c8a8242 Removed ConfiguratorTest.java, and rewrite it into configutils/FileToDatabaseMigratorTest.java
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-09-09 16:26:42 +02:00
y0rune 333ceb9b74 Merge pull request 'testing-web' (#7) from testing-web into master
Testy zakończone sukcesem. Brak błędów pomiędzy discro.

Reviewed-on: http://git.plannaplan.pl/filipizydorczyk/backend/pulls/7
2020-09-04 16:25:40 +02:00
y0rune 56e519dcd6 Updated
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-09-03 17:09:35 +02:00
y0rune b659f70a1f Changed version junit 4.11 to 4.12
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-09-03 17:02:17 +02:00
y0rune f6d4674ec8 Inny error, zmiana lokalizacji pliku
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-09-03 16:59:27 +02:00
y0rune 9ea2912e98 Added ConfiguratorTest.java. Updated pom.xml
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-09-03 16:30:42 +02:00
y0rune b65c56078b Merge pull request 'sql -> hql' (#6) from hql into master
Reviewed-on: http://git.plannaplan.pl/filipizydorczyk/backend/pulls/6
2020-09-03 15:27:37 +02:00
y0rune 6bdfa6ca1c Updated fix 2020-08-29 11:59:59 +02:00
y0rune d4abf7e6a4 Updated fix 2020-08-29 11:56:30 +02:00
y0rune c64d08a5d2 Changed enum from [1,7] to [0,6] and in FileToDatabaseMigrator changed WeekDay.getDay(day - 1)
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2020-08-29 11:46:40 +02:00
y0rune fb09e9caff fix 2020-08-28 18:10:11 +02:00
y0rune f05666d688 Auto-commit: saved api.md 2020-08-28 16:09:44 +02:00