Index: itignore =================================================================== --- .gitignore (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,9 +1,0 @@ -/target/* -.idea -.run -*.iml -*.env -.vscode/ -node_modules/ -uploads/ -docs/test-data1.sql Index: ER_BUILD_BOARD.xml =================================================================== --- ER_BUILD_BOARD.xml (revision 60a0e5c67655330cf92f154a1aa53fa6f5175b22) +++ ER_BUILD_BOARD.xml (revision 60a0e5c67655330cf92f154a1aa53fa6f5175b22) @@ -0,0 +1,1 @@ +THREADtrue16dPROJECT_THREADTOPIC_THREADDOUBLE3DISCUSSION_THREADDOUBLE3CONTAINS

3N

BELONGS_TO

NTAG

USER

33true16o

DEVELOPER

INVLOVLED_IN

3NPROJECT_MANAGERtrue16o

IS_OWNED_BY

3N

3

3MPERMISSIONSHAS

NHAS

NCREATES

DOUBLE3CUSTOM_ROLE

M

3M

3NDOUBLE3CONTAINS

3NDOUBLE3CONTAINS

DOUBLE3CHANNEL

3NIS_CREATED_BY

3N

IS_CREATED_BY

3N

MODERATORtrue16o

IS_MODERATED_BY

3N

REPLIES

Index: eandb.sh =================================================================== --- cleandb.sh (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,25 +1,0 @@ -#!/bin/bash - -source .dbparams.env - -profile=$1 - -if [ "$profile" == '-r' ]; then - mvn flyway:clean \ - -Dflyway.user="$REMOTE_USER" \ - -Dflyway.password="$REMOTE_PASS" \ - -Dflyway.url=jdbc:postgresql://localhost:"$REMOTE_PORT"/"$REMOTE_DB" \ - -Dflyway.cleanDisabled=false - elif [ "$profile" == '-l' ]; then - mvn flyway:clean \ - -Dflyway.user="$POSTGRES_USER" \ - -Dflyway.password="$POSTGRES_PASS" \ - -Dflyway.url=jdbc:postgresql://localhost:"$POSTGRES_PORT"/"$POSTGRES_DB" \ - -Dflyway.cleanDisabled=false - else - echo "INVALID RUN OPTION." - echo "USE -r TO CLEAN REMOTE DATABASE" - echo "USE -l TO CLEAN LOCAL DATABASE" - exit 0 - fi - Index: cs/ERModelWiki.txt =================================================================== --- docs/ERModelWiki.txt (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,107 +1,0 @@ -== ER Дијаграм -[[Image(ER_BUILD_BOARD_v2.png)]] -== Податочни побарувања -=== Ентитети -* Ентитет **USER** - податоци за корсниците. - * Кандидат клучеви: Username. Поради чести промени на атрибутот, за примерен клуч избравме вештачки клуч Id. - * Атрибути: - * Username - текстуален податок,задолижетелен. - * Description - текстуален податок,опционален. - * Password - текстуален податок,задолжителен. - * Register_date - текстуален податок,задолжителен. - * Sex - текстуален податок,опционален. - * Is_active - булов податок, задолжителен. - * Id - нумерички податок, задолжителен. -* Ентитет **DEVELOPER** - преклопувачка специјализација, со делумно учество, од USER. Ентитетов се однесува на корисниците, кои се истовремено и развивачи на софтвер. - *Кандидат клучеви: исто како и ентитетот USER и овај ентитет се идентификува со примарниот вештачки клуч Id. -* Ентитет **PROJECT_OWNER** - преклопувачка специјализација, со делумно учество, од DEVELOPER. Ентитетов се однесува на развивачите на софтвер, кои поседуваат проекти. - *Кандидат клучеви: исто како и ентитетот DEVELOPER и овај ентитет се идентификува со примарниот вештачки клуч Id. -* Ентитет **MODERATOR** - преклопувачка специјализација, со делумно учество, од USER. Ентитетов се однесува на корисниците, кои истовремено се и модератори на threads. - *Кандидат клучеви: исто како и ентитетот USER и овај ентитет се идентификува со примарниот вештачки клуч Id. -* Ентитет **TAG** - податоци за можните тагови. Служат за групирање на thread. - * Кандидат клучеви: Name, како податок уникат за секој таг. Истиот го избравме за примарен клуч на ентитетов. - * Атрибути: - * Name - текстуален податок,задолжителен. -* Ентитет **THREAD** - генерализација на сите можни водови на threads. Ги содржи сличните податоци присутни кај поединечните видови. - * Кандидат клучеви: бидејќи најмално супер-клуч множество би се состоело од сите атрибути на ентитет, за примарен клуч избравме вештачки клуч Id. - * Атрибути: - * Content - текстуален податок,задолжителен. - * Id - нумерички податок, задолжителен. -* Ентитет **TOPIC_THREAD** - дисјунктна специјализација, со целосно учество, од THREAD. Ентитетов се однесува на сите threads кој се топици и ги содржи податоците специфични за нив. - * Кандидат клучеви: исто како и ентитетот THREAD и овај ентитет се идентификува со примарниот,вештачки клуч Id. - * Атрибути: - * Title - текстуален податок,задолжителен. - * Guidlines - json податок,задолжителен. -* Ентитет **DISCUSSION_THREAD** - дисјунктна специјализација, со целосно учество, од THREAD. Ентитетов се однесува на сите threads кој се дискусии и ги содржи податоците специфични за нив. - * Кандидат клучеви: исто како и ентитетот THREAD и овај ентитет се идентификува со примарниот,вештачки клуч Id. -* Ентитет **PROJECT_THREAD** - дисјунктна специјализација, со целосно учество, од THREAD. Ентитетов се однесува на сите threads кој се дискусии и ги содржи податоците специфични за нив. - * Кандидат клучеви: исто како и ентитетот THREAD и овај ентитет се идентификува со примарниот,вештачки клуч Id. - * Атрибути: - * Repo_url - текстуален податок, опционален. - * Title - текстуален податок,задолжителен. -* Слаб ентитет **BLACKLISTED_USER** - податоци за тоа на кои корисници му е забранет пристапот во кои threads, од кои модератор. - * Кандидат клучеви: парцијалнен клуч Start_date, но за целосно идентификување се користат идентификувачките релации со THREAD,MODERATOR и USER. - * Атрибути: - * Start_date - датум, задолжителен. - * End_date - датум, опционален. - * Reason - текстуален податок,задолжителен. -* Слаб ентитет **REPORT** - податоци за извештаите, во врска со можни прекршување на правилата на соодветен thread, од страна на соодветни корсиници. - * Кандидат клучеви: заради можноста да постојат повеќе извештаи, кои се однесуваат на истиот корсиник, за прекршувања на правилата на истиот thread, поднеси од страна на истиот корисник, одлучивме да генерираме вештачки парцијалнен клуч Id. За целосно идентификување на ентитетиве служат идентификувачките релации со THREAD и USER. - * Атрибути: - * Id - нумерички, задолжителен. - * Created_at - датум, задолжителен. - * Status - енумерирачки, задолжителен. - * Description - текстуален, задолжителен. -* Слаб ентитет **PROJECT_REQUEST** - податоци за сите барања за учество од страна на корисниците кон конкретен проект. - * Кандидат клучеви: заради можноста еден корисник да испрати повеќе барања за учество кон ист проект, одлучивме да генерираме вештачки парцијалнен клуч Id. За целосно идентификување на ентитетиве служат идентификувачките релации со USER и PROJECT_THREAD. - * Атрибути: - * Id - нумерички, задолжителен. - * Status - енумерирачки, задолжителен. - * Description - текстуален, задолжителен. -* Слаб ентитет **CHANNEL** - податоци за каналите во проектите. - * Кандидат клучеви: парцијалниот клуч Name, целосно се идентификува преку идентификувачката релација со PROJECT_THREAD. - * Атрибути: - * Name - текстуален, задолжителен. - * Description - текстуален, опционален. -* Ентитет **CUSTOM_ROLE** - податоци за креирани улоги, кои се доделуваат на развивачите во конкретен проект. - * Кандидат клучеви: парцијалниот клуч Name, целосно се идентификува преку идентификувачката релација со PROJECT_THREAD. - * Атрибути: - * Name - текстуален,задолжителен. -* Ентитет **PERMISSIONS** - податоци за пермисиите, кои се достапни во дефинирањето на улогите во пеодиенчните проекти. - * Кандидат клучеви: Name, како податок уникат за секојa пермисија. Истиот го избравме за примарен клуч на ентитетов. - * Атрибути: - * Name - текстуален,задолжителен. -=== Релации -* **IS_MODERATED_BY**(N:M) - релација помеѓу TOPIC_THREAD и MODERATOR. Ни кажува кои се модератори на соодветниот TOPIC_THREAD. -* **IS_CHILD_TO**(1:N) - релација помеѓу TOPIC_THREAD и TOPIC_THREAD. Ни опишува како се разделува општ топик на поспецифички топици. -* **CONTAINS**(1:N) - релација помеѓу TOPIC_THREAD и DISCUSSION_THREAD. Ни ги претставува дискусиите започнатите во топикот. -* **BELONGS_TO**(1:N) - релацијата помеѓу PROJECT_THREAD и TOPIC_THREAD. Ни кажува кои топици се започнатите во соодветниот проект. -* **REPLIES**(1:N) - релација помеѓу DISCUSSION_THREAD и DISCUSSION_THREAD. Ни кажува кои дискусии се произлегле од соодветна дискусија. -* **ASSIGNED_TO**(N:M) - релација помеѓу THREAD и TAG. Ни кажува кои се таговите на соодветниот thread. -* **CREATES**(1:N) - релација помеѓу MODERATOR и TAG. Ни кажува кои тагови ги креирал соодветниот модератор. -* **BLACKLISTED_BY**(1:N) - релација помеѓу MODERATOR и BLACKLISTED_USER. Ни кажува кој модератор го ставил кој корисник на 'blacklist'. -* **BLACKLISTED_FROM**(1:N) - релација помеѓу THREAD и BLACKLISTED_USER. Ни кажува во кој theads е "blacklisted" корисникот. -* **REFERS_TO**(1:N) - релација помеѓу USER и BLACKLISTED_USER. Ни кажува на кој корисник се однесува соодветниот запис во BLACKLISTED_USER. -* **FOR_MISCONDUCT**(1:N) - релација помеѓу THREAD и REPORT. Ни кажува во кој и на кој thread правилата се прекршиле. -* **ABOUT**(1:N) - релација помеѓу USER и REPORT. Ни кажува кој корисник е обвинет за прекршување на правилата. -* **SUBMITTED_BY**(1:N) - релација помеѓу USER и REPORT. Ни кажува кој корисник го поднесол извештајот. -* **LIKES**(N:M) - релација помеѓу USER и THREAD. Ни ги претставува сите threads, кој му се допаднале на корисникот. -* **SUBMITS**(1:N) - релација помеѓу USER и PROJECT_REQUEST. Ни кажува кој корисник го поднел соодветното барање за учество. -* **RECIEVES**(1:N) - релација помеѓу PROJECT_THREAD и PROJECT_REQUEST. Ни кажува за кој проект, корисникот го поднел соодветното барање за учество. -* **VALID_IN**(1:N) - релација помеѓу PROJECT_THREAD и CUSTOM_ROLE. Ни кажува во кој проект е валидна соодветната улога. -* **HAS**(1:N) - релација помеѓу PROJECT_THREAD и CHANNEL. Ни кажува во кој проект припаѓа соодветниот канал. -* **ASSOCIATED_WITH**(N:M) - релација помеѓу PROJECT_THREAD и DEVELOPER. Ни кажува во кој проекти учествувал/учествува соодветниот програмер. - * Атрибути: - * Started_involvment_at - датум, задолжителен. - * Ended_involment_at - датум, опционален. -* **DEFINED_BY**(N:M) - релација помеѓу CUSTOM_ROLE и PERMISSIONS. Ни кажува кој пермисии ги опфаќа соодветната улога. -* **CONSTRUCTS**(N:M) - релација помеѓу CHANNEL и DEVELOPER. Ни кажува кој програмер го креирал соодветниот канал. -* **SEND_MESSAGE_IN**(N:M) - релација помеѓу CHANNEL и DEVELOPER. Ни претставува кој програмер испратил порака во соодветниот канал. - * Атрибути - * Timestamp - датум, задолжителен. - * Msg_txt - текстуален, задолжителен. -* **IS_ASSIGNED**(N:M) - релација помеѓу CUSTOM_ROLE и DEVELOPER. Ни кажува кој улоги ги поседува соодветниот програмер. -=== Историјат - - - Index: cs/RelationalSchema.txt =================================================================== --- docs/RelationalSchema.txt (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,103 +1,0 @@ -## Relational Schema - -1. **users** (_**username**_, is_activate, password, description, registered_at, sex) - -2. **moderator** (_**username#(users)**_) [inherits users] - -3. **developer** (_**username#(users)**_) [inherits users] - -4. **project_manager** (_**username#(users)**_) [inherits users] - -5. **thread** (_**id**_, description, logo_url, title, username#(users)) - -6. **likes** (_**username#(users)**_, _**thread_id#(thread)**_) - -7. **threads_moderators** (_**thread_id#(thread)**_, _**username#(users)**_) - -8. **tag** (_**name**_) - -9. **tag_threads** (_**thread_id#(thread)**_, _**tag_name#(tag)**_) - -10. **topic_thread** (_**id**_, description, logo_url, title, username#(users), guidelines, next_discussion_id) [inherits thread] - -11. **project_thread** (_**id**_, description, logo_url, title, username#(users), repo_url) [inherits thread] - -12. **discussion_thread** (_**id**_, _**topic_id#(thread)**_, text, created_by_user#(users), reply_discussion, reply_topic_id) - -13. **topic_belongs_to_project** (_**topic_id#(thread)**_, _**project_id#(thread)**_) - -14. **topic_blacklist** (_**username#(users)**_, _**project_id#(users)**_) - -15. **developer_associated_with_project** (_**project_id#(thread)**_, _**developer#(users)**_, _**started_at**_, ended_at) - -16. **permissions** (_**name**_) - -17. **project_roles** (_**name**_, _**project_id#(thread)**_, description) - -18. **users_project_roles** (_**username#(users)**_, _**project_id#(thread)**_, _**role_name#(project_roles)**_) - -19. **project_roles_permissions** (_**permission_name#(permissions)**_, _**role_name#(project_roles)**_, _**project_id#(thread)**_) - -20. **project_request** (_**id**_, reason, status, submited_by_user#(users), for_project#(thread)) - -21. **report** (_**id**_, created_at, description, status, thread_id#(thread), for_user#(users), by_user#(users)) - -22. **channel** (_**name**_, description, logo_url, _**project_id#(thread)**_, developer#(users)) - -23. **messages** (_**sent_at**_, content, _**sent_by#(users)**_, _**project_id#(thread)**_, _**channel_name#(channel)**_) - - - - -V2 - - -## Relational Schema - -1. **users** (_**username**_, is_activate, password, description, registered_at, sex) - -2. **moderator** (_**username#(users)**_) - -3. **developer** (_**username#(users)**_) - -4. **project_manager** (_**username#(users)**_) - -5. **thread** (_**id**_, content, _**username#(users)**_) - -6. **likes** (_**username#(users)**_, _**thread_id#(thread)**_) - -7. **topic_threads_moderators** (_**thread_id#(thread)**_, _**username#(users)**_) - -8. **tag** (_**name**_) - -9. **tag_threads** (_**thread_id#(thread)**_, _**tag_name#(tag)**_) - -10. **topic_thread** (_**id#(thread)**_, title, guidelines, next_discussion_id, parent_topic_id#(thread)) - -11. **topic_belongs_to_project** (_**topic_id#(thread)**_, _**project_id#(thread)**_) - -12. **topic_blacklist** (_**topic_id#(thread)**_, _**username#(users)**_, _**moderator#(users)**_) - -13. **project_thread** (_**id#(thread)**_, title, repo_url) - -14. **discussion_thread** (_**id#(thread)**_, _**created_by_user#(users)**_, reply_discussion_id#(thread), topic_id#(thread)) - -15. **developer_associated_with_project** (_**project_id#(thread)**_, _**developer#(users)**_, _**started_at**_, ended_at) - -16. **permissions** (_**name**_) - -17. **project_roles** (_**name**_, _**project_id#(thread)**_, description) - -18. **users_project_roles** (_**username#(users)**_, _**project_id#(thread)**_, _**role_name#(project_roles)**_) - -19. **project_roles_permissions** (_**permission_name#(permissions)**_, _**role_name#(project_roles)**_, _**project_id#(thread)**_) - -20. **project_request** (_**id**_, description, status, _**submited_by_user#(users)**_, _**project_id#(thread)**_) - -21. **report** (_**id**_, created_at, description, status, _**thread_id#(thread)**_, _**for_user#(users)**_, _**by_user#(users)**_) - -22. **channel** (_**name**_, description, logo_url, _**project_id#(thread)**_, _**developer#(users)**_) - -23. **messages** (_**sent_at**_, content, _**sent_by#(users)**_, _**project_id#(thread)**_, _**channel_name#(channel)**_) - - Index: cs/UseCase.txt =================================================================== --- docs/UseCase.txt (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,59 +1,0 @@ -Use Cases - -User - - Kreirat topic. - - Kreirat discussion thread vo topic thread. - - Pravi reply na discussion thread. - - Stava like na thread. - - Korisnik prijavuva drug korisnik za nesoodvetno odnesuvanje. - - Korisnikot se prijavuva za uchestvo vo proekt. - - Referencira drug thread. - -Moderator - - Nadgleduvat odreden Topic/Project thraed. - - Dodavat/Kreirat tagoj na dadeni topics. - - Otstranuvat korisnik od topicot. - -Developer - - Kreirat kanal vo project. - - Pisuva poraka vo kanal. - -Project Owner - - Odobruva ili odbiva baranja za ucestvo vo negoviot proekt. - - Otstranuva developer od proekt. - - Kreira roles za daden proekt - - Dodava roles na daden developer - - -SQL ideas - - - Site replies na daden thread t - - Site replies na daden thread t do dadeno nivo n - (primer ako imas thread -> reply1 -> reply2 -> reply3 -> reply2a, da gi prikazis site threads do reply2 i reply2a (ova znacit deka sa na isto nivo), znacit ke gi imas: thread -> reply1 -> reply2 -> reply2a. ) - - Site vgnezdeni topic threads vo daden root topic thread t - - Kolku pati daden user u bil blacklistnat od nekoj topic/ project i/ili globalno od koj bilo - - Broj na replies na daden discussion thread ( ke trebit za sortiranje ) - - Broj na likes na daden discussion thread. - - Broj na useri vo daden topic t (spored liked relacijata mozit ova da sa presmetat) - - Broj na reports so imat user submitnato vkupno - - Broj na reports so sa imat podneseno protiv daden user u - - Site developeri vo daden proekt so dadena permisija p - (primer za kreiranje kanali) - - Vo kolku proekti imat ucestvuvano daden developer d. - - Od proektite so ucestvuval, vo koj najdolgo ucestvuval daden developer d. - - Site poraki od daden developer vo daden kanal ili od site kanali - - Search spored content na poraka vo kanal - - Koi developers imat vo proekt p - //- Kolku razlicni developeri blacklistnal proektot p. - - Kolu pati daden developer d imat ucevstvuvano vo proekt p (primer ako zaprit pa pak vlezit pa pak...) - - Kolku kanali imat kreirano daden developer d (mozda za badge) - - Kolku useri vlegle vo proekt p vo daden interval na vreme i. - - - --- Ideja za achievements - Sekoj user so nad N likes na nekoj discussion thread vo daden topic thread da dobiet nekakov achievement(badge) - Developer so ucestvuval vo nad N proekti nekoj badge - - - - - - Index: cs/buildboard-ddl.sql =================================================================== --- docs/buildboard-ddl.sql (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,319 +1,0 @@ ---- Trigger before update/insert za check na iminjata topic/discussion -> OK ---- Trigger za ko ke adnit dete na topic thread sho e vo proekt, da go dodajt kako belongs_to vo proektot ---- Trigger za check dali reply na discussion thread pripagjat na ist topic thread kako na toj so mu pret reply ---- IMENUVANJE: triggeri so provervat nesto prefix = check, funkcii za istite prefix = validate ---- Nemame contraint sho velit deka sekoj topic thread trebat da e moderiran -DROP TABLE IF EXISTS users CASCADE; -DROP TABLE IF EXISTS moderator CASCADE; -DROP TABLE IF EXISTS developer CASCADE; -DROP TABLE IF EXISTS project_manager CASCADE; -DROP TABLE IF EXISTS thread CASCADE; -DROP TABLE IF EXISTS likes CASCADE; -DROP TABLE IF EXISTS topic_threads_moderators CASCADE; -DROP TABLE IF EXISTS tag CASCADE; -DROP TABLE IF EXISTS tag_threads CASCADE; -DROP TABLE IF EXISTS topic_thread CASCADE; -DROP TABLE IF EXISTS topic_belongs_to_project CASCADE; -DROP TABLE IF EXISTS blacklisted_user CASCADE; -DROP TABLE IF EXISTS project_thread CASCADE; -DROP TABLE IF EXISTS discussion_thread CASCADE; -DROP TABLE IF EXISTS developer_associated_with_project CASCADE; -DROP TABLE IF EXISTS permissions CASCADE; -DROP TABLE IF EXISTS project_roles CASCADE; -DROP TABLE IF EXISTS users_project_roles CASCADE; -DROP TABLE IF EXISTS project_roles_permissions CASCADE; -DROP TABLE IF EXISTS project_request CASCADE; -DROP TABLE IF EXISTS report CASCADE; -DROP TABLE IF EXISTS channel CASCADE; -DROP TABLE IF EXISTS messages CASCADE; -DROP TABLE IF EXISTS threads_moderators CASCADE; -DROP TYPE IF EXISTS status; -DROP VIEW IF EXISTS v_topic_thread CASCADE; -DROP VIEW IF EXISTS v_project_thread CASCADE; -DROP VIEW IF EXISTS v_discussion_thread CASCADE; -DROP VIEW IF EXISTS v_developer CASCADE; -DROP VIEW IF EXISTS v_project_owner CASCADE; -DROP VIEW IF EXISTS v_moderator CASCADE; -DROP FUNCTION IF EXISTS fn_project_insert_child_topic CASCADE; -DROP FUNCTION IF EXISTS fn_validate_same_parent CASCADE; -DROP TRIGGER IF EXISTS validate_same_parent ON discussion_thread CASCADE; ----- DDL -CREATE TABLE users -( - id SERIAL PRIMARY KEY, - username VARCHAR(32) UNIQUE NOT NULL, - is_activate bool, - password VARCHAR(72), - description VARCHAR(200), - registered_at TIMESTAMP, - sex VARCHAR(1) -); -CREATE TABLE moderator -( - id INT PRIMARY KEY REFERENCES users (id) on delete cascade -); -CREATE TABLE developer -( - id INT PRIMARY KEY REFERENCES users (id) on delete cascade -); -CREATE TABLE project_manager -( - id INT PRIMARY KEY REFERENCES users (id) on delete cascade -); -CREATE TABLE thread -( - id SERIAL PRIMARY KEY, - content TEXT, - user_id INT REFERENCES users (id) NOT NULL -); -CREATE TABLE topic_thread -( - title VARCHAR(32) NOT NULL, - guidelines jsonb, - parent_id INT REFERENCES thread (id), - id INT PRIMARY KEY REFERENCES thread (id) on delete cascade -); -CREATE TABLE discussion_thread -( - parent_id INT REFERENCES thread (id) NOT NULL, - id INT PRIMARY KEY REFERENCES thread (id) on delete cascade -); -CREATE TABLE project_thread -( - title VARCHAR(32) NOT NULL, - repo_url TEXT, - id INT PRIMARY KEY REFERENCES thread (id) on delete cascade -); -CREATE TABLE likes -( - user_id INT REFERENCES users (id), - thread_id INT REFERENCES thread (id), - PRIMARY KEY (user_id, thread_id) -); -CREATE TABLE topic_threads_moderators -( - thread_id INT REFERENCES thread (id) ON DELETE CASCADE, - user_id INT REFERENCES users (id) ON DELETE CASCADE, - PRIMARY KEY (thread_id, user_id) -); -CREATE TABLE tag -( - name VARCHAR(64) PRIMARY KEY -); -CREATE TABLE tag_threads -( - thread_id INT REFERENCES thread (id), - tag_name VARCHAR(64) REFERENCES tag (name), - PRIMARY KEY (thread_id, tag_name) -); - -CREATE TABLE topic_belongs_to_project -( - topic_id INT REFERENCES thread (id) ON DELETE CASCADE, - project_id INT REFERENCES thread (id) ON DELETE CASCADE, - PRIMARY KEY (topic_id, project_id) -); -CREATE TABLE blacklisted_user -( - id serial primary key , - topic_id INT REFERENCES thread (id) ON DELETE CASCADE, - user_id INT REFERENCES users (id) ON DELETE CASCADE, - moderator_id INT REFERENCES users (id) ON DELETE CASCADE, - start_date TIMESTAMP, - end_date TIMESTAMP, - reason TEXT, - UNIQUE (user_id, moderator_id, topic_id, start_date) -); - -CREATE TABLE developer_associated_with_project -( - project_id INT REFERENCES thread (id), - developer_id INT REFERENCES users (id), - started_at TIMESTAMP, - ended_at TIMESTAMP, - PRIMARY KEY (project_id, developer_id, started_at) -); -CREATE TABLE permissions -( - name VARCHAR(32) PRIMARY KEY -); -CREATE TABLE project_roles -( - name VARCHAR(32), - project_id INT REFERENCES thread (id) ON DELETE CASCADE, - description TEXT, - PRIMARY KEY (name, project_id) -); -CREATE TABLE users_project_roles -( - user_id INT REFERENCES users (id), - project_id INT, - role_name VARCHAR(32), - FOREIGN KEY (role_name, project_id) - REFERENCES project_roles (name, project_id), - PRIMARY KEY (user_id, project_id, role_name) -); -CREATE TABLE project_roles_permissions -( - permission_name VARCHAR(32) REFERENCES permissions (name), - role_name VARCHAR(32), - project_id INT, - PRIMARY KEY (permission_name, role_name, project_id), - FOREIGN KEY (role_name, project_id) - REFERENCES project_roles (name, project_id) -); -CREATE TYPE status AS ENUM ('ACCEPTED', 'DENIED', 'PENDING'); -CREATE TABLE project_request -( - id SERIAL PRIMARY KEY, - description VARCHAR(200), - status status NOT NULL, - user_id INT REFERENCES users (id) NOT NULL, - project_id INT REFERENCES thread (id) NOT NULL -); -CREATE TABLE report -( - id SERIAL, - created_at TIMESTAMP, - description VARCHAR(200) NOT NULL, - status status, - thread_id INT REFERENCES thread (id), - for_user_id INT REFERENCES users (id), - by_user_id INT REFERENCES users (id), - PRIMARY KEY (id, thread_id, for_user_id, by_user_id) -); -CREATE TABLE channel -( - name VARCHAR(64), - description VARCHAR(200), - project_id INT REFERENCES thread (id) ON DELETE CASCADE, - developer_id INT REFERENCES users (id), - PRIMARY KEY (name, project_id) -); -CREATE TABLE messages -( - sent_at TIMESTAMP, - content VARCHAR(200) NOT NULL, - sent_by INT REFERENCES users (id), - project_id INT, - channel_name VARCHAR(64), - FOREIGN KEY (channel_name, project_id) - REFERENCES channel (name, project_id) ON DELETE CASCADE, - PRIMARY KEY (channel_name, project_id, sent_at, sent_by) -); -------------------------VIEWS----------------------------- -CREATE OR REPLACE VIEW v_project_thread -AS -SELECT thread.id, content, user_id, title, repo_url -FROM project_thread project - JOIN thread - ON project.id = thread.id; -CREATE OR REPLACE VIEW v_discussion_thread -AS -SELECT thread.id, content, user_id,parent_id -FROM discussion_thread discussion - JOIN thread - ON discussion.id = thread.id; -CREATE OR REPLACE VIEW v_topic_thread -AS -SELECT thread.id, content, user_id, title, guidelines, parent_id -FROM topic_thread topic - JOIN thread - ON topic.id = thread.id; -CREATE OR REPLACE VIEW v_moderator -AS -SELECT users.id, username, is_activate, password, description, registered_at, sex -FROM moderator - JOIN users ON moderator.id = users.id; - -CREATE OR REPLACE VIEW v_developer -AS -SELECT users.id, username, is_activate, password, description, registered_at, sex -FROM developer - JOIN users ON developer.id = users.id; -CREATE OR REPLACE VIEW v_project_owner -AS -SELECT users.id, username, is_activate, password, description, registered_at, sex -FROM project_manager - JOIN users ON project_manager.id = users.id; -CREATE OR REPLACE VIEW v_moderator -AS -SELECT users.id, username, is_activate, password, description, registered_at, sex -FROM moderator - JOIN users ON moderator.id = users.id; - -CREATE OR REPLACE VIEW v_developer -AS -SELECT users.id, username, is_activate, password, description, registered_at, sex -FROM developer - JOIN users ON developer.id = users.id; -CREATE OR REPLACE VIEW v_project_owner -AS -SELECT users.id, username, is_activate, password, description, registered_at, sex -FROM project_manager - JOIN users ON project_manager.id = users.id; --------------------------- FUNCTIONS ---------------------- -CREATE OR REPLACE FUNCTION fn_validate_topic_title() - RETURNS TRIGGER - LANGUAGE plpgsql -AS -$$ -BEGIN - IF new.title IN - (SELECT title - FROM topic_thread - AS t - WHERE t.parent_id = new.parent_id OR (t.parent_id IS NULL AND new.parent_id IS NULL)) - THEN - RAISE EXCEPTION 'There already exists a topic with title % in parent topic with id %',new.title,new.parent_id; -END IF; -RETURN new; -END; -$$; -CREATE OR REPLACE FUNCTION fn_insert_topics_creator_as_moderator() - RETURNS TRIGGER - LANGUAGE plpgsql -AS -$$ -DECLARE -v_user_id INT; -BEGIN -SELECT v_topic_thread.user_id -INTO v_user_id -FROM v_topic_thread -WHERE v_topic_thread.id = new.id; -INSERT INTO topic_threads_moderators(thread_id, user_id) VALUES (new.id, v_user_id); -RETURN NEW; -END; -$$; - -CREATE OR REPLACE FUNCTION fn_insert_project_manager() -RETURNS TRIGGER -LANGUAGE plpgsql -AS - $$ - DECLARE usrId INT; -BEGIN -SELECT user_id INTO usrId FROM v_project_thread p WHERE NEW.id = p.id; -INSERT INTO developer VALUES (usrId); -INSERT INTO project_manager VALUES (usrId); -RETURN NEW; -END; - $$; --------------------------- TRIGGERS ---------------------- -CREATE OR REPLACE TRIGGER tr_check_topic_name - BEFORE INSERT OR UPDATE - ON topic_thread - FOR EACH ROW - EXECUTE FUNCTION fn_validate_topic_title(); -CREATE OR REPLACE TRIGGER tr_insert_topics_creator_as_moderator - AFTER INSERT - ON topic_thread - FOR EACH ROW -EXECUTE FUNCTION fn_insert_topics_creator_as_moderator(); -CREATE OR REPLACE TRIGGER tr_insert_project_manager - AFTER INSERT - ON project_thread - FOR EACH ROW - EXECUTE FUNCTION fn_insert_project_manager(); - Index: cs/changes.txt =================================================================== --- docs/changes.txt (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,9 +1,0 @@ -- Cascade na reports i na guidelines -- Likes impl* -- Crud na replies -- Ko ke vrakajs posle post baranje redirect, ta nosit do kaj so bese scrollnat na pageot ko si go pustil baranjeto. - - -* kladov dislike, samo odzemat od likes msm ubo e taka ne ni trebat i dislikes da cuvame. - -Vidi vo todo za so da napres/dovrsis ti. Index: cs/napreden_del.txt =================================================================== --- docs/napreden_del.txt (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,557 +1,0 @@ -== Дополнително имплементирани кориснички сценарија - -* Креира улоги за даден проект. -* !Доделува/Одзема улоги. -* Додавање на корисник во црната листа на даден thread -* Преглед на историјатот на црната листа за даден thread -* Пријавување на корисник за недолично однесување во даден thread -* Предглед на пријавите за даден thread и за даден корисник -* Контрола на пристап во рамки на проект - -== Погледи -=== Поглед за прикажување на сите одговори на даден топик -{{{ -create or replace view v_discussion_thread -as -with recursive - depth_table as - (select parent_id, id, 0 as depth - from discussion_thread - UNION ALL - select discuss.parent_id, dpth.id, dpth.depth + 1 - from depth_table dpth - join discussion_thread discuss - on dpth.parent_id = discuss.id), - tmp as (select id, max(depth) as depth - from depth_table - group by id) -select d.id as id, t.user_id as user_id, d.depth as depth, d1.parent_id as parent_id, t.created_at as "created_at" -from tmp d - join depth_table d1 - on d.id = d1.id and d1.depth = d.depth - join thread t - on t.id = d.id; -}}} - -=== Поглед за прикажување на пермисиите за дадена улога во за сите канали во даден проект. -{{{ -CREATE OR REPLACE VIEW role_channel_permissions AS -SELECT - c.project_resource_id, - c.name, - pr.id as role_id, - COALESCE( - STRING_AGG( - DISTINCT rp.permission_name, ',' ORDER BY rp.permission_name - ) FILTER ( - WHERE - (pr.override_type = 'INCLUDE' AND rpo.project_resource_id IS NOT NULL) - OR - (pr.override_type = 'EXCLUDE' AND rpo.project_resource_id IS NULL) - ), - '' - ) AS permissions -FROM channel c - JOIN project_role pr - ON pr.project_id = c.project_id - LEFT JOIN role_permissions rp - ON rp.role_id = pr.id - AND rp.permission_name IN ('READ','WRITE') - LEFT JOIN role_permissions_overrides rpo - ON rpo.role_id = pr.id - AND rpo.permission_name = rp.permission_name - AND rpo.project_resource_id = c.project_resource_id -GROUP BY c.project_resource_id, c.name,pr.id -}}} - -== Транзакции -=== Прифаќање на пријава и зачувување на приложениот feedback -{{{ -@Transactional - public void accept(BBUser creator, Integer reqId) { - ProjectRequests prReq = getRequestById(reqId); - prReq.setStatus(Status.ACCEPTED); - - feedbackService.create(creator,FeedbackFor.P,prReq); - projectService.addDeveloperToProject(prReq.getProject(), prReq.getCreator()); - prReqRepo.save(prReq); - } -}}} - -=== Одбивање на пријава и зачувување на прилоѓениот feedback -{{{ -@Transactional - public void deny(Integer reqId, String desc, BBUser creator) { - ProjectRequests prReq = getRequestById(reqId); - prReq.setStatus(Status.DENIED); - feedbackService.create(desc,creator,FeedbackFor.P,prReq); - prReqRepo.save(prReq); - } -}}} - -=== Ажурирање на постоечка улога -{{{ -@Transactional - public void updateRole(Integer id, AddRoleDTOEntities addRoleDTO) { - - ProjectRole existingRole = projectRoleRepository.findById(id).orElseThrow(() -> new IllegalArgumentException("bad role id")); - projectRolePermissionRepository.deleteAllByIdRole(existingRole); - - existingRole.setName(addRoleDTO.getName()); - existingRole.setOverrideType(addRoleDTO.getProjectResourcePermissionOverrideType().toString()); - - projectRoleRepository.save(existingRole); - - List newGlobalPermissions = mapGlobalsToProjectRolePermissions(existingRole, addRoleDTO.getGlobalPermissions()); - List newPerResourcePermissions = mapPerResourceToProjectRolePermissions(existingRole,addRoleDTO.getPermissionsResourceWrappers()); - List resourceOverrides = mapToResourceOverrides(getResources(addRoleDTO.getPermissionsResourceWrappers()),newPerResourcePermissions); - - - projectRolePermissionRepository.saveAll(newGlobalPermissions); - projectRolePermissionRepository.saveAll(newPerResourcePermissions); - projectRolePermissionResourceOverrideRepository.saveAll(resourceOverrides); - - } - -}}} -=== Додавање на нова улога во проект -{{{ - @Transactional - public void addRole(AddRoleDTOEntities addRoleDTO) { - ProjectRole role = projectRoleRepository.save( - new ProjectRole( - addRoleDTO.getProject(), - addRoleDTO.getName(), - addRoleDTO.getProjectResourcePermissionOverrideType().toString() - ) - ); - - List entities = mapPerResourceToProjectRolePermissions(role, addRoleDTO.getPermissionsResourceWrappers()); - projectRolePermissionRepository.saveAll(mapGlobalsToProjectRolePermissions(role, addRoleDTO.getGlobalPermissions())); - projectRolePermissionRepository.saveAll(entities); - projectRolePermissionResourceOverrideRepository.saveAll(mapToResourceOverrides( - getResources(addRoleDTO.getPermissionsResourceWrappers()), - entities - )); -}}} -{{{}}} - - - - - - - -== Тригери -=== Проверка дали даден топик имат уникатно име во парент threadот -{{{ -CREATE OR REPLACE FUNCTION fn_validate_topic_title() - RETURNS TRIGGER - LANGUAGE plpgsql -AS -$$ -BEGIN - IF new.title IN - (SELECT title - FROM topic_thread - AS t - WHERE t.parent_id = new.parent_id - OR (t.parent_id IS NULL AND new.parent_id IS NULL) - ) - THEN - RAISE EXCEPTION 'There already exists a topic with title % in parent topic with id %',new.title,new.parent_id; - END IF; - RETURN new; -END; -$$; -}}} -{{{ -CREATE OR REPLACE TRIGGER tr_check_topic_name --RADI - BEFORE INSERT OR UPDATE - ON topic_thread - FOR EACH ROW -EXECUTE FUNCTION fn_validate_topic_title(); -}}} - -=== При креирање на топик, креаторот се внесува како модератор -{{{ -CREATE OR REPLACE FUNCTION fn_insert_topics_creator_as_moderator() - RETURNS TRIGGER - LANGUAGE plpgsql -AS -$$ -DECLARE - v_user_id INT; -BEGIN - SELECT v_topic_thread.user_id - INTO v_user_id - FROM v_topic_thread - WHERE v_topic_thread.id = new.id; - IF not check_if_user_exists_in('moderator', 'id', v_user_id::text) THEN - INSERT INTO moderator values (v_user_id); - END IF; - INSERT INTO topic_threads_moderators(thread_id, user_id) VALUES (new.id, v_user_id); - RETURN NEW; -END -$$; -}}} -{{{ -CREATE OR REPLACE TRIGGER tr_insert_topics_creator_as_moderator - AFTER INSERT - ON topic_thread - FOR EACH ROW -EXECUTE FUNCTION fn_insert_topics_creator_as_moderator(); -}}} - -=== При бришење на topic, проверка дали модераторот сеуште модерира topicци -{{{ -CREATE OR REPLACE FUNCTION fn_remove_orphan_moderator() - RETURNS trigger - LANGUAGE plpgsql -AS $function$ -BEGIN - IF not exists ( - select 1 - from topic_threads_moderators t - where t.user_id = OLD.user_id - ) - THEN - DELETE FROM moderator where id=OLD.user_id; - END IF; - IF not exists ( - select 1 - from topic_threads_moderators t - where t.thread_id = OLD.thread_id - ) - THEN - delete from discussion_thread where parent_id=OLD.thread_id; - DELETE FROM topic_thread where id = OLD.thread_id; --- delete from thread where id = OLD.thread_id; - END IF; - RETURN OLD; -END; -}}} - -{{{ -CREATE OR REPLACE TRIGGER tr_remove_orphan_moderator - AFTER DELETE - ON topic_threads_moderators - FOR EACH ROW -EXECUTE FUNCTION fn_remove_orphan_moderator(); -}}} - -=== При креирање на проект, креаторот се внесува како PROJECT_OWNER -{{{ -CREATE OR REPLACE FUNCTION fn_insert_project_manager() - RETURNS TRIGGER - LANGUAGE plpgsql -AS -$$ -DECLARE - usrId INT; - new_project_id INT; -BEGIN - SELECT user_id, id - into usrId,new_project_id - FROM v_project_thread p - WHERE NEW.id = p.id; - IF not EXISTS( - select 1 - from developer_associated_with_project dawp - where dawp.project_id=new_project_id and dawp.developer_id=usrId - ) THEN - INSERT INTO developer_associated_with_project(project_id, developer_id, started_at) - values (new_project_id, usrId, NOW()); - end if; - IF not check_if_user_exists_in('project_manager', 'id', usrId::text) THEN - INSERT INTO project_manager VALUES (usrId); - end if; - RETURN NEW; -END -$$; -}}} - -{{{ -CREATE OR REPLACE TRIGGER tr_a_insert_project_manager --RADI - AFTER INSERT - ON project_thread - FOR EACH ROW -EXECUTE FUNCTION fn_insert_project_manager(); -}}} - - -=== Бришење на не користени тагови - -{{{ -create or replace function fn_delete_dangling_tags() - RETURNS trigger - LANGUAGE plpgsql -AS $$ -BEGIN - IF NOT EXISTS(select 1 - from tag_threads - where tag_name = OLD.tag_name - group by tag_name) THEN - delete from tag where name = OLD.tag_name; - end if; - RETURN OLD; -END; -$$; -}}} - -{{{ -create or replace trigger tr_delete_dangling_tags - after delete - on tag_threads - for each row - execute function fn_delete_dangling_tags(); -}}} - -=== Внесување на даден корисник како developer, откако ќе стани дел од даден проект -{{{ -create or replace function fn_add_dev_if_not_exist() - returns trigger - language plpgsql -as $$ -BEGIN - IF NOT check_if_user_exists_in('developer','id',new.developer_id::text) THEN - INSERT INTO developer values (NEW.developer_id); - end if; - RETURN new; -end; -$$; - -}}} - -{{{ -create or replace trigger tr_add_dev_if_not_exist - before insert on developer_associated_with_project - for each row -execute function fn_add_dev_if_not_exist(); -}}} - -=== Креирање на General канал, при креирање на даден проект -{{{ -create or replace function fn_insert_general_for_project() - returns trigger - language plpgsql -as $$ -DECLARE - developer_id INT; - project_resource_id INT; -BEGIN - select user_id - into developer_id - from thread t - where t.id=NEW.id; - insert into project_resource default values returning id into project_resource_id; - - insert into channel(name,description,project_id,developer_id,project_resource_id) - values ('General','General',NEW.id,developer_id,project_resource_id); - - return new; -end; -$$; -}}} - -{{{ -create or replace trigger tr_insert_general_for_project - after insert on project_thread - for each row -execute function fn_insert_general_for_project(); -}}} - -=== Сите 'pending' пријави за даден корисник стануваат 'accepted', при додавање на тој корисник во 'blacklist' листата. -{{{ -CREATE OR REPLACE FUNCTION fn_change_status_on_pending_reports() - RETURNS TRIGGER - LANGUAGE plpgsql -AS $$ -BEGIN - RAISE NOTICE 'user_id: %, topic_id: %', NEW.user_id, NEW.topic_id; - -UPDATE submission -SET status = 'ACCEPTED' -WHERE id in ( - select id - from report r - where r.for_user_id = NEW.user_id and r.thread_id = NEW.topic_id -); - -RETURN NEW; -END; -$$; -}}} - -{{{ -CREATE OR REPLACE TRIGGER tr_change_status_on_pending_reports - AFTER INSERT - ON blacklisted_user - FOR EACH ROW -EXECUTE FUNCTION fn_change_status_on_pending_reports(); -}}} - -=== Оневозможувено повторно додавање на корисник во 'blacklist' листата, доколку е веќе присутен на неа - -{{{ -create or replace function fn_add_blacklisted_user() -RETURNS trigger -LANGUAGE plpgsql -AS $$ -BEGIN - IF NOT EXISTS( - select 1 - from blacklisted_user - where topic_id = NEW.topic_id and user_id = NEW.user_id and end_date is NULL - ) - THEN - RETURN NEW; -END IF; -RETURN NULL; -END; -$$; -}}} - -{{{ -create or replace trigger tr_add_blacklisted_user -before insert on blacklisted_user -for each row -execute function fn_add_blacklisted_user(); -}}} - -=== Автоматско додавање на project_resource, при додавање на канал -{{{ -create or replace function fn_add_project_resource() - returns trigger - language plpgsql -as $$ -DECLARE - project_resource_id INT; -BEGIN - insert into project_resource default values returning id into project_resource_id; - new.project_resource_id := project_resource_id; - return new; -end; -$$; -}}} - -{{{ -create or replace trigger tr_add_project_resource_channel - before insert - on channel - for each row -execute function fn_add_project_resource(); -}}} - -== Индекси -== Процедури - -=== Процедура за одбивање на 'PENDING' на пријави за корисници постари од 1 месец - -{{{ - -CREATE OR REPLACE PROCEDURE mark_denied_reports_older_than_1month() -LANGUAGE plpgsql -AS $$ -DECLARE - older_reports RECORD; - user_id int; -BEGIN - FOR older_reports IN - SELECT - r.id AS submission_id, - r.thread_id as topic - FROM report r - JOIN submission s ON s.id = r.id - WHERE s.status = 'PENDING' and now() - s.created_at >= INTERVAL '1 month' - LOOP - BEGIN - UPDATE submission - SET status = 'DENIED' - WHERE id = older_reports.submission_id; - - select u.id - into user_id - from thread t - join users u - on t.user_id = u.id - where t.id = older_reports.thread_id; - - - INSERT INTO feedback(description, submission_type, created_at, submission_id, created_by) - VALUES ( - 'Stale report. Closing due to inactivity.', - 'R', - now(), - older_reports.submission_id, - user_id - ); - END; - END LOOP; -END; -$$; -}}} - -{{{ -@Transactional - @Scheduled(cron = "0 0 0 1 * ?") - public void markRejectedPendingReports() { - em - .createNativeQuery("CALL mark_denied_reports_older_than_1month();") - .executeUpdate(); - } -}}} - -=== Процедура за одбивање на 'PENDING' за барања за учество во даден проект постари од 1 месец - -{{{ -CREATE OR REPLACE PROCEDURE mark_denied_pr_requests_older_than_1month() -LANGUAGE plpgsql -AS $$ -DECLARE -older_reports RECORD; -user_id int; -BEGIN - FOR older_reports IN - SELECT - pr.id AS submission_id, - pr.project_id as thread_id - FROM project_request pr - JOIN submission s ON s.id = pr.id - WHERE s.status = 'PENDING' and now() - s.created_at >= INTERVAL '1 month' - LOOP - BEGIN - UPDATE submission - SET status = 'DENIED' - WHERE id = older_reports.submission_id; - - select u.id - into user_id - from thread t - join users u - on t.user_id = u.id - where older_reports.thread_id = t.id; - - INSERT INTO feedback(description, submission_type, created_at, submission_id, created_by) - VALUES ( - 'Stale report. Closing due to inactivity.', - 'P', - now(), - older_reports.submission_id, - user_id - ); - END; - END LOOP; -END; -$$; -}}} - -{{{ - @Transactional - @Scheduled(cron = "0 0 0 1 * ?") - public void markRejectedPendingPrRequests() { - em - .createNativeQuery("CALL mark_denied_pr_requests_older_than_1month();") - .executeUpdate(); - } -}}} Index: cs/napredna_faza_todo.txt =================================================================== --- docs/napredna_faza_todo.txt (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,19 +1,0 @@ -BUILDBOARD NAPREDNA FAZA - -- support za sliki i videa(mozda) vo topic content -- markdown edit za content na topic -- notifikacii -- achievements (builder ke ni teknit) -- follow na topic, project, user -- rating namesto like (+1 - 1) -- filter spored vreme -- analitika > topic views (clicks) -- autocompletion na tags ko ke klavas -- ai tag generation (ke vidime za ova) -- topics rename vo posts -- toggle za dodatni informacii so sakas da ti sa prikazat primer vo navbar ako si content creator... -- referenciranje na threads (link) -- communities (grupacija na posts) -- prikaz koj tags se najcesto koristeni vo dadeno commmunity spored topics vo toj community -- dinamicen search, grupacija na rezultati, (slicno ko na github so repo: samo repos itn... -- statistiki za userot Index: cs/normalization.txt =================================================================== --- docs/normalization.txt (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,365 +1,0 @@ -= Нормализација и Подобрување на дизајн -== Функционални зависности(ФЗ) -Со цел целосно репрезентирање на атрибутите присутни во релациското мапирање, одредени атрибути со исти имиња ќе бидат преименувани. Лесно се заприметуваат таквите атрибути во релацијата R, на пр. **user(id) -> user_id** и **permission(name) -> permission_name**. -{{{ -R( - user: username, description, password, registered_at, email, sex,is_active,name, user_id - feedback: feedback_submission_type, feedback_created_at, feedback_description - submission: submission_id, submission_status, submission_created_at, submission_description, - blacklisted_user: blacklisted_id,blacklisted_start_date, blacklisted_end_date, reason,blacklisted_about_user - tag: tag_name, - thread: thread_id, thread_created_at, thread_content - topic_thread: guidelines, topic_title, parent_id - project_thread: repo_url, project_title, - associated_with: asc_started_at, asc_ended_at, - channel: channel_name, channel_description, channel_id - permissions: perm_name, - project_roles: pr_name, pr_id, pr_override_type, - sends_message_in: msg_send_at, msg_content, -) -}}} - -=== Иницијални ФЗ - -1. {{{ user_id -> username, description, password, registered_at, email, sex,is_active,name }}} - -2. {{{ username -> user_id, description, password, registered_at, email, sex,is_active,name }}} - -3. {{{ submission_id -> feedback_submission_type, feedback_created_at, feedback_description }}} - -4. {{{ submission_id -> submission_status, submission_created_at, submission_description }}} - -5. {{{ blacklisted_id -> blacklisted_about_user,user_id, thread_id, blacklisted_start_date, blacklisted_end_date, reason }}} - -6. {{{ thread_id -> thread_created_at, thread_content }}} - -7. {{{ thread_id -> guidelines, topic_title, parent_id }}} - -8. {{{ thread_id -> repo_url, project_title }}} - -9. {{{ {thread_id, user_id } -> asc_started_at, asc_ended_at }}} - -10. {{{ channel_id -> channel_name,channel_description}}} - -12. {{{ {channel_id, msg_send_at, user_id } -> msg_content }}} - -13. {{{ pr_id -> pr_name, pr_override_type }}} - -14. {{{ parent_id -> thread_id }}} - -15. {{{ project_title -> repo_url, thread_created_at, thread_content }}} - -16. {{{ {parent_id, topic_title} -> guidelines, thread_created_at, thread_content }}} - -17. {{{ {pr_name, thread_id} -> pr_override_type }}} - -18. {{{ blacklisted_about_user -> user_id }}} - -19. {{{ { blacklisted_about_user,user_id, thread_id, blacklisted_start_date } -> blacklisted_end_date,reason,blacklisted_id }}} - -=== Изведени ФЗ - -1. {{{ parent_id -> thread_created_at, thread_content }}} - -2. {{{ parent_id -> guidelines, topic_title, parent_id }}} - -3. {{{ parent_id -> repo_url, project_title }}} - -4. {{{ blacklisted_about_user -> username, description, password, registered_at, email, sex,is_active,name,user_id }}} - -=== Анализа на функционални зависности -За анализата на функционални зависности ќе го користиме методот на LHS/RHS поделба. Според овој метод потребно е да се поделат атрибутите во 3 групи, односно атрибути што се среќаваат на лева страна од Функционалните зависности(LHS) и според истата логика атрибути на десна страна и атрибути кои се среќаваат на 2те страни. - -> **LHS**: ->> {{{ submission_id,blacklisted_start_date, msg_send_at,pr_id,tag_name,perm_name,blacklisted_about_user, channel_id}}} - -> **RHS**: ->> {{{ description, password, registered_at, email, sex,is_active,name, feedback_submission_type, feedback_created_at, feedback_description, submission_status, submission_created_at, submission_description,blacklisted_end_date, reason, tag_name,thread_created_at, thread_content, guidelines,repo_url, asc_started_at, channel_description, perm_name, pr_override_type, msg_content, channel_name }}} - -> **LHS & RHS**: ->> {{{ user_id,thread_id,username,parent_id,project_title,topic_title, pr_name,blacklisted_id}}} - -== Нормализација - -=== Сегашна нормална форма - -Имајќи во предвид дека **guidelines** e повеќе вредносен атрибут, доаѓаме до заклучок дека сегашната имплементација на релацијата не е ни во 1NF форма. - -=== Декомпозиција на R во 1NF -Со оделување на **guidelines** во посебна релација {{{ R1(thread_id, guideline) }}} и {{{ R2(username, thread_id, password...) }}} постигнуваме релациите да се во 1NF. - -Според досега разгледаното за R1(thread_id, guideline) ги имаме следниве ФЗ: - -1. {{{ thread_id -> thread_id }}} -2. {{{ guideline -> guideline }}} - -Според функционалните зависности, единствената комбинација на атрибути која го задоволува условот за супер клуч е {{{ {thread_id, guideline} }}}, бидејќи {{{ {thread_id, guideline}+ = {thread_id, guideline} }}}. Сепак, со цел да се оптимизираат операциите на базата (особено внесување и пребарување), ќе воведеме нов сурогат клуч **id** како примарен клуч. Заедно со него ги додаваме и следниве ФЗ {{{ id -> thread_id, guideline }}}. - -Ова е практично, бидејќи природниот клуч {{{ {thread_id, guideline} }}} содржи guideline, која е varchar атрибут со променлива големина. Ако се користеше само природниот клуч, PostgreSQL ќе креираше B-tree индекс врз guideline, кој е поголем по големина и поради тоа побавно ќе се ажурира при **DRU** операции (потребни се повеќе IO страници за индексирање и податоци). Со воведување на сурогат клуч **id** како мал фиксно-димензионален атрибут (на пр. serial или bigserial), индексите се помали и операциите се поефикасни. - -Со ова R1 ни се совпаѓа со релацијата **topic_guidelines**, па понатаму ќе ја референцираме како таква. - -=== Декомпозиција R1 до BCNF -Според следниве ФЗ за R1: -1. {{{ thread_id -> thread_id }}} -2. {{{ guideline -> guideline }}} -3. {{{ id -> thread_id, guideline }}} - -Според тоа што само **id** ги определува сите атрибути({{{ id+ -> id,thread_id,guideline}}}) следува дека единствен кандидат клуч е **id**. - -Примарен клуч за оваа релациja би бил **id**, бидејќи неговиот затварач е {{{ id+ = {thread_id, guideline} }}} и е најмал затварач кој ја определува целата релација. - -Според 2NF релацијата не смеe да содржи парцијални зависности. Ова веќе е задоволено од ФЗ за R1. -Според 3NF релацијата потребно е секоја ФЗ(X->A) да ги задоволи следниве својства: - -1. X e супер клуч на R -2. А е примарен атрибут во R. - -Според ова релацијата е веќе во 3NF. -Според BCNF секоја релација потребно е да го задоволува следното својство: - "За секое нетривијално (X->A) важи дека X е суперклуч на R". -Според тоа што **id** e клуч на R1, следува дека релацијата е во BCNF. - -=== Декомпозиција R во 2NF -Доколку би ги избрале само атрибутите на левата страна, во таков случај не би можеле да пристапиме до сите ФЗ во кои е вклучен thread_id. Заради тоа ќе го избериме thread_id. Со него имаме: -{{{ - { -submission_id, -blacklisted_start_date, -msg_send_at, -pr_id, -tag_name, -perm_name, -blacklisted_about_user, -channel_id -} = { -submission_id -blacklisted_start_date -msg_send_at -pr_id -tag_name -perm_name -blacklisted_about_user -channel_id, -feedback_submission_type, feedback_created_at, feedback_description, -submission_status, submission_created_at, submission_description , -channel_name,channel_description, -pr_name, pr_override_type, -user_id, -username, description, password, registered_at, email, sex,is_active,name, -blacklisted_end_date, reason, -thread_created_at, thread_content, -topic_title, parent_id, -repo_url, project_title, -asc_started_at, asc_ended_at, -msg_send_at,msg_content, -thread_id, -pr_override_type -} -}}} - -{{{ R1(user_id,username, description, password, registered_at, email, sex,is_active,name) }}} - -{{{ R2(submission_id,feedback_submission_type, feedback_created_at, feedback_description,submission_status, submission_created_at, submission_description)}}} - -{{{ R3(blacklisted_about_user,user_id, thread_id, blacklisted_start_date,blacklisted_end_date, reason) }}} - - -{{{ R4(thread_id,thread_created_at, thread_content,topic_title, parent_id,repo_url, project_title) }}} - -{{{ R5(channel_id,channel_name,channel_description) }}} - -{{{ R6(pr_id,pr_name, pr_override_type) }}} - -{{{ R7(channel_id, msg_send_at, user_id,msg_content) }}} - - -{{{ R8(thread_id,user_id,asc_started_at, asc_ended_at) }}} - -{{{ (Останати) : R9(perm_name,tag_name) }}} - -=== Нормализација на R1 до 3NF -Може да се запримети дека оваа релација е устaри релацијата **users**. -За оваа релација важат следниве ФЗс: -1. {{{user_id -> username, description, password, registered_at, email, sex,is_active,name}}} - -2. {{{username -> user_id, description, password, registered_at, email, sex,is_active,name }}} - -Од тоа што немаме транзитивни зависности во оваа релациja, следува дека **R1** e веќе во 3NF. - -=== Нормализација на R1 до BCNF - -Oд претходниот чекор согледуваме дека секоја ФЗс вклучува супер клуч, што значи дека релацијта **R1** e веќе во BCNF. - -=== Нормализација на R2 до 3NF -Единствени ФЗс за оваа релација се: -1. {{{ submission_id -> feedback_submission_type, feedback_created_at, feedback_description }}} - -2. {{{ submission_id -> submission_status, submission_created_at, submission_description }}} - -Со користење правилото !Унија/Декомпозиција од привалата за изведување на Армстронг добиваме: - -1. {{{ submission_id -> submission_status, submission_created_at, submission_description, feedback_submission_type, feedback_created_at, feedback_description}}} - -Од тоа што немаме транзитивни зависности, следува дека **R2** е веќе во 3NF. - -=== Нормализација на R2 до BCNF - -Од претходниот чекор, може да согледаме дека имаме само една ФЗ, што значи дека таа ФЗ мора да содржи суперклуч за релациjaта. Според претходно спомнатото може да се заклучи дека **R2** e веќе во BCNF. - -=== Подобрување на нормализација на R2 - -Oд доменот на апликацијата се согледува дека не секој submission мора да има feedback, тоа значи дека доста инстанци ќе имат null вредности за колоните feedback_submission_type, feedback_created_at, feedback_description. Со цел одбегнување на записи со голем број null вредности ќе изведиме 2 нови релации. - -1. {{{ R21(submission_id,submission_status, submission_created_at, submission_description) }}} -2. {{{ R22(submission_id,feedback_submission_type, feedback_created_at, feedback_description) }}} - -На овој начин доколку некој submission нема feedback тогаш нема да има запис во **R22** и нема да има null вредности во записите. За разлика од претходното решение доста каде што feedback колоните би биле полни со null вредности. - -Притоа да согледаме дека **R21** e релациjaта **submission** и **R22** е **feedback**. - -=== Нормализација на R3 до 3NF - -ФЗ присутни во оваа релациja се: - - -1. {{{blacklist_id-> blacklisted_about_user,user_id,thread_id,blacklisted_start_date,blacklisted_end_date,reason}}} - -2. {{{{ blacklisted_about_user,user_id, thread_id, blacklisted_start_date } -> blacklisted_end_date,reason,blacklisted_id }}} - - -R3 е веќе во 3NF, заради тоа што во секоја Ф3 на левата страна е супер клуч и нема транзитивни зависности. - -=== Нормализација до BCNF - - -{{{R31(blacklisted_about_user,user_id, thread_id, blacklisted_start_date,blacklisted_id)}}} -{{{R32(blacklisted_about_user,user_id, thread_id,blacklisted_start_date,blacklisted_end_date,reason)}}} - - -Сметаме дека нормализацијата до BCNF за оваа релација **не е потребна**, бидејќи **R31** нема корисни информации што не може да се извлечат од R32, и постојано би требало да се користи **R32** заради тоа што сите потребни информации од R31 веќе се присутни во R32 како и дополнителни информации како blacklisted_end_date кои се клучни за бизнис логиката на апликацијата. - - - -=== Нормализација на R4 до 3NF -ФЗс присутни во оваа релација се: - -1. {{{ thread_id -> thread_created_at, thread_content, topic_title, parent_id, repo_url, project_title }}} -2. {{{ project_title -> thread_created_at, thread_content, repo_url }}} -3. {{{ {parent_id, topic_title} -> thread_content, thread_created_at }}} -4. {{{ parent_id -> thread_created_at, thread_content, topic_title, parent_id, repo_url, project_title, thread_id }}} - -{{{ R41(project_title, thread_created_at, thread_content, repo_url) }}} -{{{ R42(parent_id, topic_title,thread_content, thread_created_at) }}} -{{{ R43(thread_id, project_title, topic_title, parent_id) }}} - - **thread_created_at** и **thread_content** се повторуваат во **R41** и **R42**, па според тоа може да се изведат во една заедничка релација, односно релацијата **R43**. -Според тоа се добиваат следните релации: - -{{{ R41(project_title, repo_url) }}} -{{{ R42(parent_id, topic_title) }}} -{{{ R43(thread_id, project_title, topic_title, parent_id, thread_created_at, thread_content) }}} - -Од тоа што **thread** може да е или проект или topic, но не и двете. Tоа повлекува дека: - -- **thread** е проект -> **topic_title**, **parent_id** се null вредности. -- **thread** е topic -> **project_title** е null вредност. - -Со цел да избегнеме null вредности и да обезбедиме **lossless join** ќе го направиме следното: - -- **R41** ќе додадеме **thread_id** (за постигнување на **lossless join**), додека од **R43** ќе отстраниме **project_title**. -- **R42** ќе додадеме **thread_id** (за постигнување на **lossless join**), додека од **R43** ќе остраниме **topic_title**, **parent_id**. - -Со тоа се добиваат следните релации: - -{{{ R41(project_title, repo_url, thread_id) }}} -{{{ R42(parent_id, topic_title, thread_id) }}} -{{{ R43(thread_id, thread_created_at, thread_content) }}} - -=== Нормализација на R41 до BCNF -Eдинстевни ФЗ присутни во оваа релација се: -1. {{{ thread_id -> repo_url,project_title }}} -2. {{{ project_title -> repo_url, thread_id }}} - -Лесно се согледува дека {{{ thread_id }}} и {{{project_title}}} се кандидат клучеви, па според тоа бидејќи немаме ниту еден атрибут на левата старна во ФЗти, кој не е кандидат клуч, релацијата е во BCNF. - -Притоа да согледаме дека **R41** е релацијата **project_thread**. - -=== Нормализација на R42 до BCNF -Eдинстевни ФЗ присутни во оваа релација се: -1. {{{ thread_id channel_id-> topic_title,parent_id }}} -2. {{{ {topic_title,parent_id} -> thread_id }}} -3. {{{ parent_id -> topic_title, thread_id }}} - -Бијдеќи {{{ parent_id }}} и {{{thread_id}}} се кандидат клучеви( {{{ {parent_id, topic_title} }}} е супер клуч) не постои ФЗ во која левата страна не е супер клуч. Тоа значи дека **R42** e во BCNF. - -Притоа да согледаме дека **R42** е релацијата **topic_thread**. - -=== Нормализација на R43 до BCNF -Eдинстевни ФЗ присутни во оваа релација се: -1. {{{ thread_id -> thread_created_at, thread_content }}} - -Бидејќи само {{{ thread_id }}} e кандидат клуч, не постои ФЗ во која левата страна не е супер клуч. Според тоа **R43** е во BCNF. - -Притоа да согледаме дека **R43** е релацијата **thread**. - -=== Нормализација на R5 до BCNF -Единствена ФЗ присутна во оваа релациja е: - -{{{channel_id -> channel_name,channel_description}}} - -R6 е веќе во BCNF, заради тоа што единствената ФЗ го вклучува суперклучот и нема транзитивни зависности. - -Притоа да согледаме дека **R5** е релацијата **channel**. - -=== Нормализација на R6 до BCNF -Единствена ФЗ присутна во оваа релациja е: - -{{{pr_id -> pr_name, pr_override_type}}} - -**R6** е веќе во BCNF, заради тоа што единствената ФЗ го вклучува суперклучот и нема транзитивни зависности. - -Може да се согледа дека **R6** е всушност **project_role**. - -=== Нормализација на R7 до BCNF -Единствена ФЗ присутна во оваа релациja е: - -{{{ {channel_id, msg_send_at, user_id} -> msg_content}}} - -**R7** е веќе во BCNF, заради тоа што единствената ФЗ го вклучува суперклучот и нема транзитивни зависности. - -Притоа да согледаме дека **R7** е релацијата **messages**. - -=== Нормализација на R8 до BCNF -Единствена ФЗ присутна во оваа релациja е: - -{{{{thread_id,user_id} -> asc_started_at, asc_ended_at}}} - -**R8** е веќе во BCNF, заради тоа што единствената ФЗ го вклучува суперклучот и нема транзитивни зависности. - -Пртиоа да согледаме дека **R8** е релацијата ** developer_associated_with_project**. - -=== Нормализација на R9 до 3NF -Единствена ФЗ присутна во оваа релациja е: - -{{{{perm_name} -> perm_name}}} - -{{{{tag_name} -> tag_name}}} - -Оваа релација нема транзитивни зависности, па тоа значи дека е во 3NF. - -=== Нормализација на R9 до BCNF - -Според горенаведеното, лесно се согледува дека во сите ФЗ на левата страна не е присутен кандидат клуч. - -Со цел да се нормализира релацијата до BCNF релацијата ќе ја декомпозираме во - - {{{R91(tag_name)}}} - - {{{R92(perm_name)}}} - -Притоа може да се согледа дека **R91** e релацијата **tag** и **R92** релацијата **permission** - - - - - - Index: cs/test-data.sql =================================================================== --- docs/test-data.sql (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,102 +1,0 @@ -INSERT INTO users (username, is_activate, password, description, registered_at, sex) -VALUES - ('user1', true, '$2a$12$0f.x7aBM2wFBZBXoLPj0BObVsk.J1kXFYo5nb4niAWkI4hk5tHvDy', 'First user', NOW(), 'M'), - ('user2', true, '$2a$12$VkR0a47LDVM6aUqFcEJGSu9jhZCz.05tCoyiRicFObt4f2x2gijKa', 'Second user', NOW(), 'F'), - ('user3', true, '$2a$12$eSLdHHJ1KFgv.dOupmloXeItjrt2o1IB6ER6Nq7WYj9Jfr2bEwK2a', 'Third user', NOW(), 'M'), - ('user4', true, '$2a$12$dF5SXcNhMulgU3Qre3nh1e.aatRiJZsnfoBSqReGnXe9rIbHYVWhe', 'Fourth user', NOW(), 'F'), - ('user5', true, '$2a$12$zHrloz8WG2zo5S6MTf1C0ez1raMlmDJdB8OOa2I1S2pVy9oI76YTa', 'Fifth user', NOW(), 'M'); - -INSERT INTO thread (content, user_id) -VALUES - ('Main content for topic thread 1', 1), - ('Main content for topic thread 2', 2), - ('Discussion content for topic 1', 1), - ('Discussion content for topic 2', 2), - ('Project-specific thread content', 3), - ('Reply to topic 1', 4), - ('Further discussion on topic 2', 5); - -INSERT INTO topic_thread (id, title, parent_id) -VALUES - (1, 'Topic 1' , NULL), - (2, 'Topic 2', NULL); - -insert into topic_guidelines(topic_id,description) -values - (1,'Follow guidelines'), - ( 2,'Be respectful'); - -INSERT INTO discussion_thread (id, parent_id) -VALUES - (3, 1), - (4, 2), - (6, 3), - (7, 4); - -INSERT INTO project_thread (id, title, repo_url) -VALUES - (5, 'Project 1 Thread', 'http://github.com/project1'); - -INSERT INTO likes (user_id, thread_id) -VALUES - (1, 3), - (2, 4), - (3, 5), - (4, 6), - (5, 7); -INSERT INTO topic_belongs_to_project (topic_id, project_id) -VALUES - (1, 5), - (2, 5); - -INSERT INTO blacklisted_user (topic_id, user_id, moderator_id, start_date, end_date, reason) -VALUES - (1, 2, 1, NOW(), NOW() + INTERVAL '7 days', 'Spamming'), - (2, 3, 4, NOW(), NOW() + INTERVAL '3 days', 'Offensive language'); - -INSERT INTO developer_associated_with_project (project_id, developer_id, started_at) -VALUES - (5, 2, NOW()), - (5, 3, NOW()); - -INSERT INTO permissions (name) -VALUES - ('Create Thread'), - ('Delete Thread'); - -INSERT INTO project_roles (name, project_id, description) -VALUES - ('Admin', 5, 'Admin role for the project'), - ('Developer', 5, 'Developer role for the project'); - -INSERT INTO users_project_roles (user_id, project_id, role_name) -VALUES - (3, 5, 'Admin'), - (2, 5, 'Developer'), - (4, 5, 'Developer'); - -INSERT INTO project_roles_permissions (permission_name, role_name, project_id) -VALUES - ('Create Thread', 'Admin', 5), - ('Delete Thread', 'Admin', 5); - -INSERT INTO project_request (description, status, user_id, project_id) -VALUES - ('Request to join Project 1', 'PENDING', 2, 5), - ('Request to join Project 1', 'ACCEPTED', 4, 5); - -INSERT INTO report (created_at, description, status, thread_id, for_user_id, by_user_id) -VALUES - (NOW(), 'Inappropriate content', 'PENDING', 3, 2, 1), - (NOW(), 'Spam content', 'DENIED', 6, 4, 3); - -INSERT INTO channel (name, description, project_id, developer_id) -VALUES - ('General', 'General discussion channel', 5, 2), - ('Updates', 'Project updates channel', 5, 3); - -INSERT INTO messages (sent_at, content, sent_by, project_id, channel_name) -VALUES - (NOW(), 'Hello, team!', 2, 5, 'General'), - (NOW(), 'We need to push the deadline.', 3, 5, 'Updates'); - Index: cs/todo.txt =================================================================== --- docs/todo.txt (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,75 +1,0 @@ -description na project - -Brisenje na tag - Notifikacija za site so go koristat tagot - Mu izlegvit na moderatorot so go brisit negoviot tag kolku dusi go koristat tagot. - - -Ko ke udris search bez filtri da ti gi davat grupirani. -> Edna grupa topics, druga projects treta tagoj so ti matchnale so kverito. -> Ne trebit deka nemat smisla za filterot sho go koristime spored type sho ti gi grupirat - -- Developer requests for join -- Channels da se impl -- Discussion da se sortirani spored nekoja metrika koja gi spojvit. -- Meshan search vo appot, od sve sho imame vo nego. -- Referencira thread, koga pishi tekst, kaj bilo. - - --------------------- - -- searchni vo show-topic "todo-func", ke vidis -- Security za post baranjava, sega samo sa kriet kopceto za edit i delete na discussion i takvi stvari, ama ne sa prat proverki vo metodite. -- Reorganizacija ke trebit vo TopicController deka premn raboti msm imat tamu, mozit ubo ke e ako po generalni raboti so vazat za sive threads ko likes da e vo drug. -- Vo pravo bese trebit posebni servisi da sa VDiscussionService i DiscussionService :) - --------------------------- -- Ko ke imas nesto liked ili disliked da ti ostanit highlighted. -- Izveden atribut status za developer (normal user, incative developer,active developer) -- Paginacija -- rename iminja na branch od _ vo - -- SITE DESCRIPTIONS VO SQL DA SA TEXT ne varchar -- erot menvenje !!!! - ---------------- -- timestamp da sa prikazvit za discussion threads, koga sa postaveni -- poraka impl crud -- vo kanal page da sa prikazvat avatarite na users, koga bila pustena poraka -- levo da ti gi prikazvit site kanali -- link do proektot nazad -- to so referenciranje da go napreme -- view channels page da sa napret, imas ideja toska ke ti teknit to so chatojte ko preview da sa. (ova samo za mene e viktor uzivaj) -- edit na chat messages -- statistiki za userot vo public profile page (vo kolku proekti rabotel, kolku vreme e vo nekoj proekt ...) -- Najpopularni tags, vo smisla koj sa najkoristeni. ------------- - -PRAVILA ZA SINTAKSA -- packages ednina -- url mnozina -- edinecen resurs ko ke pristapvis od nekoj resurs so e vo mnozina primer nekoj kanal go pristapvis so channels/kanalot -- kebap case url -- metodi vo services - - prefix get vo service,vo repo find -> za metodi so zemas nesto od baza - - create za kreiranje novi obj - - Najcesti zborcinja za koristenje: get, create,update,delete - - html pagese tie sho prikazhvat neshto da se vikat show -- Optionals vo repo ponatamu - -- Controllers - - get mapping so vrakjat page -> getPage - - ----- Dokumentacija - -najvazni scenarija: - - odgovara na diskusija - - kreira diskusija - -podelba: -- viktor od kreira nov topic, do se prijavuva za ucestvo vo proekt (inclusive) -- stefan od dodava i kreira tagovi (inclusive) do otstranuva programer od proekt - - --BUG DEFAULT AVATAR GRESEN ZEMAT. - - - Index: cs/versioning/er_models/ER_BUILD_BOARD_v1.xml =================================================================== --- docs/versioning/er_models/ER_BUILD_BOARD_v1.xml (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,1 +1,0 @@ -THREADtrue16dPROJECT_THREADTOPIC_THREADDOUBLE3DISCUSSION_THREADDOUBLE3CONTAINS

3N

BELONGS_TO

NUSER

33true16o

DEVELOPER

INVLOVLED_IN

3NPROJECT_MANAGERtrue16o

IS_OWNED_BY

3N

3

3NPERMISSIONSHAS

NHAS

NCREATES

DOUBLE3CUSTOM_ROLE

M

3M

3NDOUBLE3CONTAINS

3NDOUBLE3CONTAINS

DOUBLE3CHANNEL

3NIS_CREATED_BY

3N

IS_CREATED_BY

3N

MODERATORtrue16o

3N

REPLIES

3trueRole_nametruetruePermission_name

Description

truetrueusername

password

truetrueTittle

Description

HAS_WORKED_IN

N

Mregister_date

started_at

STARTS_A

NProject_nametruetrueproject_id

3truechannel_name

SEND_A_MESSAGE_IN

MMsg_txt

strted_involvmnet_at

ended_involment

PStrted_involvmnet_at

truetrueVersion

Version ako menvmime neshto za nekoja permisija tie sho nemat videno da ne se ostheteniTextAt_time

TAGCREATES

DescASSISGNED_TO

N

N

truetrueName

description

LIKED

N

MLogo

backgroundlogo

is_active

descstatus

3Ncreated_atlogo

sexshort_desc

BLACKLISTS

Pcommunity_guideline

Q3truereport_idDOUBLE3REPORTDOUBLE3SUBBMITTEDDOUBLE3ABOUT

3M

3N

DOUBLE3FOR_MISCONDUCT

3P Index: cs/versioning/er_models/ER_BUILD_BOARD_v2.xml =================================================================== --- docs/versioning/er_models/ER_BUILD_BOARD_v2.xml (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,1 +1,0 @@ -

DOUBLE3RECIEVESPROJECT_THREAD

IS_MODERATED_BYTOPIC_THREAD3N

Started_at

DOUBLE3SUBMITSUSERTHREADtrue16d

BELONGS_TO

N

33DEVELOPER

true16oPROJECT_OWNER

PERMISSIONSDEFINED_BY

NDOUBLE3CUSTOM_ROLE

3MDOUBLE3VALID_IN

3NDOUBLE3HAS

DOUBLE3CHANNEL

3NCONSTRUCTS

3N

IS_CREATED_BY

3N

MODERATOR

REPLIES3trueNametruetrueName

truetrueUsername

Password

Content

ASSOCIATED_WITH

N

MRegister_date

3trueName

SENDS_MESSAGE_IN

NContent

Started_at

Ended_at

Sent_at

TAGCREATES

ASSISGNED_TO

NtruetrueName

Description

LIKES

NIs_active

DescriptionStatus

3NCreated_atSexDescription

3trueIdDOUBLE3REPORTDOUBLE3SUBBMITTED_BYDOUBLE3ABOUT

3M

3N

DOUBLE3FOR_MISCONDUCT

truetrueId

DOUBLE3PROJECT_REQUEST

3P3trueId

3NStatus

Description

Next_discussion_id

ReasonIS_ASSIGNED

M

PCONTAINS

DISCUSSION_THREAD

3P

RIS_CHILD_TO

Title

Title

P

3N

MRepo_url

DOUBLE3BLACKLISTED_USERDOUBLE3BLACKLISTED_BY

DOUBLE3REFERS_TO

DOUBLE3BLACKLISTED_FROM

3N3trueStart_dateEnd_date

3N

3N

QtruetrueId

DOUBLE3FEEDBACKDescriptionSubmission_typeCreated_atWRITTEN_BY

NSUBMISSIONtruetrueId

true16u

33

33DOUBLE3SUBBMITED_FOR

3

DOUBLE3Guidelines

Created_at

Created_atEmail

Name

Index: cs/versioning/er_models/ER_BUILD_BOARD_v3.xml =================================================================== --- docs/versioning/er_models/ER_BUILD_BOARD_v3.xml (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,1 +1,0 @@ -

RECIEVESPROJECT_THREAD

IS_MODERATED_BYStarted_atTHREADtrue16dTOPIC_THREADUSER

33DEVELOPER

true16oPROJECT_OWNER

PERMISSIONSDEFINED_BY

NDOUBLE3CUSTOM_ROLE

3MDOUBLE3VALID_IN

3NDOUBLE3HAS

DOUBLE3CHANNEL

3NCONSTRUCTS

3N

IS_CREATED_BY

3N

MODERATOR

3trueNametruetrueName

Password

Content

ASSOCIATED_WITH

NRegister_at

3trueName

SENDS_MESSAGE_IN

NContent

Started_at

Sent_at

TAGCREATES

ASSISGNED_TO

NtruetrueName

Description

LIKES

NIs_active

3NSexDescription

SUBBMITTED_BYSUBMISSION3M

ABOUTREPORT3N

FOR_MISCONDUCTtruetrueId

PROJECT_REQUEST3NStatus

Description

ReasonIS_ASSIGNED

M

PDISCUSSION_THREADTitle

Title

P

3NRepo_url

DOUBLE3BLACKLISTED_USERDOUBLE3BLACKLISTED_BY

DOUBLE3REFERS_TO

DOUBLE3BLACKLISTED_FROM

3N3trueStart_dateEnd_date

3N

3N

QtruetrueId

DOUBLE3FEEDBACKDescriptionSubmission_typeCreated_atWRITTEN_BY

truetrueId

DOUBLE3SUBBMITED_FOR

3

DOUBLE3Guidelines

Created_at

Created_atEmail

Name

Uername

true16d

33

3N

3M

EMBEDDABLEREFERENCED_BY

M

CONTAINED_IN

3N

true16d

3M

3N

3M

33 Index: cs/versioning/er_models/ER_BUILD_BOARD_v5.1.xml =================================================================== --- docs/versioning/er_models/ER_BUILD_BOARD_v5.1.xml (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,1 +1,0 @@ -NametruetrueId

RECIEVESPROJECT_THREADIS_MODERATED_BYTHREADtrue16dTOPIC_THREADUSER

33DEVELOPER

true16oPROJECT_OWNER

PERMISSIONSCONSTRUCTS

IS_CREATED_BY

3N

MODERATOR

truetrueName

Password

Content

ASSOCIATED_WITH

NRegister_at

SENDS_MESSAGE_INContent

Started_at

Ended_at

Sent_at

TAGCREATES

ASSISGNED_TO

NtruetrueName

DescriptionLIKES

NIs_active

3NSexDescription

SUBBMITTED_BYSUBMISSION3M

ABOUTREPORT3N

FOR_MISCONDUCTtruetrueId

PROJECT_REQUEST3NStatus

Description

ReasonIS_ASSIGNED

NDISCUSSION_THREADTitle

Title

N

3NRepo_url

End_date

MtruetrueId

DOUBLE3FEEDBACKDescriptionSubmission_typeCreated_atWRITTEN_BY

truetrueId

DOUBLE3SUBBMITED_FOR

3

DOUBLE3Guidelines

Created_at

Created_atEmail

Name

Uername

true16d

33

3N

3M

EMBEDDABLEREFERENCED_BY

M

CONTAINED_IN

3N

true16d

3N

3N

3M

33DOUBLE3ROLE_PERMISSIONSDOUBLE3FOR_ROLE

3DOUBLE3FOR_PERMISSION

3

Noverride_typePROJECT_ROLEVALID_IN

3Ntruetrueidname

N

M

CHANNEL

3MHAS

3M

FOR_RESOURCE

3NtruetrueIdStart_dateBLACKLISTED_USERBLACKLISTED_BY

3N

RFERS_TO

3M

BLACKLISTED_FROM

3M

P Index: cs/versioning/er_models/ER_BUILD_BOARD_v5.2.xml =================================================================== --- docs/versioning/er_models/ER_BUILD_BOARD_v5.2.xml (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,1 +1,0 @@ -NametruetrueId

RECIEVESPROJECT_THREADIS_MODERATED_BYTHREADtrue16dTOPIC_THREADUSER

33DEVELOPER

true16oPROJECT_OWNER

PERMISSIONSCONSTRUCTS

IS_CREATED_BY

3N

MODERATOR

truetrueName

Password

Content

ASSOCIATED_WITH

NRegister_at

ContentStarted_at

Ended_at

TAGCREATES

ASSISGNED_TO

NtruetrueName

DescriptionLIKES

NIs_active

3NSexDescription

SUBMISSION3M

ABOUTREPORT3N

FOR_MISCONDUCTtruetrueId

PROJECT_REQUEST3NStatus

Description

ReasonIS_ASSIGNED

NDISCUSSION_THREADTitle

Title

N

3NRepo_url

End_datetruetrueId

DOUBLE3FEEDBACKDescriptionSubmission_typeCreated_atWRITTEN_BY

truetrueId

DOUBLE3SUBBMITED_FOR

3

DOUBLE3Guidelines

Created_at

Created_atEmail

Name

Uername

true16d

33

3N

3M

EMBEDDABLEREFERENCED_BY

M

CONTAINED_IN

3N

true16d

3N

3N

3M

33DOUBLE3ROLE_PERMISSIONSDOUBLE3FOR_ROLE

3DOUBLE3FOR_PERMISSION

3

Noverride_typePROJECT_ROLEVALID_IN

3Ntruetrueidname

N

M

CHANNEL

3NHAS

3M

FOR_RESOURCE

3NtruetrueIdStart_dateBLACKLISTED_USERBLACKLISTED_BY

3N

RFERS_TO

3M

BLACKLISTED_FROM

3MDOUBLE3MESSAGE3trueSent_atDOUBLE3SENT_INDOUBLE3SENT_BY

3M

3M

Index: cs/versioning/er_models/ER_BUILD_BOARD_v5.3.xml =================================================================== --- docs/versioning/er_models/ER_BUILD_BOARD_v5.3.xml (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,1 +1,0 @@ -

FOR_RESOURCEDOUBLE3ROLE_PERMISSION_OVERRIDES3NNametruetrueId

RECIEVESPROJECT_THREADIS_MODERATED_BYTHREADtrue16dTOPIC_THREADUSER

33DEVELOPER

true16oPROJECT_MANAGER

PERMISSIONSCONSTRUCTS

IS_CREATED_BY

3N

MODERATOR

truetrueName

Password

Content

Register_at

ContentEnded_atTAGCREATES

ASSISGNED_TO

NtruetrueName

DescriptionLIKES

NIs_active

3NSexDescription

SUBBMITTED_BYSUBMISSION3M

ABOUTREPORT3N

FOR_MISCONDUCTtruetrueId

PROJECT_REQUEST3NStatus

Description

ReasonIS_ASSIGNED

NDISCUSSION_THREADTitle

Title

N

3NRepo_url

End_datetruetrueId

DOUBLE3FEEDBACKDescriptionSubmission_typeCreated_atWRITTEN_BY

truetrueId

DOUBLE3SUBBMITED_FOR

3

DOUBLE3Guidelines

Created_at

Created_atEmail

Name

Uername

true16d

33

3N

3M

EMBEDDABLEREFERENCED_BY

M

CONTAINED_IN

3N

true16d

3N

3M

33DOUBLE3ROLE_PERMISSIONSDOUBLE3FOR_ROLE

3DOUBLE3FOR_PERMISSION

3

Noverride_typePROJECT_ROLEVALID_IN

3Ntruetrueidname

N

M

CHANNEL

3NHAS

3M

truetrueIdStart_dateBLACKLISTED_USERBLACKLISTED_BY

3N

RFERS_TO

3M

BLACKLISTED_FROM

3MDOUBLE3MESSAGE3trueSent_atDOUBLE3SENT_INDOUBLE3SENT_BY

3M

3M

DOUBLE3DEVELOPER_ASSOCIATED_WITH_PROJECT3trueStarted_at

DOUBLE3IN_PROJECTDOUBLE3ABOUT_DEV

3N

3N

3DOUBLE3FOR_ROLE_PERMISSION

3N

3 Index: cs/versioning/er_models/ER_BUILD_BOARD_v5.4.xml =================================================================== --- docs/versioning/er_models/ER_BUILD_BOARD_v5.4.xml (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,1 +1,0 @@ -NametruetrueId

RECIEVESPROJECT_THREADIS_MODERATED_BYTHREADtrue16dTOPIC_THREADUSER

33DEVELOPER

true16oPROJECT_MANAGER

PERMISSIONSCONSTRUCTS

IS_CREATED_BY

3N

MODERATOR

truetrueName

Password

Content

Register_at

ContentEnded_atTAGCREATES

ASSISGNED_TO

NtruetrueName

DescriptionLIKES

NIs_active

3NSexDescription

SUBBMITTED_BYSUBMISSION3M

ABOUTREPORT3N

FOR_MISCONDUCTtruetrueId

PROJECT_REQUEST3NStatus

Description

ReasonIS_ASSIGNED

NDISCUSSION_THREADTitle

Title

N

3NRepo_url

End_datetruetrueId

DOUBLE3FEEDBACKDescriptionSubmission_typeCreated_atWRITTEN_BY

truetrueId

DOUBLE3SUBBMITED_FOR

3

DOUBLE3Guidelines

Created_at

Created_atEmail

Name

Uername

true16d

33

3N

3M

EMBEDDABLEREFERENCED_BY

M

CONTAINED_IN

3N

true16d

3N

3M

33DOUBLE3ROLE_PERMISSIONSDOUBLE3FOR_ROLE

3DOUBLE3FOR_PERMISSION

3

Noverride_typePROJECT_ROLEVALID_IN

3Ntruetrueidname

N

M

CHANNEL

3NHAS

3M

truetrueIdStart_dateBLACKLISTED_USERBLACKLISTED_BY

3N

RFERS_TO

3M

BLACKLISTED_FROM

3MDOUBLE3MESSAGE3trueSent_atDOUBLE3SENT_INDOUBLE3SENT_BY

3M

3M

DOUBLE3DEVELOPER_ASSOCIATED_WITH_PROJECT3trueStarted_at

DOUBLE3IN_PROJECTDOUBLE3ABOUT_DEV

3N

3N

3DOUBLE3ROLE_PERMISSION_OVERRIDESDOUBLE3FOR_ROLE_PERMISSION

3N

3DOUBLE3FOR_RESOURCE

3N

Index: cs/versioning/er_models/ER_BUILD_BOARD_v5.5.xml =================================================================== --- docs/versioning/er_models/ER_BUILD_BOARD_v5.5.xml (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,1 +1,0 @@ -NametruetrueId

RECIEVESPROJECT_THREADIS_MODERATED_BYTHREADtrue16dTOPIC_THREADUSER

33DEVELOPER

true16oPROJECT_MANAGER

PERMISSIONSCONSTRUCTS

IS_CREATED_BY

3N

MODERATOR

truetrueName

Password

Content

Register_at

ContentEnded_atTAGCREATES

ASSISGNED_TO

NtruetrueName

DescriptionLIKES

NIs_active

3NSexDescription

SUBBMITTED_BYSUBMISSION3M

ABOUTREPORT3N

FOR_MISCONDUCTtruetrueId

PROJECT_REQUEST3NStatus

Description

ReasonIS_ASSIGNED

NDISCUSSION_THREADTitle

Title

N

3NRepo_url

End_datetruetrueId

DOUBLE3FEEDBACKDescriptionSubmission_typeCreated_atWRITTEN_BY

truetrueId

DOUBLE3SUBBMITED_FOR

3

DOUBLE3Guidelines

Created_at

Created_atEmail

Name

Uername

true16d

33

3N

3M

EMBEDDABLEREFERENCED_BY

M

CONTAINED_IN

3N

true16d

3N

3M

33DOUBLE3ROLE_PERMISSIONSDOUBLE3FOR_ROLEDOUBLE3FOR_PERMISSIONoverride_typePROJECT_ROLEVALID_IN

3Ntruetrueidname

M

CHANNEL

3NHAS

3M

truetrueIdStart_dateBLACKLISTED_USERBLACKLISTED_BY

3N

RFERS_TO

3M

BLACKLISTED_FROM

3MDOUBLE3MESSAGE3trueSent_atDOUBLE3SENT_INDOUBLE3SENT_BY

3M

3M

DOUBLE3DEVELOPER_ASSOCIATED_WITH_PROJECT3trueStarted_at

DOUBLE3IN_PROJECTDOUBLE3ABOUT_DEV

3N

3N

3DOUBLE3ROLE_PERMISSION_OVERRIDESDOUBLE3FOR_ROLE_PERMISSION

3N

3DOUBLE3FOR_RESOURCE

3N

3M

3N Index: cs/versioning/er_models/ER_BUILD_BOARD_v5.6.xml =================================================================== --- docs/versioning/er_models/ER_BUILD_BOARD_v5.6.xml (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,1 +1,0 @@ -NametruetrueId

RECIEVESPROJECT_THREADIS_MODERATED_BYTHREADtrue16dTOPIC_THREADUSER

33DEVELOPER

true16oPROJECT_MANAGER

PERMISSIONSCONSTRUCTS

IS_CREATED_BY

3N

MODERATOR

truetrueName

Password

Content

Register_at

ContentEnded_atTAGCREATES

ASSISGNED_TO

NtruetrueName

DescriptionLIKES

NIs_active

3NSexDescription

SUBBMITTED_BYSUBMISSION3M

ABOUTREPORT3N

FOR_MISCONDUCTtruetrueId

PROJECT_REQUEST3NStatus

Description

ReasonIS_ASSIGNED

NDISCUSSION_THREADTitle

Title

N

3NRepo_url

End_datetruetrueId

DOUBLE3FEEDBACKDescriptionSubmission_typeCreated_atWRITTEN_BY

truetrueId

DOUBLE3SUBBMITED_FOR

3

DOUBLE3Guidelines

Created_at

Created_atEmail

Name

Uername

true16d

33

3N

3M

EMBEDDABLEREFERENCED_BY

M

CONTAINED_IN

3N

true16d

3N

3M

33DOUBLE3ROLE_PERMISSIONSDOUBLE3FOR_ROLEDOUBLE3FOR_PERMISSIONoverride_typePROJECT_ROLEVALID_IN

3Ntruetrueidname

M

CHANNEL

3NHAS

3M

truetrueIdStart_dateBLACKLISTED_USERBLACKLISTED_BY

3N

RFERS_TO

3M

BLACKLISTED_FROM

3MDOUBLE3MESSAGE3trueSent_atDOUBLE3SENT_INDOUBLE3SENT_BY

3M

3M

DOUBLE3DEVELOPER_ASSOCIATED_WITH_PROJECT3trueStarted_at

DOUBLE3IN_PROJECTDOUBLE3ABOUT_DEV

3N

3N

3DOUBLE3ROLE_PERMISSION_OVERRIDESDOUBLE3FOR_ROLE_PERMISSION

3N

3DOUBLE3FOR_RESOURCE

3N

3M

3N Index: cs/versioning/er_models/ER_BUILD_BOARD_v5.xml =================================================================== --- docs/versioning/er_models/ER_BUILD_BOARD_v5.xml (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,1 +1,0 @@ -

RECIEVESPROJECT_THREAD

IS_MODERATED_BYStarted_atTHREADtrue16dTOPIC_THREADUSER

33DEVELOPER

true16oPROJECT_OWNER

PERMISSIONSDOUBLE3HAS

DOUBLE3CHANNEL

3NCONSTRUCTS

3N

IS_CREATED_BY

3N

MODERATOR

truetrueName

Password

Content

ASSOCIATED_WITH

NRegister_at

3trueName

SENDS_MESSAGE_IN

NContent

Started_at

Ended_at

Sent_at

TAGCREATES

ASSISGNED_TO

NtruetrueName

Description

LIKES

NIs_active

3NSexDescription

SUBBMITTED_BYSUBMISSION3M

ABOUTREPORT3N

FOR_MISCONDUCTtruetrueId

PROJECT_REQUEST3NStatus

Description

ReasonIS_ASSIGNED

NDISCUSSION_THREADTitle

Title

P

3NRepo_url

DOUBLE3BLACKLISTED_USERDOUBLE3BLACKLISTED_BY

DOUBLE3REFERS_TO

DOUBLE3BLACKLISTED_FROM

3N3trueStart_dateEnd_date

3N

3N

QtruetrueId

DOUBLE3FEEDBACKDescriptionSubmission_typeCreated_atWRITTEN_BY

truetrueId

DOUBLE3SUBBMITED_FOR

3

DOUBLE3Guidelines

Created_at

Created_atEmail

Name

Uername

true16d

33

3N

3M

EMBEDDABLEREFERENCED_BY

M

CONTAINED_IN

3N

true16d

3M

3N

3M

33PROJECT_RESOURCEtruetrueid

IS_A_CHANNEL

3

DOUBLE3ROLE_PERMISSIONSDOUBLE3FOR_ROLE

3DOUBLE3FOR_PERMISSION

3

Noverride_typeFOR_RESOURCE

N

MPROJECT_ROLEVALID_IN

3N

3truetrueidname

N

M

Sent_at Index: nw =================================================================== --- mvnw (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,259 +1,0 @@ -#!/bin/sh -# ---------------------------------------------------------------------------- -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Apache Maven Wrapper startup batch script, version 3.3.2 -# -# Optional ENV vars -# ----------------- -# JAVA_HOME - location of a JDK home dir, required when download maven via java source -# MVNW_REPOURL - repo url base for downloading maven distribution -# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven -# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output -# ---------------------------------------------------------------------------- - -set -euf -[ "${MVNW_VERBOSE-}" != debug ] || set -x - -# OS specific support. -native_path() { printf %s\\n "$1"; } -case "$(uname)" in -CYGWIN* | MINGW*) - [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" - native_path() { cygpath --path --windows "$1"; } - ;; -esac - -# set JAVACMD and JAVACCMD -set_java_home() { - # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched - if [ -n "${JAVA_HOME-}" ]; then - if [ -x "$JAVA_HOME/jre/sh/java" ]; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - JAVACCMD="$JAVA_HOME/jre/sh/javac" - else - JAVACMD="$JAVA_HOME/bin/java" - JAVACCMD="$JAVA_HOME/bin/javac" - - if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then - echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 - echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 - return 1 - fi - fi - else - JAVACMD="$( - 'set' +e - 'unset' -f command 2>/dev/null - 'command' -v java - )" || : - JAVACCMD="$( - 'set' +e - 'unset' -f command 2>/dev/null - 'command' -v javac - )" || : - - if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then - echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 - return 1 - fi - fi -} - -# hash string like Java String::hashCode -hash_string() { - str="${1:-}" h=0 - while [ -n "$str" ]; do - char="${str%"${str#?}"}" - h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) - str="${str#?}" - done - printf %x\\n $h -} - -verbose() { :; } -[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } - -die() { - printf %s\\n "$1" >&2 - exit 1 -} - -trim() { - # MWRAPPER-139: - # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. - # Needed for removing poorly interpreted newline sequences when running in more - # exotic environments such as mingw bash on Windows. - printf "%s" "${1}" | tr -d '[:space:]' -} - -# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties -while IFS="=" read -r key value; do - case "${key-}" in - distributionUrl) distributionUrl=$(trim "${value-}") ;; - distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; - esac -done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" -[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" - -case "${distributionUrl##*/}" in -maven-mvnd-*bin.*) - MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ - case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in - *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; - :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; - :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; - :Linux*x86_64*) distributionPlatform=linux-amd64 ;; - *) - echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 - distributionPlatform=linux-amd64 - ;; - esac - distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" - ;; -maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; -*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; -esac - -# apply MVNW_REPOURL and calculate MAVEN_HOME -# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ -[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" -distributionUrlName="${distributionUrl##*/}" -distributionUrlNameMain="${distributionUrlName%.*}" -distributionUrlNameMain="${distributionUrlNameMain%-bin}" -MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" -MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" - -exec_maven() { - unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : - exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" -} - -if [ -d "$MAVEN_HOME" ]; then - verbose "found existing MAVEN_HOME at $MAVEN_HOME" - exec_maven "$@" -fi - -case "${distributionUrl-}" in -*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; -*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; -esac - -# prepare tmp dir -if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then - clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } - trap clean HUP INT TERM EXIT -else - die "cannot create temp dir" -fi - -mkdir -p -- "${MAVEN_HOME%/*}" - -# Download and Install Apache Maven -verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." -verbose "Downloading from: $distributionUrl" -verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" - -# select .zip or .tar.gz -if ! command -v unzip >/dev/null; then - distributionUrl="${distributionUrl%.zip}.tar.gz" - distributionUrlName="${distributionUrl##*/}" -fi - -# verbose opt -__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' -[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v - -# normalize http auth -case "${MVNW_PASSWORD:+has-password}" in -'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; -has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; -esac - -if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then - verbose "Found wget ... using wget" - wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" -elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then - verbose "Found curl ... using curl" - curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" -elif set_java_home; then - verbose "Falling back to use Java to download" - javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" - targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" - cat >"$javaSource" <<-END - public class Downloader extends java.net.Authenticator - { - protected java.net.PasswordAuthentication getPasswordAuthentication() - { - return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); - } - public static void main( String[] args ) throws Exception - { - setDefault( new Downloader() ); - java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); - } - } - END - # For Cygwin/MinGW, switch paths to Windows format before running javac and java - verbose " - Compiling Downloader.java ..." - "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" - verbose " - Running Downloader.java ..." - "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" -fi - -# If specified, validate the SHA-256 sum of the Maven distribution zip file -if [ -n "${distributionSha256Sum-}" ]; then - distributionSha256Result=false - if [ "$MVN_CMD" = mvnd.sh ]; then - echo "Checksum validation is not supported for maven-mvnd." >&2 - echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 - exit 1 - elif command -v sha256sum >/dev/null; then - if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then - distributionSha256Result=true - fi - elif command -v shasum >/dev/null; then - if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then - distributionSha256Result=true - fi - else - echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 - echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 - exit 1 - fi - if [ $distributionSha256Result = false ]; then - echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 - echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 - exit 1 - fi -fi - -# unzip and move -if command -v unzip >/dev/null; then - unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" -else - tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" -fi -printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" -mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" - -clean || : -exec_maven "$@" Index: rmalization.txt =================================================================== --- normalization.txt (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,155 +1,0 @@ -= Нормализација и Подобрување на дизајн -== Функционални зависности(ФЗ) -Со цел целосно репрезентирање на атрибутите присутни во релациското мапирање, одредени атрибути со исти имиња ќе бидат преименувани. Лесно се заприметуваат таквите атрибути во релацијата R, на пр. **user(id) -> user_id** и **permission(name) -> permission_name**. -{{{ -R( - user: username, description, password, register_at, email,sex,is_active,user_id,name, - blacklisted_user: start_date,end_date,reason,moderator_id - tag: tag_name - thread: thread_created_at,content,thread_id,parent - topic_thread: topic_title, guidelines, - project_thread: project_title, repo_url - permission: permission_name, - custom_role: custom_role_name - channel: channel_name, channel_description - submission: status, submission_id, - feedback: submission_type, feedback_created_at - sent_at, start_at_developer, end_at_developer, message_content, - moderator_started_at, - submission_description, submission_created_at, - feedback_description, - custom_role_description, - submission_creator_id, - feedback_creator_id, - channel_creator_id, - message_sent_by_id -) -}}} - -=== Иницијални ФЗ -1. {{{ user_id -> username, description, password, register_at, email,sex,is_active,name (user) }}} - -2. {{{ username -> user_id(users) }}} - -3. {{{ thread_id -> project_title,repo_url (project) }}} - -4. {{{ thread_id -> topic_title,guidelines,parent (topic) }}} - -5. {{{ thread_id -> thread_created_at,content (thread) }}} - -6. {{{ project_title -> repo_url, thread_created_at, content }}} # Ako ojme so thread_id => project_title -> thread_id -> topic_title...; sho nemat smisla da vazhit. - -7. {{{ (parent, topic_title) -> guidelines,created_at,content }}} # (unqiues of topic_title in a given parent) - -8. {{{ {thread_id, channel_name} -> channel_description,channel_creator_id }}} # (channel) - -9. {{{ {thread_id,moderator_id,user_id, start_date} -> end_date,reason }}} #(blacklisted user) - - -10. {{{ submission_id -> status,submission_description,submission_created_at, submission_creator_id }}} #(submission) - -11 {{{ submission_id -> submission_type,feedback_created_at,feedback_description,feedback_creator_id }}} #(feedback) - -12 {{{ {thread_id,user_id, start_at_developer} -> end_at_developer }}} #(associated_with) - -13 {{{ {thread_id, channel_name, user_id, sent_at} -> message_content,message_sent_by_id }}} #(message) - -14 {{{ custom_role_name, thread_id -> custom_role_description }}} - - -15. {{{ {moderator_id, thread_id} -> moderator_started_at }}} - - -16. {{{ moderator_id -> user_id }}} - -=== Изведени ФЗ -1. {{{ username -> description, password, register_at, email,sex,is_active,name }}} #(transitive) - -2. {{{ moderator_id -> username, description, password, register_at, email,sex,is_active,name (transitive) }}} - -3. {{{ submission_id -> status,submission_description,submission_created_at, submission_type,feedback_created_at,feedback_description (union) }}} - -=== Анализа на функционални зависности -За анализата на функционални зависности ќе го користиме методот на LHS/RHS поделба. Според овај метод потребно е да ги поделиме атрибутите во 3 групи, односно атрибути што се среќаваат на лева страна од Функционалните зависности(LHS) и според истата логика атрибути на десна страна и атрибути кои се среќаваат на 2те страни. - -> **LHS**: ->> {{{ user_id, channel_name, moderator_id, start_date, submission_id, start_at_developer, sent_at, custom_role_name, thread_id }}} - -> **RHS**: ->> {{{ description, password, register_at, email, sex, is_active, name, repo_url, thread_created_at, content, created_at, channel_description, end_date, reason, status, submission_description, submission_created_at, submission_type, feedback_created_at, feedback_description, end_at_developer, message_content, custom_role_description, moderator_started_at, submission_creator_id, feedback_creator_id, channel_creator_id, message_sent_by_id }}} - -> **LHS & RHS**: ->> {{{ username, project_title, parent, topic_title }}} - -== Нормализација - -=== Сегашна нормална форма - -Имајќи предвид дека guidelines e повеќе вредносен атрибути, доаѓаме до заклучок дека сегашната имплементација на релација не е ни во 1NF форма. - -=== Декомпозиција на R во 1NF -Со оделување на guidelines во посебна релација {{{ R1(thread_id, guideline) }}} и {{{ R2(username, thread_id, passowrd...) }}} постигнуваме релациите да се во 1NF. - -Според досега разгледаното за R1(thread_id, guideline) ги имаме следниве ФЗ: - -1. {{{ thread_id -> thread_id }}} -2. {{{ guideline -> guideline }}} - -Според функционалните зависимости, единствената комбинација на атрибути која го задоволува условот за супер клуч е {{{ {thread_id, guideline} }}}, бидејќи {{{ {thread_id, guideline}+ = {thread_id, guideline} }}}. Сепак, со цел да оптимизираме операциите на базата (особено внесување и пребарување), ќе воведеме нов сурогат клуч **id** како примарен клуч. Заедно со него ги додаваме и следниве ФЗ {{{ id -> thread_id, guideline }}}. - -Ова е практично бидејќи природниот клуч {{{ {thread_id, guideline} }}} содржи guideline, која е varchar атрибут со променлива големина. Ако се користеше само природниот клуч, PostgreSQL ќе креираше B-tree индекс врз guideline, кој е поголем по големина и поради тоа побавно ќе се ажурира при **DRU** операции (потребни се повеќе IO страници за индексирање и податоци). Со воведување на сурогат клуч **id** како мал фиксно-димензионален атрибут (на пр. serial или bigserial), индексите се помали и операциите се поефикасни. - -# Не сум најсигурен за ова, имат смисла. Аргумент против ова е дека според вака дефинираното значит дека не смет некој guideline да се повторвит, шо да ќе клајме unqiue constraint, ама тогаш немат нешто шо оптимизиравме и падвит во вода нештово. Така да можда ке требат да се препишит имајќи го во предвид фактот дека некоја уникатност без id. - -Со ова R1 ни се совпаѓат со релацијата **topic_guidelines**, отсега понатаму ќе ја референцираме како таква. - -=== Декомпозиција R1 до BCNF -Според следниве ФЗ за R1: -1. {{{ thread_id -> thread_id }}} -2. {{{ guideline -> guideline }}} -3. {{{ id -> thread_id, guideline }}} - -Според тоа што само **id** ги определува сите атрибути({{{ id+ -> id,thread_id,guideline}}}) следува дека единствен супер клуч е **id**. - -Клуч за оваа релациja би бил **id**, бидејќи неговиот затварач е {{{ id+ = {thread_id, guideline} }}} и е најмал затварач кој ја определува целата релација. - -Според 2NF релацијата не смеe да содржи парцијални зависности. Ова веќе е задоволено од ФЗ за R1. -Според 3NF релацијата потребно е секоја ФЗ(X->A) да ги задоволи следниве својства: - -1. X e супер клуч на R -2. А е примарен атрибут во R. - -Според ова релацијата е веќе во 3NF. -Според BCNF секоја релација потребно е да го задоволува следново својство: - "За секое нетривијално (X->A) важи дека X е суперклуч на R". -Според тоа што **id** e клуч на R1, следува дека релацијата е во BCNF. - -=== Декомпозиција R2 во 2NF -Најпрвин да согледаме дека во било кој супер клуч атрибутите кои се присутни само на левата страна мора да бидат вклучени. Најпрвин да започниме само со тие атрибути: - -{{{ - {user_id, channel_name, moderator_id, start_date, submission_id, start_at_developer, sent_at, custom_role_name , thread_id} = { -user_id, channel_name, moderator_id, start_date, submission_id, start_at_developer, sent_at, custom_role_name , thread_id, username, description, password, register_at, email,sex,is_active,name, project_title,repo_url, topic_title, guidelines, parent, thread_created_at, content, channel_description, end_date, status, submission_description, submission_created_at, submission_type,feedback_created_at,feedback_description, end_at_developer, message_content, custom_role_description, moderator_started_at, -} -}}} - -Според тоа што затворачот ги опфаќа сите атрибути може да се заклучи дека ова е најминималното множество чиишто покривач ја дава целата релација, што значи дека е примарен клуч. - -Имајќи во предвид примарниот клуч можит да ги изведиме следниве релации, притоа кај релациите кај кои има совпаѓање со некоја релација од релационото мапирање, ќе ги додаваме нивните имиња. - - -{{{ R21(user_id,username, description, password, register_at, email,sex,is_active,name) == users }}} -R22(project_title,repo_url,topic_title,guidelines,parent,thread_created_at,content) -{{{ R23(thread_id,channel_name,channel_description, channel_creator_id) == channel }}} -{{{ R24(thread_id,moderator_id,user_id,start_date,end_date) }}} -{{{ R25(submission_id,status,submission_description,submission_created_at, submission_type,feedback_created_at,feedback_description, feedback_creator_id, submission_creator_id) }}} #Tuka ke imame problem, ama mozhit da rechime deka procenavme deka ke imat dosta nullki pa zaradi to rekovme da se odelat vo posebna relacija. -{{{ R26(thread_id,user_id, start_at_developer,end_at_developer) == developer_associated_with_project }}} -{{{ R27(thread_id, channel_name, message_sent_by_id, sent_at, message_content) === messages}}} -{{{ R28(thread_id,custom_role_name,custom_role_description) == project_roles }}} -{{{ R29(thread_id,moderator_id,moderator_started_at) == topic_threads_moderators}}} - - - - - - Index: ckage-lock.json =================================================================== --- package-lock.json (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,13 +1,0 @@ -{ - "name": "buildboard", - "version": "1.0.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "@stomp/stompjs": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@stomp/stompjs/-/stompjs-7.0.0.tgz", - "integrity": "sha512-fGdq4wPDnSV/KyOsjq4P+zLc8MFWC3lMmP5FBgLWKPJTYcuCbAIrnRGjB7q2jHZdYCOD5vxLuFoKIYLy5/u8Pw==" - } - } -} Index: ckage.json =================================================================== --- package.json (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,17 +1,0 @@ -{ - "name": "buildboard", - "version": "1.0.0", - "description": "", - "main": "index.js", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "repository": { - "type": "git", - "url": "https://github.com/stevetosak/BuildBoard.git" - }, - "private": true, - "dependencies": { - "@stomp/stompjs": "^7.0.0" - } -} Index: m.xml =================================================================== --- pom.xml (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,88 +1,0 @@ - - - 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 3.4.1 - - - com.db.finki.www - build_board - 0.0.1-SNAPSHOT - - 17 - - - - org.springframework.boot - spring-boot-starter-thymeleaf - - - - - - - - - org.springframework.boot - spring-boot-starter-security - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-devtools - runtime - true - - - org.projectlombok - lombok - 1.18.30 - provided - - - org.springframework.boot - spring-boot-starter-test - test - - - org.flywaydb - flyway-core - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.flywaydb - flyway-database-postgresql - - - org.postgresql - postgresql - 42.7.4 - - - - org.springframework.boot - spring-boot-starter-websocket - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - Index: c/main/java/com/db/finki/www/build_board/DemoApplication.java =================================================================== --- src/main/java/com/db/finki/www/build_board/DemoApplication.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,23 +1,0 @@ -package com.db.finki.www.build_board; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.Bean; -import org.springframework.scheduling.annotation.EnableScheduling; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -import org.springframework.security.crypto.password.PasswordEncoder; - -@SpringBootApplication -@EnableScheduling -public class DemoApplication { - - public static void main(String[] args) { - SpringApplication.run(DemoApplication.class, args); - } - - @Bean - PasswordEncoder passwordEncoder() { - return new BCryptPasswordEncoder(12); - } - -} Index: c/main/java/com/db/finki/www/build_board/common/enums/PermissionValue.java =================================================================== --- src/main/java/com/db/finki/www/build_board/common/enums/PermissionValue.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,9 +1,0 @@ -package com.db.finki.www.build_board.common.enums; - -public enum PermissionValue { - READ, - WRITE, - CREATE, - DELETE; - -} Index: c/main/java/com/db/finki/www/build_board/common/enums/ProjectResourcePermissionOverrideType.java =================================================================== --- src/main/java/com/db/finki/www/build_board/common/enums/ProjectResourcePermissionOverrideType.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,6 +1,0 @@ -package com.db.finki.www.build_board.common.enums; - -public enum ProjectResourcePermissionOverrideType { - INCLUDE, - EXCLUDE, -} Index: c/main/java/com/db/finki/www/build_board/config/BeanConfig.java =================================================================== --- src/main/java/com/db/finki/www/build_board/config/BeanConfig.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,14 +1,0 @@ -package com.db.finki.www.build_board.config; - -import com.db.finki.www.build_board.service.user.AuthenticationSuccessHandlerImpl; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.security.web.authentication.AuthenticationSuccessHandler; - -@Configuration -public class BeanConfig { - @Bean - public AuthenticationSuccessHandler authenticationSuccessHandler() { - return new AuthenticationSuccessHandlerImpl(); - } -} Index: c/main/java/com/db/finki/www/build_board/config/CronJob.java =================================================================== --- src/main/java/com/db/finki/www/build_board/config/CronJob.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,31 +1,0 @@ -package com.db.finki.www.build_board.config; - -import jakarta.persistence.EntityManager; -import jakarta.persistence.PersistenceContext; -import jakarta.transaction.Transactional; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; - -@Component -public class CronJob { - - @PersistenceContext - private EntityManager em; - - // @Scheduled(cron = "0 * * * * ?") - @Transactional - @Scheduled(cron = "0 0 0 1 * ?") - public void markRejectedPendingPrRequests() { - em - .createNativeQuery("CALL mark_denied_pr_requests_older_than_1month();") - .executeUpdate(); - } - - @Transactional - @Scheduled(cron = "0 0 0 1 * ?") - public void markRejectedPendingReports() { - em - .createNativeQuery("CALL mark_denied_reports_older_than_1month();") - .executeUpdate(); - } -} Index: c/main/java/com/db/finki/www/build_board/config/WebConfig.java =================================================================== --- src/main/java/com/db/finki/www/build_board/config/WebConfig.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,18 +1,0 @@ -package com.db.finki.www.build_board.config; - -import com.db.finki.www.build_board.service.util.FileUploadService; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; - -import java.io.File; - -@Configuration -public class WebConfig implements WebMvcConfigurer { - - @Override - public void addResourceHandlers(ResourceHandlerRegistry registry) { - registry.addResourceHandler("/avatars/**") - .addResourceLocations("file:" + FileUploadService.USER_AVATAR_DIR + File.separator); - } -} Index: c/main/java/com/db/finki/www/build_board/config/WebSecurityConfig.java =================================================================== --- src/main/java/com/db/finki/www/build_board/config/WebSecurityConfig.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,98 +1,0 @@ -package com.db.finki.www.build_board.config; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.http.HttpMethod; -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.authentication.AuthenticationProvider; -import org.springframework.security.authentication.dao.DaoAuthenticationProvider; -import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration; -import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; -import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.security.crypto.password.PasswordEncoder; -import org.springframework.security.web.SecurityFilterChain; -import org.springframework.security.web.authentication.AuthenticationSuccessHandler; -import org.springframework.security.web.context.DelegatingSecurityContextRepository; -import org.springframework.security.web.context.HttpSessionSecurityContextRepository; -import org.springframework.security.web.context.SecurityContextRepository; -import org.springframework.security.web.util.matcher.AntPathRequestMatcher; - -@Configuration -@EnableWebSecurity -@EnableMethodSecurity -public class WebSecurityConfig { - - private final PasswordEncoder passwordEncoder; - private final UserDetailsService userDetailsService; - private final AuthenticationSuccessHandler successHandler; - - - public WebSecurityConfig(PasswordEncoder passwordEncoder, UserDetailsService userDetailsService, AuthenticationSuccessHandler successHandler) { - this.passwordEncoder = passwordEncoder; - this.userDetailsService = userDetailsService; - this.successHandler = successHandler; - } - @Bean - public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { - http - .csrf(AbstractHttpConfigurer::disable) - .authorizeHttpRequests(request -> - request.requestMatchers( - "/", - "/contact", - "/about", - "/project_imgs/buildboard-logo.jpg", - "*.ico", - "*.jpg", - "*.png", - "/register", - "/css/**", - "/js/**" - ).permitAll() - .requestMatchers( - new AntPathRequestMatcher("/topics/*", - HttpMethod.GET.name()), - new AntPathRequestMatcher("/projects/*", - HttpMethod.GET.name()), - new AntPathRequestMatcher("/avatars/**",HttpMethod.GET.name()) - ).permitAll() - .requestMatchers("/topic/**","/project/**").authenticated() - - .anyRequest().authenticated() - ).formLogin(formLogin -> - formLogin.permitAll() - .defaultSuccessUrl("/") - .successHandler(successHandler) - ) - .logout(logout -> - logout.logoutSuccessUrl("/") - .clearAuthentication(true) - .invalidateHttpSession(true) - .deleteCookies("JSESSIONID") - ); - - return http.build(); - - } - - @Bean - public AuthenticationProvider authenticationProvider() { - DaoAuthenticationProvider daoAuthenticationProvider = new DaoAuthenticationProvider(); - daoAuthenticationProvider.setPasswordEncoder(passwordEncoder); - daoAuthenticationProvider.setUserDetailsService(userDetailsService); - return daoAuthenticationProvider; - } - - @Bean - public AuthenticationManager authenticationManager(AuthenticationConfiguration config) throws Exception { - return config.getAuthenticationManager(); - } - - @Bean - public SecurityContextRepository securityContextRepository() { - return new DelegatingSecurityContextRepository(new HttpSessionSecurityContextRepository()); - } -} Index: c/main/java/com/db/finki/www/build_board/config/WebSocketConfig.java =================================================================== --- src/main/java/com/db/finki/www/build_board/config/WebSocketConfig.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,43 +1,0 @@ -package com.db.finki.www.build_board.config; - -import com.fasterxml.jackson.databind.ObjectMapper; -import org.springframework.context.annotation.Configuration; -import org.springframework.messaging.converter.MappingJackson2MessageConverter; -import org.springframework.messaging.converter.MessageConverter; -import org.springframework.messaging.simp.config.MessageBrokerRegistry; -import org.springframework.web.socket.WebSocketHandler; -import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker; -import org.springframework.web.socket.config.annotation.StompEndpointRegistry; -import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer; - -import java.util.List; - - -@Configuration -@EnableWebSocketMessageBroker -public class WebSocketConfig implements WebSocketMessageBrokerConfigurer { - - private final ObjectMapper objectMapper; - - public WebSocketConfig(ObjectMapper objectMapper) { - this.objectMapper = objectMapper;} - - @Override - public void configureMessageBroker(MessageBrokerRegistry config) { - config.enableSimpleBroker("/projects"); - config.setApplicationDestinationPrefixes("/projects"); - } - - @Override - public void registerStompEndpoints(StompEndpointRegistry registry) { - registry.addEndpoint("/channel-websocket"); - } - - @Override - public boolean configureMessageConverters(List messageConverters) { - MappingJackson2MessageConverter converter = new MappingJackson2MessageConverter(); - converter.setObjectMapper(objectMapper); // Use the configured ObjectMapper - messageConverters.add(converter); - return false; // Disable default converters - } -} Index: c/main/java/com/db/finki/www/build_board/controller/ExceptionHandler.java =================================================================== --- src/main/java/com/db/finki/www/build_board/controller/ExceptionHandler.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,41 +1,0 @@ -package com.db.finki.www.build_board.controller; - -import org.springframework.security.access.AccessDeniedException; -import org.springframework.web.bind.annotation.ControllerAdvice; -import org.springframework.web.servlet.ModelAndView; -import org.springframework.web.servlet.resource.NoResourceFoundException; - -@ControllerAdvice -public class ExceptionHandler { - - private ModelAndView mavBuilder(Exception exception,String message,int status) { - ModelAndView mav = new ModelAndView("/error_pages/error"); - mav.addObject("exception",exception); - mav.addObject("message",message); - mav.addObject("status",status); - return mav; - } - - @org.springframework.web.bind.annotation.ExceptionHandler(value = { AccessDeniedException.class }) - public ModelAndView handleForbidden(AccessDeniedException exception) { - return mavBuilder(exception,"You requested a resource that you do not have permission to access.",403); - } - - @org.springframework.web.bind.annotation.ExceptionHandler(value = {NoResourceFoundException.class }) - public ModelAndView handleNotFound(NoResourceFoundException exception) { - return mavBuilder(exception,"You requested a resource that does not exist.\nCheck if you entered the url correctly.",404); - } - -// @org.springframework.web.bind.annotation.ExceptionHandler(value = {HttpServerErrorException.InternalServerError.class }) -// public ModelAndView handleNotFound(HttpServerErrorException.InternalServerError exception) { -// return mavBuilder(exception,"This is a server issue.\nNot your fault :).",500); -// } - - - // @org.springframework.web.bind.annotation.ExceptionHandler(value = {Exception.class }) - // public ModelAndView handleNotFound(Exception exception) { - // System.out.println(exception.getMessage()); - // exception.printStackTrace(); - // return mavBuilder(exception,"An error occurred.",-1); - // } -} Index: c/main/java/com/db/finki/www/build_board/controller/channel/ChannelController.java =================================================================== --- src/main/java/com/db/finki/www/build_board/controller/channel/ChannelController.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,178 +1,0 @@ -package com.db.finki.www.build_board.controller.channel; - -import com.db.finki.www.build_board.entity.access_managment.Permission; -import com.db.finki.www.build_board.entity.channel.Channel; -import com.db.finki.www.build_board.entity.thread.Project; -import com.db.finki.www.build_board.entity.user_type.BBUser; -import com.db.finki.www.build_board.mapper.MessageMapper; -import com.db.finki.www.build_board.service.access_managment.ProjectAccessManagementService; -import com.db.finki.www.build_board.service.channel.ChannelService; -import com.db.finki.www.build_board.service.channel.MessageService; -import com.db.finki.www.build_board.service.thread.impl.ProjectService; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.security.core.parameters.P; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.mvc.support.RedirectAttributes; - -import java.util.List; - - -@Controller -@RequestMapping("/projects/{title}/channels") -public class ChannelController { - private final ChannelService channelService; - private final MessageMapper messageMapper; - private final MessageService messageService; - private final ProjectService projectService; - private final ProjectAccessManagementService projectAccessManagementService; - - public ChannelController( - ChannelService channelService, MessageMapper messageMapper, - MessageService messageService, ProjectService projectService, - ProjectAccessManagementService projectAccessManagementService - ) { - this.channelService = channelService; - this.messageMapper = messageMapper; - this.messageService = messageService; - this.projectService = projectService; - this.projectAccessManagementService = projectAccessManagementService; - } - - private void checkIfAuthorized( - Model model, - Channel channel, - int userId, - Project project, - String permission - ) { - - boolean hasPermission = false; - if(channel == null) { - hasPermission = projectAccessManagementService.hasPermissionToAccessResource(userId,permission,null,project); - } else { - hasPermission = projectAccessManagementService.hasPermissionToAccessResource(userId, permission, channel.getId(), project); - } - if (!hasPermission) { - System.out.println("vleze deny access"); - model.addAttribute("error", - "You dont have permission to access this channel"); - throw new RuntimeException("Unauthorized"); - } - } - - @GetMapping() - public String getChannels(@PathVariable("title") Project project, Model model) { - List channels = channelService.getAllChannelsForProject(project); - model.addAttribute("channels", - channels); - return "channels/list-channels"; - } - - @PreAuthorize("@projectService.getAllDevelopersForProject(#project).contains(#user)") - @GetMapping("/{channelName}") - public String getChannel( - @PathVariable String channelName, - @PathVariable("title") @P("project") Project project, - Model model, - RedirectAttributes redirectAttributes, - @SessionAttribute @P("user") BBUser user - ) { - Channel c = (Channel) redirectAttributes.getAttribute("channel"); - - if (c == null) { - c = channelService.getByNameAndProject(channelName, - project); - model.addAttribute("channel", - c); - model.addAttribute("messages", - messageMapper.toDTO( - messageService.getAllMessagesForProjectChannel(project.getId(), - channelName))); - model.addAttribute("developers", - projectService.getAllDevelopersForProject(project)); - } else { - model.addAttribute("channel", - c); - } - - try { - checkIfAuthorized(model, c, user.getId(), project, Permission.READ); - boolean canWrite = projectAccessManagementService.hasPermissionToAccessResource(user.getId(), - Permission.WRITE, - c.getId(), - project); - model.addAttribute("canWrite", - canWrite); - - return "channels/show-channel"; - } catch (RuntimeException e) { - if (e.getMessage().contains("Unauthorized")) { - return "redirect:/projects/" + project.getId(); - } - throw e; - } - } - - @PreAuthorize("@channelService.getByNameAndProject(#channelName,#project).getDeveloper()" + - ".equals(#user)") - @PostMapping("/{channelName}/delete") - public String deleteChannel( - @PathVariable @P("channelName") String channelName, @PathVariable("title") @P( - "project") Project project, - @SessionAttribute @P("user") BBUser user, - RedirectAttributes redirectAttributes, Model model - ) { - Channel c = channelService.getByNameAndProject(channelName, - project); - - try { - checkIfAuthorized(model, c, user.getId(), project, Permission.DELETE); - - channelService.deleteChannel(channelName, - project); - return "redirect:/projects/" + project.getTitle(); - } catch (RuntimeException e) { - if (e.getMessage().contains("Unauthorized")) { - return "redirect:/projects/" + project.getId(); - } - throw e; - } - } - - @PreAuthorize("@projectService.getAllDevelopersForProject(#project).contains(#user)") - @PostMapping("/add") - public String add( - @PathVariable("title") @P("project") Project project, - @RequestParam String channelName, @RequestParam String channelDescription, - @SessionAttribute @P("user") BBUser user, RedirectAttributes redirectAttributes, - Model model - ) { - try { - - - try { - checkIfAuthorized(model, null, user.getId(), project, Permission.CREATE); - Channel channel = channelService.create(project, - channelName, - channelDescription, - user); - redirectAttributes.addFlashAttribute("channel", - channel); - } catch (RuntimeException e) { - if (e.getMessage().contains("Unauthorized")) { - return "redirect:/projects/" + project.getId(); - } - throw e; - } - - } catch (Exception e) { - redirectAttributes.addFlashAttribute("error", - e.getMessage()); - } - - return "redirect:/projects/" + project.getTitle(); - } - -} Index: c/main/java/com/db/finki/www/build_board/controller/channel/ChannelWebSocketController.java =================================================================== --- src/main/java/com/db/finki/www/build_board/controller/channel/ChannelWebSocketController.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,56 +1,0 @@ -package com.db.finki.www.build_board.controller.channel; - -import com.db.finki.www.build_board.dto.MessageDTO; -import com.db.finki.www.build_board.entity.access_managment.Permission; -import com.db.finki.www.build_board.entity.channel.Channel; -import com.db.finki.www.build_board.entity.channel.Message; -import com.db.finki.www.build_board.entity.thread.Project; -import com.db.finki.www.build_board.entity.user_type.BBUser; -import com.db.finki.www.build_board.mapper.MessageMapper; -import com.db.finki.www.build_board.service.access_managment.ProjectAccessManagementService; -import com.db.finki.www.build_board.service.channel.ChannelService; -import com.db.finki.www.build_board.service.channel.MessageService; -import com.db.finki.www.build_board.service.thread.impl.ProjectService; -import com.db.finki.www.build_board.service.user.BBUserDetailsService; -import jakarta.transaction.Transactional; -import org.springframework.messaging.handler.annotation.MessageMapping; -import org.springframework.stereotype.Controller; - -import java.time.LocalDateTime; - -@Controller -public class ChannelWebSocketController { - - private final MessageService messageService; - private final MessageMapper messageMapper; - private final ProjectAccessManagementService projectAccessManagementService; - private final BBUserDetailsService bbUserDetailsService; - private final ChannelService channelService; - private final ProjectService projectService; - - public ChannelWebSocketController(MessageService messageService, MessageMapper messageMapper, ProjectAccessManagementService projectAccessManagementService, BBUserDetailsService bbUserDetailsService, ChannelService channelService, ProjectService projectService) { - this.messageService = messageService; - this.messageMapper = messageMapper; - this.projectAccessManagementService = projectAccessManagementService; - this.bbUserDetailsService = bbUserDetailsService; - this.channelService = channelService; - this.projectService = projectService; - } - - @MessageMapping("/{projectName}/channels/{channelName}") - @Transactional - MessageDTO chatMessage(MessageDTO messageDTO) { - BBUser user = (BBUser) bbUserDetailsService.loadUserByUsername(messageDTO.getSenderUsername()); - Project project = projectService.getById(Long.valueOf(messageDTO.getProjectId())); - Channel channel = channelService.getByNameAndProject(messageDTO.getChannelName(), project); - if(!projectAccessManagementService.hasPermissionToAccessResource(user.getId(), Permission.WRITE,channel.getId(),project)){ - return null; - } - - messageDTO.setSentAt(LocalDateTime.now()); - Message m = messageService.addMessage(messageDTO); - MessageDTO newMessage = messageMapper.toDTO(m); - newMessage.setAvatarUrl(m.getSentBy().getAvatarUrl()); - return newMessage; - } -} Index: c/main/java/com/db/finki/www/build_board/controller/home_page/HomePageController.java =================================================================== --- src/main/java/com/db/finki/www/build_board/controller/home_page/HomePageController.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,119 +1,0 @@ -package com.db.finki.www.build_board.controller.home_page; - -import com.db.finki.www.build_board.entity.user_type.BBUser; -import com.db.finki.www.build_board.service.user.BBUserDetailsService; -import com.db.finki.www.build_board.service.thread.itf.TagService; -import com.db.finki.www.build_board.service.util.NamedThreadService; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.servlet.http.HttpSession; -import org.springframework.dao.DataIntegrityViolationException; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContext; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.web.context.SecurityContextRepository; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.servlet.mvc.support.RedirectAttributes; - -import java.net.URLDecoder; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.List; - -@Controller -public class HomePageController { - private final TagService tagService; - private final BBUserDetailsService bbUserDetailsService; - private final SecurityContextRepository securityContextRepository; - private final NamedThreadService namedThreadService; - - public HomePageController(TagService tagService, BBUserDetailsService bbUserDetailsService, - SecurityContextRepository securityContextRepository, NamedThreadService namedThreadService - ) { - this.tagService = tagService; - this.bbUserDetailsService = bbUserDetailsService; - this.securityContextRepository = securityContextRepository; - this.namedThreadService = namedThreadService; - } - - @GetMapping("/") - public String search( - @RequestParam(required = false, defaultValue = "") String query, - @RequestParam(required = false, defaultValue = "all") String type, - @RequestParam(required = false, defaultValue = "") List filters, - @RequestParam(required = false,name = "tags") List tag, - Model model - ) { - - if(type.equals("all")) - type=null; - - String title = null; - String content = null; - - if(query != null && filters.contains("title")) - title= URLDecoder.decode(query, StandardCharsets.UTF_8); - - if(query != null && filters.contains("content")) - content=URLDecoder.decode(query, StandardCharsets.UTF_8); - - if(filters.isEmpty()){ - title=URLDecoder.decode(query, StandardCharsets.UTF_8); - content=URLDecoder.decode(query, StandardCharsets.UTF_8); - } - - model.addAttribute("threads", namedThreadService.getAll(title,content,type,tag)); - model.addAttribute("tags",tagService.getAll()); - - return "home_pages/home"; - } - - @GetMapping("/about") - public String getAboutPage(){ - return "home_pages/project_description"; - } - - @GetMapping("/register") - public String getRegisterPage(Model model) { - model.addAttribute("user", new BBUser()); - model.addAttribute("canEdit",true); - return "home_pages/register"; - } - - @PostMapping("/register") - public String registerPost( - @RequestParam String username, - @RequestParam String email, - @RequestParam String name, - @RequestParam String password, - @RequestParam String description, - @RequestParam String sex, - RedirectAttributes redirectAttributes, - HttpSession session, - HttpServletRequest request, - HttpServletResponse response - ) { - try { - Authentication authentication = bbUserDetailsService.registerUser(username, email, name, password,description, sex); - - SecurityContext context = SecurityContextHolder.getContext(); - context.setAuthentication(authentication); - - securityContextRepository.saveContext(context,request,response); - - session.setAttribute("user", authentication.getPrincipal()); - return "redirect:/"; - }catch (DataIntegrityViolationException e) { - if(e.getMessage().contains("users_username_key")) - { - redirectAttributes.addFlashAttribute("duplicatedUsername",username); - return "redirect:/register"; - } - throw e; - } - } -} Index: c/main/java/com/db/finki/www/build_board/controller/home_page/LoginPageController.java =================================================================== --- src/main/java/com/db/finki/www/build_board/controller/home_page/LoginPageController.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,20 +1,0 @@ -package com.db.finki.www.build_board.controller.home_page; - -import jakarta.servlet.http.HttpServletRequest; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestParam; - -@Controller -public class LoginPageController { - @GetMapping("/login") - public String getLoginPage() { - return "login"; - } - @PostMapping("/login") - public String login(@RequestParam String username, @RequestParam String password, Model model, HttpServletRequest request) { - return "redirect:/"; - } -} Index: c/main/java/com/db/finki/www/build_board/controller/home_page/UserProfileController.java =================================================================== --- src/main/java/com/db/finki/www/build_board/controller/home_page/UserProfileController.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,125 +1,0 @@ -package com.db.finki.www.build_board.controller.home_page; - -import com.db.finki.www.build_board.entity.entity_enum.Status; -import com.db.finki.www.build_board.entity.user_type.BBUser; -import com.db.finki.www.build_board.service.ReportService; -import com.db.finki.www.build_board.service.user.BBUserDetailsService; -import com.db.finki.www.build_board.service.request.ProjectRequestService; -import com.db.finki.www.build_board.service.util.FileUploadService; -import jakarta.servlet.http.HttpSession; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.security.core.parameters.P; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.servlet.mvc.support.RedirectAttributes; - -import java.io.IOException; - - -@Controller -@RequestMapping("{username}") -public class UserProfileController { - private final BBUserDetailsService userService; - private final FileUploadService fileUploadService; - private final ProjectRequestService projectRequestService; - private final ReportService reportService; - - public UserProfileController(BBUserDetailsService userService, FileUploadService fileUploadService, ProjectRequestService projectRequestService, ReportService reportService) { - this.userService = userService; - this.fileUploadService = fileUploadService; - this.projectRequestService = projectRequestService; - this.reportService = reportService; - } - - @PreAuthorize("#user.getUsername().equals(#username)") - @GetMapping("/profile/edit") - public String getEditProfilePage(@PathVariable @P("username") String username, @SessionAttribute @P("user") BBUser user, Model model) { - try { - model.addAttribute("user", userService.loadUserByUsername(username)); - model.addAttribute("canEdit", user.getUsername().equals(username)); - return "/home_pages/private-profile"; - }catch(Exception ignore){ - return "redirect:/"; - } - } - - @GetMapping("/profile") - public String getProfilePage(@PathVariable String username, @SessionAttribute BBUser user, Model model) { - try { - model.addAttribute("user", userService.loadUserByUsername(username)); - return "/home_pages/public-profile"; - }catch(Exception ignore){ - return "redirect:/"; - } - } - - @GetMapping("/reports") - public String getReportsByUser(@PathVariable String username, - @SessionAttribute @P("user") BBUser user, - @RequestParam(required = false) Status status, - Model model) { - BBUser byUser = (BBUser) userService.loadUserByUsername(username); - model.addAttribute("user", byUser); - model.addAttribute("requests", reportService.getByStatusAndUser(status,byUser)); - model.addAttribute("status", Status.values()); - return "/show-user-reports"; - } - - @GetMapping("/project-requests") - public String getProjectRequestsPage( - @PathVariable String username, - Model model, - @RequestParam(required = false) Status status - ) { - BBUser forUser = (BBUser) userService.loadUserByUsername(username); - model.addAttribute("user", forUser); - model.addAttribute("requests", projectRequestService.getByStatusAndUser(status,forUser)); - model.addAttribute("status", Status.values()); - return "project_pages/requests/show-user-requests"; - } - - @PreAuthorize("#requestedByUsername==#username") - @PostMapping("/upload-avatar") - public String uploadAvatar(Model model, - @PathVariable @P("username") String username, - @RequestParam MultipartFile userImage, - RedirectAttributes redirectAttributes, - @RequestParam(name = "cur_user_username") @P("requestedByUsername") String requestedByUsername - ) { - BBUser u = (BBUser) userService.loadUserByUsername(username); - try{ - fileUploadService.uploadAvatar(userImage,u.getId()); - redirectAttributes.addFlashAttribute("message", "Avatar uploaded successfully"); - } catch (IOException e) { - redirectAttributes.addFlashAttribute("message", "Cant upload avatar"); - } - - return "redirect:/" + username + "/profile"; - } - - @PreAuthorize("#requestedByUsername==#oldUsername") - @PostMapping("/profile/change") - public String changeInfo( - @RequestParam String email, - @RequestParam String name, - @RequestParam String description, - @PathVariable(name = "username") @P("oldUsername") String oldUsername, - @RequestParam(name = "username") String newUsername, - @RequestParam(name = "cur_user_username") @P("requestedByUsername") String requestedByUsername, - @RequestParam String password, - HttpSession session - ){ - BBUser user = userService.changeInfoForUserWithUsername( - oldUsername, - newUsername, - email, - name, - description, - password - ); - session.setAttribute("user", user); - return "redirect:/" + user.getUsername() + "/profile"; - } -} Index: c/main/java/com/db/finki/www/build_board/controller/thread_controller/DiscussionController.java =================================================================== --- src/main/java/com/db/finki/www/build_board/controller/thread_controller/DiscussionController.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,53 +1,0 @@ -package com.db.finki.www.build_board.controller.thread_controller; - -import com.db.finki.www.build_board.entity.user_type.BBUser; -import com.db.finki.www.build_board.service.thread.impl.DiscussionService; -import jakarta.servlet.http.HttpSession; -import org.springframework.data.repository.query.Param; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.security.core.parameters.P; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.SessionAttribute; - -@Controller -public class DiscussionController { - private final DiscussionService discussionService; - - public DiscussionController(DiscussionService discussionService) { - this.discussionService = discussionService; - } - - @PostMapping("/topics/{topic-id}/discussions/add") - public String addReply( - @PathVariable(name = "topic-id") String topicId, - @RequestParam int parentId, @RequestParam String content, Model model, - @SessionAttribute @P("user") BBUser user) { - try { - discussionService.create(content, parentId, user); - } catch (Exception e) { - e.printStackTrace(); - } - - return "redirect:/topics/" + topicId; - } - - @PreAuthorize("@discussionService.getDiscussionById(#replyId).user.username==#username") - @PostMapping("/topics/{topic-id}/discussions/{replyId}/edit") - public String editReply(@PathVariable(name = "topic-id") String topicId, @PathVariable @P("replyId") int replyId, @RequestParam String content, Model model, HttpSession session - , @P("username") String username) { - discussionService.edit(replyId, content); - return "redirect:/topics/" + topicId; - } - - @PreAuthorize("@discussionService.getDiscussionById(#discussionId).getUser().getId()==#user.getId()") - @PostMapping("/topics/{topic-id}/discussions/{discussionId}/delete") - public String deleteDiscussion(@PathVariable(name = "topic-id") String topicId, @PathVariable @P("discussionId") int discussionId, @SessionAttribute @P("user") BBUser user, @RequestParam @Param("username") String username) { - discussionService.delete(discussionId); - return "redirect:/topics/" + topicId; - } - -} Index: c/main/java/com/db/finki/www/build_board/controller/thread_controller/ProjectController.java =================================================================== --- src/main/java/com/db/finki/www/build_board/controller/thread_controller/ProjectController.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,319 +1,0 @@ -package com.db.finki.www.build_board.controller.thread_controller; - -import com.db.finki.www.build_board.dto.AddRoleDTO; -import com.db.finki.www.build_board.dto.DeveloperWithRolesForProjectDTO; -import com.db.finki.www.build_board.entity.access_managment.ProjectRole; -import com.db.finki.www.build_board.entity.access_managment.ProjectRolePermission; -import com.db.finki.www.build_board.entity.channel.Channel; -import com.db.finki.www.build_board.entity.thread.Project; -import com.db.finki.www.build_board.entity.user_type.BBUser; -import com.db.finki.www.build_board.entity.view.RoleChannelPermissions; -import com.db.finki.www.build_board.repository.access_managment.ProjectRoleRepository; -import com.db.finki.www.build_board.service.access_managment.AddRoleDTOEntitiesMapper; -import com.db.finki.www.build_board.service.access_managment.ProjectAccessManagementService; -import com.db.finki.www.build_board.service.channel.ChannelService; -import com.db.finki.www.build_board.service.thread.impl.ProjectService; -import com.db.finki.www.build_board.service.thread.impl.TagServiceImpl; -import com.db.finki.www.build_board.service.thread.itf.TagService; -import com.db.finki.www.build_board.service.user.BBUserDetailsService; -import org.hibernate.Hibernate; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.security.core.parameters.P; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.mvc.support.RedirectAttributes; - -import java.util.*; - - -@Controller -@RequestMapping("/projects") -public class ProjectController { - - private final ProjectService projectService; - private final TagService tagService; - private final String DUPLICATED_TITLE_MSG = "could not execute statement [ERROR: duplicate key value violates unique constraint"; - private final ProjectAccessManagementService projectAccessManagementService; - private final AddRoleDTOEntitiesMapper mapper; - private final BBUserDetailsService userDetailsService; - private final ChannelService channelService; - private final ProjectRoleRepository projectRoleRepository; - - public ProjectController(ProjectService projectService, TagServiceImpl topicService, ProjectAccessManagementService projectAccessManagementService, AddRoleDTOEntitiesMapper mapper, BBUserDetailsService userDetailsService, ChannelService channelService, ProjectRoleRepository projectRoleRepository) { - this.projectService = projectService; - this.tagService = topicService; - this.projectAccessManagementService = projectAccessManagementService; - this.mapper = mapper; - this.userDetailsService = userDetailsService; - this.channelService = channelService; - this.projectRoleRepository = projectRoleRepository; - } - - @GetMapping("/{title}") - public String getProjectPage( - @SessionAttribute BBUser user, - @PathVariable(name = "title") Project project, Model model, RedirectAttributes redirectAttributes, - @RequestParam(required = false) String duplicateTitle - ) { - model.addAttribute("project", - project); - model.addAttribute("tags", - tagService.getAll()); - model.addAttribute("developers", - projectService.getAllDevelopersForProject(project)); - String error = (String) redirectAttributes.getAttribute("error"); - boolean canCreateChannel = false; - if(user != null){ - canCreateChannel = projectAccessManagementService.hasPermissionToAccessResource(user.getId(),"CREATE",null,project); - - } - - if (error != null) { - model.addAttribute("error", - error); - } - if (duplicateTitle != null) { - model.addAttribute("errMsg", - "There already exists a project with the provided title"); - } - - model.addAttribute("canCreateChannel", canCreateChannel); - - Hibernate.initialize(project.getTags()); - - return "project_pages/show-project"; - } - - @GetMapping("/create") - public String getCreateProjectPage(Model model, @RequestParam(required = false) String duplicateTitle) { - if (duplicateTitle != null) { - model.addAttribute("errMsg", - "There already exists a project with the provided title"); - } - model.addAttribute("project", - new Project()); - model.addAttribute("isCreatingProject", - tagService.getAll()); - return "project_pages/project-create"; - } - - - @PostMapping("/{title}/roles/add") - public String addProjectRole(@PathVariable(name = "title") String title, @RequestBody AddRoleDTO addRoleDTO) { - projectAccessManagementService.addRole(mapper.map(addRoleDTO)); - return "redirect:/projects/" + title + "/roles"; - } - - @GetMapping("{title}/roles") - public String getRolesPage(@PathVariable(name = "title") Project project, Model model) { - model.addAttribute("project", - project); - model.addAttribute("developersRoles", - projectAccessManagementService.getRolesForMembersInProject(project)); - model.addAttribute("perResourcePermissions", - List.of("READ", - "WRITE")); - model.addAttribute("globalPermissions", - List.of("CREATE", - "DELETE")); - model.addAttribute("errMsg", - null); - model.addAttribute("overrideTypeDefault", - "INCLUDE"); - return "project_pages/project-roles"; - } - - @GetMapping("{title}/roles/{id}/edit") - public String getEditRolePage(@PathVariable(name = "title") Project project, @PathVariable(name = "id") Integer roleId,Model model) { - ProjectRole projectRole = projectRoleRepository.findById(roleId).orElseThrow(() -> new IllegalArgumentException("bad project id or role name")); - List projectRolePermissions = projectAccessManagementService.getRolePermissionsForRoleInProject(projectRole); - List roleChannelPermissions = channelService.getChannelPermissionsForRole(projectRole); - List channels = channelService.getAllChannelsForProject(project); - List selectedGlobalPermissions = projectRolePermissions - .stream() - .filter(p -> p.getPermission().getName().equals("CREATE") || p.getPermission().getName().equals("DELETE")).map(s -> s.getPermission().getName()).toList(); - - - model.addAttribute("role",projectRole); - model.addAttribute("overrideType",projectRole.getOverrideType().toString()); - model.addAttribute("globalPermissions", List.of("CREATE", "DELETE")); - model.addAttribute("perResourcePermissions", List.of("READ", "WRITE")); - model.addAttribute("selectedGlobalPermissions",selectedGlobalPermissions); - model.addAttribute("roleChannelPermissions",roleChannelPermissions); - model.addAttribute("channels",channels); - return "project_pages/edit-role"; - - } - - @PostMapping("{title}/roles/{id}/edit") - public String editRole(@PathVariable(name = "title") Project project, @PathVariable(name = "id") Integer roleId,@RequestBody AddRoleDTO addRoleDTO) { - projectAccessManagementService.updateRole(roleId, mapper.map(addRoleDTO)); - - return "redirect:/projects/" + project.getId() + "/roles"; - } - - //projects/Project 1 Thread/roles/Admin/delete - @PostMapping("{project_title}/roles/{id}/delete") - public String deleteRole( - @PathVariable(name = "project_title") Project project, - @PathVariable(name = "id") Integer id - ){ - - ProjectRole role = projectRoleRepository.findById(id).orElseThrow(() -> new IllegalArgumentException("bad project id or role name")); - projectAccessManagementService.deleteRole(role); - return String.format("redirect:/projects/%s/roles", project.getTitle()); - } - - - @GetMapping("{title}/topics/add") - public String getAddTopicPage( - @PathVariable String title, - Model model - ) { - model.addAttribute("project_title", - title); - return "create-topic"; - } - - @GetMapping("/{pr-title}/edit") - public String getModifyPage( - @PathVariable(name = "pr-title") Project project, - Model model - ) { - model.addAttribute("project", - project); - return "project_pages/project-create"; - } - - @GetMapping("/{pr-title}/members") - public String getProjectMembersPage( - Model model, - @PathVariable(name = "pr-title") Project project - ) { - model.addAttribute("project", - project); - - List developers = projectService.getAllDevelopersForProject(project); - - List devWrapper = developers - .stream() - .map(dev -> new DeveloperWithRolesForProjectDTO(dev,projectAccessManagementService.getRolesForDeveloperInProject(dev,project))).toList(); - - System.out.println("MAPPED" + " " + devWrapper); - - model.addAttribute("developers", devWrapper); - model.addAttribute("projectRoles",projectAccessManagementService.getRolesForMembersInProject(project)); - - - return "project_pages/members"; - } - - @PreAuthorize("#project.getUser().equals(#user)") - @PostMapping("/{pr-title}/members/{mem-id}/kick") - public String kickMember(@PathVariable(name = "pr-title") @P("project") Project project, @PathVariable(name = "mem-id") int memberId, @SessionAttribute @P("user") BBUser user) { - projectService.kickMember(project, - memberId); - return "redirect:/projects/" + project.getTitle() + "/members"; - } - - @PreAuthorize("#project.getUser().getUsername().equals(#username)") - @PostMapping("/{title}/edit") - public String modifyProject( - @PathVariable(name = "title") @P("project") Project project, - @RequestParam(name = "title") String newTitle, - @RequestParam(name = "repo_url") String repoUrl, - @RequestParam @P("username") String username, - @RequestParam String description, - RedirectAttributes attributes - ) { - String oldTitle = project.getTitle(); - try { - return "redirect:/projects/" + projectService - .update(project, - repoUrl, - description, - newTitle) - .getTitle(); - } catch (org.springframework.dao.DataIntegrityViolationException e) { - if (e - .getMessage() - .contains(DUPLICATED_TITLE_MSG)) { - attributes.addAttribute("duplicateTitle", - "y"); - return "redirect:/projects/" + oldTitle; - } - throw e; - } - } - - @PostMapping("/add") - public String createProject( - @RequestParam String title, - @RequestParam(required = false, name = "repo_url") String repoUrl, - @RequestParam(required = false) String description, - @SessionAttribute BBUser user, - RedirectAttributes redirectAttributes - ) { - try { - projectService.create(title, - repoUrl, - description, - user); - return "redirect:/"; - } catch (org.springframework.dao.DataIntegrityViolationException e) { - if (e - .getMessage() - .contains(DUPLICATED_TITLE_MSG)) { - redirectAttributes.addAttribute("duplicateTitle", - "y"); - return "redirect:/projects/create"; - } - throw e; - } - } - - @PostMapping("{title}/add-role/{userId}") - public String assignRolesToUser(@PathVariable(name = "title") @P("project") Project project, @PathVariable Integer userId,@RequestParam(name = "roles") List roleNames){ - BBUser user = userDetailsService.loadUserById(userId); - List roles = projectRoleRepository.findAllByNameInAndProject(roleNames,project); - projectAccessManagementService.addRolesToUser(user,roles); - return "redirect:/projects/" + project.getTitle() + "/members"; - } - @PostMapping("{title}/remove-role/{userId}") - public String deleteRoleForUser(@PathVariable(name = "title") @P("project") Project project, @PathVariable Integer userId,String roleName){ - BBUser user = userDetailsService.loadUserById(userId); - projectAccessManagementService.deleteRoleForUser(user,project,roleName); - return "redirect:/projects/" + project.getTitle() + "/members"; - } - - - - @PreAuthorize("#project.getUser().getUsername().equals(#username)") - @PostMapping("/topics/add") - public String addTopic( - @RequestParam(name = "project_title") @P("project") Project project, - @RequestParam(name = "title") String topicsTitle, - @RequestParam String description, - @RequestParam @P("username") String username, - @SessionAttribute("user") BBUser user - ) { - projectService.createTopic(project, - topicsTitle, - description, - user); - return "redirect:/projects/" + project.getTitle(); - } - - @PreAuthorize("#project.getUser().username.equals(#username)") - @PostMapping("/{title}/delete") - public String delete( - @PathVariable(name = "title") @P("project") Project project, - @RequestParam @P("username") String username - ) { - projectService.delete(project); - return "redirect:/"; - } - - -} Index: c/main/java/com/db/finki/www/build_board/controller/thread_controller/TagController.java =================================================================== --- src/main/java/com/db/finki/www/build_board/controller/thread_controller/TagController.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,78 +1,0 @@ -package com.db.finki.www.build_board.controller.thread_controller; - -import com.db.finki.www.build_board.entity.thread.Project; -import com.db.finki.www.build_board.entity.thread.Topic; -import com.db.finki.www.build_board.entity.user_type.BBUser; -import com.db.finki.www.build_board.service.thread.impl.ProjectService; -import com.db.finki.www.build_board.service.thread.itf.TagService; -import com.db.finki.www.build_board.service.thread.itf.TopicService; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.security.core.parameters.P; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.SessionAttribute; - - -@Controller -public class TagController { - private final TopicService topicService; - private final TagService tagService; - private final ProjectService projectService; - - public TagController(TopicService topicService, TagService tagService, ProjectService projectService) { - this.topicService = topicService; - this.tagService = tagService; - this.projectService = projectService; - } - - @PreAuthorize("@topicServiceImpl.getById(#id).getUser().getUsername().equals(#username)") - @PostMapping("/topics/{id}/tags/add") - public String addTagToTopic( - @PathVariable(name = "id") @P("id") long id, - @RequestParam String tagName, - @P("username") String username, - Model model, - @SessionAttribute("user") BBUser user - ) { - Topic t = topicService.getById(id); - topicService.addTagToTopic(t, tagName,user); - model.addAttribute("topic", t); - model.addAttribute("tags", tagService.getAllNotUsed(t)); - return "redirect:/topics/" + t.getId(); - } - - @PreAuthorize("@topicServiceImpl.getById(#topicId).getUser().getUsername()==#username") - @PostMapping("/topics/{topicId}/tags/{tag-name}/delete") - public String deleteTagTopic(@PathVariable @P("topicId") long topicId, @PathVariable(name = "tag-name") String tagName, Model model, @RequestParam @P("username") String username) { - Topic t = topicService.deleteTagFromTopic(topicId, tagName); - model.addAttribute("topic", t); - model.addAttribute("tags", tagService.getAllNotUsed(t)); - return "redirect:/topics/" + t.getId(); - } - - @PreAuthorize("#project.getUser().getUsername()==#username") - @PostMapping("/projects/{title}/tags/add") - public String addTagToProject( - @PathVariable(name = "title") @P("project") Project project, - @RequestParam(name = "tagName") String tagName, - @RequestParam @P("username") String username, - @SessionAttribute("user") BBUser user - ) { - projectService.addTag(project, tagName,user); - return "redirect:/projects/" + project.getTitle(); - } - - @PreAuthorize("#project.getUser().getUsername().equals(#username)") - @PostMapping("/projects/{projectTitle}/tags/{tagName}/delete") - public String deleteTagProject( - @PathVariable(name = "projectTitle") @P("project") Project project, - @PathVariable String tagName, - @RequestParam @P("username") String username - ) { - projectService.deleteTag(project, tagName); - return "redirect:/projects/" + project.getTitle(); - } -} Index: c/main/java/com/db/finki/www/build_board/controller/thread_controller/TopicController.java =================================================================== --- src/main/java/com/db/finki/www/build_board/controller/thread_controller/TopicController.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,203 +1,0 @@ -package com.db.finki.www.build_board.controller.thread_controller; - -import com.db.finki.www.build_board.entity.blacklisted_user.BlacklistedUser; -import com.db.finki.www.build_board.entity.entity_enum.Status; -import com.db.finki.www.build_board.entity.user_type.BBUser; -import com.db.finki.www.build_board.entity.thread.Topic; -import com.db.finki.www.build_board.service.BlacklistedUserService; -import com.db.finki.www.build_board.service.BlacklistedUserType; -import com.db.finki.www.build_board.service.ReportService; -import com.db.finki.www.build_board.service.thread.impl.DiscussionService; -import com.db.finki.www.build_board.service.thread.itf.TagService; -import com.db.finki.www.build_board.service.thread.itf.TopicService; -import jakarta.servlet.http.HttpSession; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.security.core.parameters.P; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.mvc.support.RedirectAttributes; -import org.springframework.web.servlet.view.RedirectView; - -import java.util.List; -import java.util.Map; - -@Controller -@RequestMapping("/topics") -public class TopicController { - - private final TopicService topicService; - private final TagService tagService; - private final DiscussionService discussionService; - private final String DUPLICATE_TITTLE = "There already exists a topic with title"; - private final ReportService reportService; - private final BlacklistedUserService blacklistedUserService; - - public TopicController(TopicService topicService, TagService tagService, DiscussionService discussionService, ReportService reportService, BlacklistedUserService blacklistedUserService) { - this.topicService = topicService; - this.tagService = tagService; - this.discussionService = discussionService; - this.reportService = reportService; - this.blacklistedUserService = blacklistedUserService; - } - - private String bootstartTopic(long topicId, Model model){ - Topic t = topicService.getById((long)topicId); - - model.addAttribute("topic", t); - model.addAttribute("tags", tagService.getAllNotUsed(t)); - model.addAttribute("replies", discussionService.getByTopic(t.getId())); - - return "show-topic"; - } - - @GetMapping("/create") - public String getCreateTopicPage(Model model, @RequestParam(required = false) Boolean duplicateTittle) { - if (duplicateTittle != null) - model.addAttribute("errMsg", "There already exists a thread with the same title in that parent"); - return "create-topic"; - } - - @GetMapping("/{topic-id}") - public String showTopic(@PathVariable(name = "topic-id") int topicId, Model model, - @RequestParam(required = false) Boolean duplicateTittle, - @SessionAttribute(required = false) BBUser user) { - - if (duplicateTittle != null) { - model.addAttribute("errMsg", "There already exists a thread with the same title in that parent"); - } - - if(user != null && blacklistedUserService.isBlacklisted(user.getId(), topicId)) { - return "blacklisted"; - } - - model.addAttribute("blacklisted", blacklistedUserService.findForTopic(topicId)); - return bootstartTopic(topicId, model); - } - - @PostMapping("/add") - public String createTopic(@RequestParam String title, @RequestParam String description, HttpSession session, - RedirectAttributes reddAttributes) { - try { - title = title.strip(); - BBUser user = (BBUser) session.getAttribute("user"); - topicService.create(title, description, user); - return "redirect:/"; - } catch (org.springframework.orm.jpa.JpaSystemException e) { - return handleDuplicatedTitle(e, reddAttributes, "/topics/create"); - } - } - - @PreAuthorize("@topicServiceImpl.getById(#id).getUser().getUsername().equals(#username)") - @PostMapping("/{id}/delete") - public String deleteTopic(@PathVariable(name = "id") @P("id") long id, HttpSession session, - @RequestParam @P("username") String username) { - topicService.deleteTopicById(id); - return "redirect:/"; - } - - @PreAuthorize("@topicServiceImpl.getById(#id).getUser().getUsername().equals(#username)") - @PostMapping("/{id}/edit") - public String editTopic(@PathVariable @P("id") long id, @RequestParam String title, @RequestParam String content, - Model model, @RequestParam @P("username") String username, RedirectAttributes redirectAttributes) { - Topic t = topicService.getById(id); - String oldTitle = t.getTitle(); - try { - title = title.strip(); - topicService.edit(t, title, content); - model.addAttribute("topic", t); - model.addAttribute("tags", tagService.getAllNotUsed(t)); - return "redirect:/topics/" + t.getId(); - } catch (org.springframework.orm.jpa.JpaSystemException e) { - return handleDuplicatedTitle(e, redirectAttributes, "/topics/" + oldTitle); - } - } - - @PostMapping("{id}/report") - public String reportUser( - @PathVariable(name = "id") @P("topicId") long topicId, - @RequestParam String reason - , @SessionAttribute @P("user") BBUser user, - @RequestParam(name = "report-username") String reportingUser){ - - reportService.createReport(topicId,reason,user, reportingUser); - return "redirect:/topics/" + topicId; - } - - public String handleDuplicatedTitle(org.springframework.orm.jpa.JpaSystemException e, - RedirectAttributes attr, String redirectPath) { - if (e.getMessage().contains(DUPLICATE_TITTLE)) { - attr.addAttribute("duplicateTittle", true); - return "redirect:" + redirectPath; - } - throw e; - } - - @GetMapping("{id}/reports") - @PreAuthorize("@topicServiceImpl.getById(#topicId).user.id.equals(#user.id)") - public String getReports(@PathVariable(name = "id") @P("topicId") long topicId, Model model, - @RequestParam(required = false) Status status, - @RequestParam(required = false, name = "checkSearchLatest") String isSearForLatestActive, - @SessionAttribute @P("user") BBUser user - ){ - Topic t = topicService.getById(topicId); - - model.addAttribute("topic", t); - model.addAttribute("reports", reportService.getByStatusAndProjectAndLatest(status, - (int) topicId, isSearForLatestActive)); - - model.addAttribute("status", Status.values()); - model.addAttribute("isSearForLatestActive", isSearForLatestActive); - - return "show-reports"; - } - - @PostMapping("{id}/reports/{req-id}/accept") - @PreAuthorize("@topicServiceImpl.getById(#topicId).user.id.equals(#user.id)") - public RedirectView acceptRequest( - @PathVariable(name = "req-id") Integer reqId, - @PathVariable(name = "id") @P("topicId") long topicId, - @RequestParam(name = "feedback-desc") String feedbackDesc, - @SessionAttribute @P("user") BBUser user - ) { - reportService.accept(reqId, feedbackDesc, user); - return new RedirectView( - String.format("/topics/%s/reports", topicId) - ); - } - - @PostMapping("{id}/reports/{req-id}/deny") - @PreAuthorize("@topicServiceImpl.getById(#topicId).user.id.equals(#user.id)") - public RedirectView denyRequest( - @PathVariable(name = "req-id") Integer reqId, - @PathVariable(name = "id") @P("topicId") long topicId, - @RequestParam(name = "feedback-desc") String feedbackDesc, - @SessionAttribute @P("user") BBUser user - ) { - reportService.deny(reqId, feedbackDesc, user); - return new RedirectView( - String.format("/topics/%s/reports", topicId) - ); - } - - @GetMapping("{id}/blacklisted") - public String getBlacklistedUsers(@PathVariable(name = "id") long topicId, Model model){ - Map> tmp = topicService.getBlacklistedUsersForTopicById(topicId); - - model.addAttribute("current", tmp.get(BlacklistedUserType.CURRENT)); - model.addAttribute("previous", tmp.get(BlacklistedUserType.PREVIOUS)); - - return "show-blacklisted-users"; - } - - @PostMapping("{id}/blacklisted/{userId}") - public RedirectView revokeBlacklistedUser( - @PathVariable(name = "id") long topicId, - @PathVariable(name = "userId") int blacklistedUserId - ){ - blacklistedUserService.revoke(topicId,blacklistedUserId); - return new RedirectView( - String.format("/topics/%s/blacklisted", topicId) - ); - } -} Index: c/main/java/com/db/finki/www/build_board/controller/thread_controller/request/ProjectRequestController.java =================================================================== --- src/main/java/com/db/finki/www/build_board/controller/thread_controller/request/ProjectRequestController.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,73 +1,0 @@ -package com.db.finki.www.build_board.controller.thread_controller.request; - -import com.db.finki.www.build_board.entity.entity_enum.Status; -import com.db.finki.www.build_board.entity.thread.Project; -import com.db.finki.www.build_board.entity.user_type.BBUser; -import com.db.finki.www.build_board.service.request.ProjectRequestService; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.security.core.parameters.P; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.view.RedirectView; - - -@Controller -@RequestMapping("/projects/{pr-title}/requests") -public class ProjectRequestController { - - private final ProjectRequestService projectRequestService; - - public ProjectRequestController(ProjectRequestService projectService) { - this.projectRequestService = projectService; - } - - @GetMapping("") - public String getRequestPage( - Model model, - @PathVariable(name = "pr-title") Project project, - @RequestParam(required = false) Status status, - @RequestParam(required = false, name = "checkSearchLatest") String isSearForLatestActive - ) { - model.addAttribute("project", project); - model.addAttribute("requests", projectRequestService.getByStatusAndProjectAndLatest(status,project,isSearForLatestActive)); - model.addAttribute("status", Status.values()); - model.addAttribute("isSearForLatestActive", isSearForLatestActive); - return "project_pages/requests/show-requests"; - } - - @PostMapping("/{req-id}/accept") - @PreAuthorize("#project.getUser().getId()==#user.getId()") - public RedirectView acceptRequest(@PathVariable(name = "req-id") Integer reqId, - @PathVariable(name = "pr-title") @P("project") Project project, - @SessionAttribute @P("user") BBUser user - ) { - projectRequestService.accept(user,reqId); - return new RedirectView( - String.format("/projects/%s/requests", project.getTitle()) - ); - } - - @PostMapping("/{req-id}/deny") - @PreAuthorize("#project.getUser().getId()==#user.getId()") - public RedirectView denyRequest(@PathVariable(name = "req-id") Integer reqId, - @PathVariable(name = "pr-title") @P("project") Project project, - @RequestParam(name = "feedback-desc") String feedbackDesc, - @SessionAttribute @P("user") BBUser user - ) { - projectRequestService.deny(reqId, feedbackDesc, user); - return new RedirectView( - String.format("/projects/%s/requests", project.getTitle()) - ); - } - - @PostMapping("/create") - public RedirectView createRequestToJoin( - @PathVariable(name = "pr-title") Project project, - @RequestParam(name = "reason-desc") String reason, - @SessionAttribute BBUser user - ){ - projectRequestService.createRequestFor(project,reason,user); - return new RedirectView("/projects/"+project.getTitle()); - } -} Index: c/main/java/com/db/finki/www/build_board/controller/util/LikesController.java =================================================================== --- src/main/java/com/db/finki/www/build_board/controller/util/LikesController.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,50 +1,0 @@ -package com.db.finki.www.build_board.controller.util; - -import com.db.finki.www.build_board.entity.thread.BBThread; -import com.db.finki.www.build_board.entity.thread.Project; -import com.db.finki.www.build_board.entity.thread.Topic; -import com.db.finki.www.build_board.entity.thread.discussion_thread.Discussion; -import com.db.finki.www.build_board.entity.user_type.BBUser; -import com.db.finki.www.build_board.service.util.ThreadService; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.SessionAttribute; - - -@Controller -public class LikesController { - private final ThreadService threadService; - - public LikesController(ThreadService threadService) { - this.threadService = threadService; - } - - private BBThread rate(int threadId, BBUser user, boolean likes) { - return threadService.rate(threadId, user.getId(), likes); - } - - private String getUrlForThraed(BBThread thread, Integer id) { - if (id != null) - return "redirect:/topics/" + id; - - return "redirect:/projects/" + ((Project) thread).getTitle(); - } - - @PostMapping("/threads/{thread-id}/dislike") - public String dislikeThread(@SessionAttribute BBUser user, - @PathVariable(name = "thread-id") int threadId, - @RequestParam(required = false, name = "topic-id") Integer topicId - ) { - return getUrlForThraed(rate(threadId, user, false), topicId); - } - - @PostMapping("/threads/{thread-id}/like") - public String likeThread(@SessionAttribute BBUser user, - @RequestParam(required = false, name = "topic-id") Integer topicId, - @PathVariable(name = "thread-id") int threadId) { - return getUrlForThraed(rate(threadId, user, true), topicId); - } - -} Index: c/main/java/com/db/finki/www/build_board/converter/ProjectConverter.java =================================================================== --- src/main/java/com/db/finki/www/build_board/converter/ProjectConverter.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,30 +1,0 @@ -package com.db.finki.www.build_board.converter; - -import com.db.finki.www.build_board.entity.thread.Project; -import com.db.finki.www.build_board.service.thread.impl.ProjectService; -import lombok.NonNull; -import org.springframework.core.convert.converter.Converter; -import org.springframework.stereotype.Component; - -@Component -public class ProjectConverter implements Converter { - - private final ProjectService projectService; - private final String REGEX_TO_CHECK_IF_ITS_A_NUMBER="^[0-9]+$"; - - public ProjectConverter(ProjectService projectService) { - this.projectService = projectService; - } - - @Override - public Project convert(@NonNull String something) { - if(something.matches(REGEX_TO_CHECK_IF_ITS_A_NUMBER)) { - Long id = Long.parseLong(something); - return projectService.getById(id); - }else{ - String title = something; - return projectService.getByTitle(title); - } - } - -} Index: c/main/java/com/db/finki/www/build_board/dto/AddRoleDTO.java =================================================================== --- src/main/java/com/db/finki/www/build_board/dto/AddRoleDTO.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,28 +1,0 @@ -package com.db.finki.www.build_board.dto; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.*; - -import java.util.List; - -@Getter -@Setter -@AllArgsConstructor -@NoArgsConstructor -@JsonIgnoreProperties(ignoreUnknown = true) -public class AddRoleDTO { - @JsonProperty - String name; - @JsonProperty - String projectTitle; - - @JsonProperty - List globalPermissions; - - @JsonProperty - List permissionResourceDTOS; - - @JsonProperty - String permissionOverrideType; -} Index: c/main/java/com/db/finki/www/build_board/dto/DeveloperWithRolesForProjectDTO.java =================================================================== --- src/main/java/com/db/finki/www/build_board/dto/DeveloperWithRolesForProjectDTO.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,17 +1,0 @@ -package com.db.finki.www.build_board.dto; - -import com.db.finki.www.build_board.entity.access_managment.ProjectRole; -import com.db.finki.www.build_board.entity.user_type.BBUser; -import lombok.*; - -import java.util.List; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@ToString -public class DeveloperWithRolesForProjectDTO { - private BBUser user; - private List roles; -} Index: c/main/java/com/db/finki/www/build_board/dto/MembersPerRoleWrapper.java =================================================================== --- src/main/java/com/db/finki/www/build_board/dto/MembersPerRoleWrapper.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,13 +1,0 @@ -package com.db.finki.www.build_board.dto; - -import com.db.finki.www.build_board.entity.access_managment.ProjectRole; -import com.db.finki.www.build_board.entity.user_type.BBUser; -import lombok.Data; - -import java.util.List; - -@Data -public class MembersPerRoleWrapper { - private ProjectRole projectRole; - List users; -} Index: c/main/java/com/db/finki/www/build_board/dto/MessageDTO.java =================================================================== --- src/main/java/com/db/finki/www/build_board/dto/MessageDTO.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,21 +1,0 @@ -package com.db.finki.www.build_board.dto; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.time.LocalDateTime; - -@NoArgsConstructor -@AllArgsConstructor -@Getter -@Setter -public class MessageDTO { - private String channelName; - private String content; - private String senderUsername; - private LocalDateTime sentAt; - private Integer projectId; - private String avatarUrl; -} Index: c/main/java/com/db/finki/www/build_board/dto/PermissionResourceDTO.java =================================================================== --- src/main/java/com/db/finki/www/build_board/dto/PermissionResourceDTO.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,17 +1,0 @@ -package com.db.finki.www.build_board.dto; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.util.UUID; - -@AllArgsConstructor -@NoArgsConstructor -@Getter -@Setter -public class PermissionResourceDTO { - String permissionName; - UUID channelId; -} Index: c/main/java/com/db/finki/www/build_board/dto/PermissionResourceWrapper.java =================================================================== --- src/main/java/com/db/finki/www/build_board/dto/PermissionResourceWrapper.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,19 +1,0 @@ -package com.db.finki.www.build_board.dto; - -import com.db.finki.www.build_board.entity.access_managment.Permission; -import com.db.finki.www.build_board.entity.channel.Channel; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -@Getter -@Setter -@AllArgsConstructor -@NoArgsConstructor -public class PermissionResourceWrapper { - Permission permission; - Channel channel; -} - - Index: c/main/java/com/db/finki/www/build_board/entity/access_managment/Permission.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/access_managment/Permission.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,42 +1,0 @@ -package com.db.finki.www.build_board.entity.access_managment; - -import jakarta.persistence.Entity; -import jakarta.persistence.Id; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.Table; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.util.Objects; - -@Table(name = "permissions") -@Entity -@Getter -@Setter -@NoArgsConstructor -public class Permission { - @Id - String name; - - public static final String READ = "READ"; - public static final String WRITE = "WRITE"; - public static final String DELETE = "DELETE"; - public static final String CREATE = "CREATE"; - - public Permission(String name){ - this.name = name; - } - - @Override - public boolean equals(Object o) { - if (o == null || getClass() != o.getClass()) return false; - Permission that = (Permission) o; - return Objects.equals(name, that.name); - } - - @Override - public int hashCode() { - return Objects.hashCode(name); - } -} Index: c/main/java/com/db/finki/www/build_board/entity/access_managment/ProjectRole.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/access_managment/ProjectRole.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,59 +1,0 @@ -package com.db.finki.www.build_board.entity.access_managment; - -import com.db.finki.www.build_board.common.enums.ProjectResourcePermissionOverrideType; -import com.db.finki.www.build_board.entity.thread.Project; -import jakarta.persistence.*; -import lombok.*; - -import java.util.Objects; - -@Table(name = "project_role") -@Entity -@Getter -@Setter -@AllArgsConstructor -@NoArgsConstructor -@ToString -public class ProjectRole { - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE,generator = "project_role_id_gen") - @SequenceGenerator(name = "project_role_id_gen",sequenceName = "project_role_id_seq",allocationSize=1) - private Integer id; - - String name; - - @ManyToOne - @JoinColumn(name = "valid_in",referencedColumnName = "id") - Project project; - - @Column(name = "override_type",nullable = false) - private String overrideType = "EXCLUDE"; - - public ProjectRole(Project project, String name) { - this.project = project; - this.name = name; - } - public ProjectRole(Project project, String name, String overrideType) { - this.project = project; - this.name = name; - this.overrideType = overrideType; - } - - public ProjectResourcePermissionOverrideType getOverrideType() { - return overrideType.equals(ProjectResourcePermissionOverrideType.INCLUDE.name()) ? - ProjectResourcePermissionOverrideType.INCLUDE - : ProjectResourcePermissionOverrideType.EXCLUDE; - } - - @Override - public boolean equals(Object o) { - if (o == null || getClass() != o.getClass()) return false; - ProjectRole that = (ProjectRole) o; - return Objects.equals(name, that.name) && Objects.equals(project, that.project); - } - - @Override - public int hashCode() { - return Objects.hash(name, project); - } -} Index: c/main/java/com/db/finki/www/build_board/entity/access_managment/ProjectRolePermission.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/access_managment/ProjectRolePermission.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,33 +1,0 @@ -package com.db.finki.www.build_board.entity.access_managment; - -import com.db.finki.www.build_board.entity.compositeId.ProjectRolePermissionId; -import jakarta.persistence.EmbeddedId; -import jakarta.persistence.Entity; -import jakarta.persistence.Table; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -@Table(name = "role_permissions") -@Entity -@NoArgsConstructor -@Getter -@Setter -public class ProjectRolePermission { - @EmbeddedId - private ProjectRolePermissionId id; - - public ProjectRolePermission(ProjectRolePermissionId projectRolePermissionId) { - this.id = projectRolePermissionId; - } - - public Permission getPermission() { - return id.getPermission(); - } - - public ProjectRole getProjectRole() { - return id.getRole(); - } - - -} Index: c/main/java/com/db/finki/www/build_board/entity/access_managment/ProjectRolePermissionResourceOverride.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/access_managment/ProjectRolePermissionResourceOverride.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,27 +1,0 @@ -package com.db.finki.www.build_board.entity.access_managment; - -import com.db.finki.www.build_board.entity.compositeId.ProjectRolePermissionResourceOverrideId; -import jakarta.persistence.EmbeddedId; -import jakarta.persistence.Entity; -import jakarta.persistence.Table; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -@Entity -@Table(name = "role_permissions_overrides") -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -public class ProjectRolePermissionResourceOverride { - - @EmbeddedId - private ProjectRolePermissionResourceOverrideId id; - - - public ProjectRolePermission getProjectRolePermission() { - return id.getProjectRolePermission(); - } -} Index: c/main/java/com/db/finki/www/build_board/entity/access_managment/UsersProjectRoles.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/access_managment/UsersProjectRoles.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,30 +1,0 @@ -package com.db.finki.www.build_board.entity.access_managment; - -import com.db.finki.www.build_board.entity.compositeId.UsersProjectRolesId; -import com.db.finki.www.build_board.entity.user_type.BBUser; -import jakarta.persistence.EmbeddedId; -import jakarta.persistence.Entity; -import jakarta.persistence.Table; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -@Entity -@Table(name = "project_role_is_assigned_to_developer") -@AllArgsConstructor -@NoArgsConstructor -@Getter -@Setter -public class UsersProjectRoles { - @EmbeddedId - UsersProjectRolesId id; - - public ProjectRole getProjectRole() { - return id.getRole(); - } - public BBUser getUser() { - return id.getUser(); - } - -} Index: c/main/java/com/db/finki/www/build_board/entity/blacklisted_user/BlacklistedUser.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/blacklisted_user/BlacklistedUser.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,57 +1,0 @@ -package com.db.finki.www.build_board.entity.blacklisted_user; - -import com.db.finki.www.build_board.entity.thread.Topic; -import com.db.finki.www.build_board.entity.user_type.BBUser; -import com.db.finki.www.build_board.entity.user_type.Moderator; -import jakarta.persistence.*; -import lombok.Getter; -import lombok.Setter; - -import java.time.LocalDateTime; - -@Entity -@Getter -@Setter -public class BlacklistedUser { - - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE,generator = "blacklisted_user_id_gen") - @SequenceGenerator(name = "blacklisted_user_id_gen",sequenceName = "blacklisted_user_id_seq",allocationSize=1) - private Integer id; - - @ManyToOne - @JoinColumn(name = "blacklisted_from") - Topic topic; - - @ManyToOne - @JoinColumn(name = "blacklisted_by") - Moderator moderator; - - @Column(name = "start_date") - LocalDateTime startTime; - - @ManyToOne - @JoinColumn(name = "refers_to") - BBUser refersTo; - - String reason; - - @Column(name = "end_date") - LocalDateTime endTime; - - public BlacklistedUser( - Topic topic, - Moderator moderator, - LocalDateTime startTime, - BBUser refersTo, - String reason - ) { - setTopic(topic); - setModerator(moderator); - setStartTime(startTime); - setRefersTo(refersTo); - setReason(reason); - } - - public BlacklistedUser(){} -} Index: c/main/java/com/db/finki/www/build_board/entity/blacklisted_user/BlacklistedUserId.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/blacklisted_user/BlacklistedUserId.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,14 +1,0 @@ -package com.db.finki.www.build_board.entity.blacklisted_user; - -import com.db.finki.www.build_board.entity.thread.Topic; -import com.db.finki.www.build_board.entity.user_type.BBUser; -import com.db.finki.www.build_board.entity.user_type.Moderator; - -import java.time.LocalDateTime; - -public class BlacklistedUserId { - Topic topic; - Moderator moderator; - LocalDateTime startTime; - BBUser refersTo; -} Index: c/main/java/com/db/finki/www/build_board/entity/channel/Channel.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/channel/Channel.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,42 +1,0 @@ -package com.db.finki.www.build_board.entity.channel; - -import com.db.finki.www.build_board.entity.thread.Project; -import com.db.finki.www.build_board.entity.user_type.Developer; -import jakarta.persistence.*; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.util.UUID; - -@Table(name = "channel") -@Entity -@Getter -@Setter -@NoArgsConstructor -public class Channel { - - @Id - @GeneratedValue - private UUID id; - - private String name; - - @ManyToOne - @JoinColumn(name = "project_has",referencedColumnName = "id",nullable = false) - private Project project; - - private String description; - - @ManyToOne - @JoinColumn(name = "constructed_by",referencedColumnName = "id",nullable = false) - private Developer developer; - - - public Channel(String name, Project project, String description, Developer developer) { - this.name = name; - this.project = project; - this.description = description; - this.developer = developer; - } -} Index: c/main/java/com/db/finki/www/build_board/entity/channel/Message.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/channel/Message.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,38 +1,0 @@ -package com.db.finki.www.build_board.entity.channel; - -import com.db.finki.www.build_board.entity.compositeId.MessageId; -import com.db.finki.www.build_board.entity.thread.Project; -import com.db.finki.www.build_board.entity.user_type.Developer; -import jakarta.persistence.*; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.time.LocalDateTime; - -@Table(name = "messages") -@Entity -@Getter -@Setter -@NoArgsConstructor -@IdClass(MessageId.class) -@AllArgsConstructor -public class Message { - - @Id - @ManyToOne - @JoinColumn(name = "sent_in",referencedColumnName = "id") - private Channel channel; - - @Id - @ManyToOne - @JoinColumn(name = "sent_by",referencedColumnName = "id",nullable = false) - private Developer sentBy; - - @Id - @Column(name = "sent_at") - private LocalDateTime sentAt; - - private String content; -} Index: c/main/java/com/db/finki/www/build_board/entity/compositeId/DeveloperAssociatedWithProjectId.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/compositeId/DeveloperAssociatedWithProjectId.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,16 +1,0 @@ -package com.db.finki.www.build_board.entity.compositeId; - -import com.db.finki.www.build_board.entity.thread.Project; -import com.db.finki.www.build_board.entity.user_type.BBUser; -import lombok.Getter; -import lombok.Setter; - -import java.time.LocalDateTime; - -@Getter -@Setter -public class DeveloperAssociatedWithProjectId { - private BBUser developer; - private Project project; - private LocalDateTime startedAt; -} Index: c/main/java/com/db/finki/www/build_board/entity/compositeId/MessageId.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/compositeId/MessageId.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,28 +1,0 @@ -package com.db.finki.www.build_board.entity.compositeId; - -import lombok.Getter; -import lombok.Setter; - -import java.time.LocalDateTime; -import java.util.Objects; -import java.util.UUID; - -@Getter -@Setter -public class MessageId { - private UUID channel; - private int sentBy; - private LocalDateTime sentAt; - - @Override - public boolean equals(Object o) { - if (o == null || getClass() != o.getClass()) return false; - MessageId messageId = (MessageId) o; - return sentBy == messageId.sentBy && Objects.equals(channel, messageId.channel) && Objects.equals(sentAt, messageId.sentAt); - } - - @Override - public int hashCode() { - return Objects.hash(channel, sentBy, sentAt); - } -} Index: c/main/java/com/db/finki/www/build_board/entity/compositeId/ProjectRolePermissionId.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/compositeId/ProjectRolePermissionId.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,45 +1,0 @@ -package com.db.finki.www.build_board.entity.compositeId; - - -import com.db.finki.www.build_board.entity.access_managment.Permission; -import com.db.finki.www.build_board.entity.access_managment.ProjectRole; -import jakarta.persistence.Embeddable; -import jakarta.persistence.ManyToOne; - -import jakarta.persistence.*; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.util.Objects; - -@Embeddable -@Getter -@AllArgsConstructor -@NoArgsConstructor -public class ProjectRolePermissionId implements Serializable { - - @ManyToOne - @JoinColumn(name = "for_permission", referencedColumnName = "name") - private Permission permission; - - @ManyToOne - @JoinColumn(name = "for_role", referencedColumnName = "id") - private ProjectRole role; - - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof ProjectRolePermissionId that)) return false; - return Objects.equals(permission, that.permission) && - Objects.equals(role, that.role); - } - - @Override - public int hashCode() { - return Objects.hash(permission, role); - } -} - Index: c/main/java/com/db/finki/www/build_board/entity/compositeId/ProjectRolePermissionResourceOverrideId.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/compositeId/ProjectRolePermissionResourceOverrideId.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,41 +1,0 @@ -package com.db.finki.www.build_board.entity.compositeId; - -import com.db.finki.www.build_board.entity.access_managment.ProjectRolePermission; -import com.db.finki.www.build_board.entity.channel.Channel; -import jakarta.persistence.*; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.util.Objects; - -@Embeddable -@Getter -@Setter -@AllArgsConstructor -@NoArgsConstructor -public class ProjectRolePermissionResourceOverrideId { - @ManyToOne(optional = false) - @JoinColumns({ - @JoinColumn(name = "for_role_permission_role_id",referencedColumnName = "for_role"), - @JoinColumn(name = "for_role_permission_permission_name",referencedColumnName = "for_permission") - }) - private ProjectRolePermission projectRolePermission; - - @ManyToOne(optional = false) - @JoinColumn(name = "for_resource",referencedColumnName = "id") - private Channel channel; - - @Override - public boolean equals(Object o) { - if (o == null || getClass() != o.getClass()) return false; - ProjectRolePermissionResourceOverrideId that = (ProjectRolePermissionResourceOverrideId) o; - return Objects.equals(projectRolePermission, that.projectRolePermission) && Objects.equals(channel, that.channel); - } - - @Override - public int hashCode() { - return Objects.hash(projectRolePermission, channel); - } -} Index: c/main/java/com/db/finki/www/build_board/entity/compositeId/UsersProjectRolesId.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/compositeId/UsersProjectRolesId.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,27 +1,0 @@ -package com.db.finki.www.build_board.entity.compositeId; - -import com.db.finki.www.build_board.entity.access_managment.ProjectRole; -import com.db.finki.www.build_board.entity.user_type.BBUser; -import jakarta.persistence.Embeddable; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.JoinColumns; -import jakarta.persistence.ManyToOne; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -@Embeddable -@Getter -@Setter -@AllArgsConstructor -@NoArgsConstructor -public class UsersProjectRolesId { - @ManyToOne - @JoinColumn(name = "role_id", referencedColumnName = "id") - ProjectRole role; - @ManyToOne - @JoinColumn(name = "user_id", referencedColumnName = "id") - BBUser user; - -} Index: c/main/java/com/db/finki/www/build_board/entity/entity_enum/FeedbackFor.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/entity_enum/FeedbackFor.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,6 +1,0 @@ -package com.db.finki.www.build_board.entity.entity_enum; - -public enum FeedbackFor { - R, //report - P //project-request -} Index: c/main/java/com/db/finki/www/build_board/entity/entity_enum/Status.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/entity_enum/Status.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,7 +1,0 @@ -package com.db.finki.www.build_board.entity.entity_enum; - -public enum Status { - ACCEPTED, - DENIED, - PENDING -} Index: c/main/java/com/db/finki/www/build_board/entity/request/Feedback.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/request/Feedback.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,51 +1,0 @@ -package com.db.finki.www.build_board.entity.request; - -import com.db.finki.www.build_board.entity.entity_enum.FeedbackFor; -import com.db.finki.www.build_board.entity.user_type.BBUser; -import jakarta.persistence.*; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.time.LocalDateTime; - -@Entity -@Getter -@Setter -@NoArgsConstructor -public class Feedback { - @Id - @Column(name = "submission_id") - private Integer id; - - @OneToOne - @JoinColumn(name = "submitted_for") - @MapsId - private Submission forSubmission; - - private String description; - - @Enumerated(EnumType.STRING) - private FeedbackFor submissionType; - - @ManyToOne - @JoinColumn(name = "written_by") - private BBUser creator; - - private LocalDateTime createdAt; - - public Feedback(FeedbackFor submissionType, BBUser creator, String description, Submission sub) { - setDescription(description); - setSubmissionType(submissionType); - setCreator(creator); - setForSubmission(sub); - setCreatedAt(LocalDateTime.now()); - } - - public Feedback(FeedbackFor feedbackFor, BBUser creator, Submission sub) { - setSubmissionType(feedbackFor); - setCreator(creator); - setForSubmission(sub); - setCreatedAt(LocalDateTime.now()); - } -} Index: c/main/java/com/db/finki/www/build_board/entity/request/ProjectRequests.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/request/ProjectRequests.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,30 +1,0 @@ -package com.db.finki.www.build_board.entity.request; - -import com.db.finki.www.build_board.entity.entity_enum.Status; -import com.db.finki.www.build_board.entity.thread.Project; -import com.db.finki.www.build_board.entity.user_type.BBUser; -import jakarta.persistence.*; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.time.LocalDateTime; - -@Getter -@Setter -@NoArgsConstructor -@Entity -@Table(name = "project_request") -public class ProjectRequests extends Submission { - @ManyToOne - @JoinColumn(name = "project_receives") - private Project project; - - public ProjectRequests(Project project, BBUser creator, String description) { - setDescription(description); - setCreator(creator); - setProject(project); - setStatus(Status.PENDING); - setCreatedAt(LocalDateTime.now()); - } -} Index: c/main/java/com/db/finki/www/build_board/entity/request/Report.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/request/Report.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,38 +1,0 @@ -package com.db.finki.www.build_board.entity.request; - -import com.db.finki.www.build_board.entity.entity_enum.Status; -import com.db.finki.www.build_board.entity.thread.Topic; -import com.db.finki.www.build_board.entity.user_type.BBUser; -import jakarta.persistence.Entity; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.Table; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.time.LocalDateTime; - -@Entity -@Getter -@Setter -@NoArgsConstructor -@Table(name = "report") -public class Report extends Submission { - @ManyToOne - @JoinColumn(name = "about") - BBUser user; - - @ManyToOne - @JoinColumn(name = "for_misconduct_in") - Topic topic; - - public Report(Topic topic, BBUser creator, String description, BBUser misconductedUser) { - setDescription(description); - setCreator(creator); - setTopic(topic); - setStatus(Status.PENDING); - setCreatedAt(LocalDateTime.now()); - setUser(misconductedUser); - } -} Index: c/main/java/com/db/finki/www/build_board/entity/request/Submission.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/request/Submission.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,37 +1,0 @@ -package com.db.finki.www.build_board.entity.request; - -import java.time.LocalDateTime; - -import com.db.finki.www.build_board.entity.entity_enum.Status; -import com.db.finki.www.build_board.entity.user_type.BBUser; - -import jakarta.persistence.*; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -@Entity -@Table(name = "submission") -@Getter -@Setter -@NoArgsConstructor -@Inheritance(strategy = InheritanceType.JOINED) -public class Submission { - @Id - @GeneratedValue(generator = "sub_gen",strategy = GenerationType.SEQUENCE) - @SequenceGenerator(name = "sub_gen",sequenceName = "submission_id_seq",allocationSize = 1,initialValue = 0) - private Integer id; - - @OneToOne(mappedBy = "forSubmission") - private Feedback feedback; - - LocalDateTime createdAt; - String description; - - @Enumerated(EnumType.STRING) - Status status; - - @ManyToOne - @JoinColumn(name = "submitted_by") - BBUser creator; -} Index: c/main/java/com/db/finki/www/build_board/entity/thread/BBThread.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/thread/BBThread.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,50 +1,0 @@ -package com.db.finki.www.build_board.entity.thread; - -import com.db.finki.www.build_board.entity.user_type.BBUser; -import jakarta.persistence.*; -import lombok.*; - -import java.time.LocalDateTime; -import java.util.HashSet; -import java.util.Set; - -@Entity -@Getter -@Setter -@NoArgsConstructor -@Table(name = "thread") -@Inheritance(strategy = InheritanceType.JOINED) -public class BBThread { - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "thread_gen") - @SequenceGenerator(name = "thread_gen", sequenceName = "thread_id_seq", allocationSize = 1) - protected Integer id; - - protected String content; - - @ManyToOne - @JoinColumn(name="is_created_by") - protected BBUser user; - - @ManyToMany - @JoinTable( - name = "tag_assigned_to_thread", - joinColumns = @JoinColumn(name = "thread_id"), - inverseJoinColumns = @JoinColumn(name = "tag_name") - ) - protected Set tags = new HashSet<>(); - - @ManyToMany - @JoinTable( - name = "likes", - joinColumns = @JoinColumn(name = "thread_id"), - inverseJoinColumns = @JoinColumn(name = "user_id") - ) - protected Set likes = new HashSet<>(); - - private LocalDateTime createdAt = LocalDateTime.now(); - - public int getNumLikes(){ - return likes.size(); - } -} Index: c/main/java/com/db/finki/www/build_board/entity/thread/EmbeddableThread.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/thread/EmbeddableThread.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,20 +1,0 @@ -package com.db.finki.www.build_board.entity.thread; - -import jakarta.persistence.Entity; -import jakarta.persistence.Id; -import jakarta.persistence.Table; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -@Getter -@Setter -@NoArgsConstructor -@EqualsAndHashCode(callSuper = false) -@Entity -@Table(name = "embeddable_thread") -public class EmbeddableThread extends BBThread { - @Id - Integer id ; -} Index: c/main/java/com/db/finki/www/build_board/entity/thread/Project.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/thread/Project.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,55 +1,0 @@ -package com.db.finki.www.build_board.entity.thread; - -import com.db.finki.www.build_board.entity.request.ProjectRequests; -import com.db.finki.www.build_board.entity.channel.Channel; -import com.db.finki.www.build_board.entity.user_type.BBUser; -import jakarta.persistence.*; -import lombok.*; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -@Getter -@Setter -@NoArgsConstructor -@EqualsAndHashCode(callSuper = false) -@Entity -@Table(name = "project_thread") -public class Project extends BBThread { - - private String title; - - @Column(name = "repo_url") - private String repoUrl; - - public Project(String title, String repoUrl, String description, BBUser user){ - setTitle(title); - setRepoUrl(repoUrl); - setDescription(description); - setUser(user); - } - - @OneToMany(cascade = {CascadeType.PERSIST,CascadeType.MERGE}, mappedBy = "parent") - private List topics = new ArrayList<>(); - - @ManyToMany(cascade = {CascadeType.PERSIST,CascadeType.MERGE}) - @JoinTable( - name ="developer_associated_with_project", - joinColumns = @JoinColumn(name = "in_project"), - inverseJoinColumns = @JoinColumn(name = "about_dev") - ) - private Set developers = new HashSet<>(); // NE GO KORISTI GETTEROT OVDE - - @OneToMany(mappedBy = "project") - private Set requests = new HashSet<>(); - - @OneToMany(mappedBy = "project") - @OrderBy("name") - private Set channels; - - public String getDescription() {return content;} - public void setDescription(String description) {this.content = description;} - -} Index: c/main/java/com/db/finki/www/build_board/entity/thread/Tag.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/thread/Tag.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,55 +1,0 @@ -package com.db.finki.www.build_board.entity.thread; - -import com.db.finki.www.build_board.entity.user_type.BBUser; -import com.fasterxml.jackson.annotation.JsonGetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import jakarta.persistence.*; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; - -@Getter -@Setter -@NoArgsConstructor -@Entity -@Table(name = "tag") -public class Tag implements Serializable { - @Id - String name; - - @ManyToOne - @JoinColumn(name = "creator_id") - BBUser creator; - - public Tag(String name, BBUser user) { - this.name = name; - this.creator = user; - } - - @JsonIgnore - @ManyToMany(mappedBy = "tags") - private List threads = new ArrayList<>(); - - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - Tag tag = (Tag) o; - return Objects.equals(name, tag.name); - } - - @JsonGetter("creator") - public String getCreatorUsernameJackson(){ - return creator.getUsername() == null ? "" : creator.getUsername() ; - } - @Override - public int hashCode() { - return Objects.hashCode(name); - } -} Index: c/main/java/com/db/finki/www/build_board/entity/thread/Topic.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/thread/Topic.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,31 +1,0 @@ -package com.db.finki.www.build_board.entity.thread; - -import com.db.finki.www.build_board.entity.blacklisted_user.BlacklistedUser; -import com.db.finki.www.build_board.entity.thread.multi_valued_attribute.Guideline; -import com.fasterxml.jackson.annotation.JsonIgnore; -import jakarta.persistence.*; -import lombok.*; - -import java.util.List; - -@Getter -@Setter -@NoArgsConstructor -@Entity -@Table(name = "topic_thread") -public class Topic extends EmbeddableThread { - - private String title; - - @JsonIgnore - @OneToMany(mappedBy = "topic") - private List guidelines; - - @ManyToOne - @JoinColumn(name = "referenced_by") - private Project parent; - - @OneToMany(mappedBy = "topic") - private List blacklistedUsers; - -} Index: c/main/java/com/db/finki/www/build_board/entity/thread/discussion_thread/Discussion.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/thread/discussion_thread/Discussion.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,16 +1,0 @@ -package com.db.finki.www.build_board.entity.thread.discussion_thread; - -import com.db.finki.www.build_board.entity.thread.EmbeddableThread; -import jakarta.persistence.*; -import lombok.Getter; -import lombok.Setter; - -@Entity -@Table(name = "discussion_thread") -@Getter -@Setter -public class Discussion extends EmbeddableThread { - @ManyToOne - @JoinColumn(name = "contained_in") - private EmbeddableThread parent; -} Index: c/main/java/com/db/finki/www/build_board/entity/thread/discussion_thread/VDiscussion.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/thread/discussion_thread/VDiscussion.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,49 +1,0 @@ -package com.db.finki.www.build_board.entity.thread.discussion_thread; - - -import com.db.finki.www.build_board.entity.thread.Topic; -import com.db.finki.www.build_board.entity.user_type.BBUser; -import jakarta.persistence.*; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import org.hibernate.annotations.Immutable; - -import java.util.ArrayList; -import java.util.List; -import java.time.LocalDateTime; - -@Entity -@Immutable -@Table(name="v_discussion_thread") -@Getter -@Setter -@NoArgsConstructor -public class VDiscussion { - @Id - private Integer id; - - @MapsId - @OneToOne - @JoinColumn(name="id") - private Discussion discussion; - - private int depth; - - @ManyToOne - @JoinColumn(name="user_id") - private BBUser user; - - public String getAvatarUrl(){ - return user.getAvatarUrl(); - } - - @ManyToOne - @JoinColumn(name="parent_id") - private Topic parentTopic; - - private LocalDateTime createdAt; - - @Transient - private List children = new ArrayList<>(); -} Index: c/main/java/com/db/finki/www/build_board/entity/thread/multi_valued_attribute/Guideline.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/thread/multi_valued_attribute/Guideline.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,26 +1,0 @@ -package com.db.finki.www.build_board.entity.thread.multi_valued_attribute; - -import com.db.finki.www.build_board.entity.thread.Topic; -import jakarta.persistence.*; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -@Getter -@Setter -@NoArgsConstructor -@Entity -@Table(name = "topic_guidelines") -public class Guideline { - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "guideline_gen") - @SequenceGenerator(name = "guideline_gen", sequenceName = "topic_guidelines_id_seq", allocationSize = 1) - private Integer id; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "topic_id") - private Topic topic; - - private String description; - -} Index: c/main/java/com/db/finki/www/build_board/entity/user_type/BBUser.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/user_type/BBUser.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,102 +1,0 @@ -package com.db.finki.www.build_board.entity.user_type; - -import com.db.finki.www.build_board.entity.access_managment.ProjectRole; -import com.db.finki.www.build_board.entity.thread.BBThread; -import com.db.finki.www.build_board.entity.thread.Project; -import com.db.finki.www.build_board.service.util.FileUploadService; -import jakarta.persistence.*; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import lombok.ToString; -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.authority.SimpleGrantedAuthority; -import org.springframework.security.core.userdetails.UserDetails; - -import java.io.File; -import java.nio.file.Files; -import java.nio.file.Path; -import java.time.LocalDateTime; -import java.util.*; - - -@Getter -@Setter -@NoArgsConstructor -@Entity -@Table(name = "users") -@Inheritance(strategy = InheritanceType.JOINED) -public class BBUser implements UserDetails { - - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "user_gen") - @SequenceGenerator(name = "user_gen", sequenceName = "users_id_seq", allocationSize = 1) - private int id; - - private String username; - private String password; - private String description; - - private String name; - private String email; - - @Column(name = "registered_at") - private LocalDateTime registeredAt; - - @Column(name = "is_activate") - private boolean isEnabled; - private String sex; - - @OneToMany(mappedBy = "user") - private List threads; - - @ManyToMany(mappedBy = "developers") - private List projects = new ArrayList<>(); - - @Override - public boolean isEnabled() { - return isEnabled; - } - - @Override - public Collection getAuthorities() { - return List.of(); - } - - public String getAvatarUrl() { - Path path = Path.of(FileUploadService.USER_AVATAR_DIR + File.separator + "avatar-" + id); - return Files.exists(path) ? File.separator + "avatars" + File.separator + "avatar-"+id : File.separator + "default-avatar.jpg"; - } - - - @Override - public boolean equals(Object other){ - System.out.println("VLEZE EQUALS"); - if(!(other instanceof BBUser)){ - return false; - } - BBUser otherCasted = (BBUser) other; - return otherCasted.getId() == this.id; - } - - @Override - public int hashCode() { - return Objects.hashCode(id); - } - - public BBUser( - String username, String email, String name, String password, String description, String sex - ){ - this.username = username; - this.email = email; - this.name = name; - this.password = password; - this.description = description; - this.sex=sex; - this.isEnabled=true; - } - - public List getAuthority(){ - return List.of(new SimpleGrantedAuthority("ROLE_USER")); - } -} Index: c/main/java/com/db/finki/www/build_board/entity/user_type/Developer.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/user_type/Developer.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,23 +1,0 @@ -package com.db.finki.www.build_board.entity.user_type; - -import jakarta.persistence.Entity; -import jakarta.persistence.Table; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.authority.SimpleGrantedAuthority; - -import java.util.List; - -@Entity -@Table(name = "developer") -@Getter -@Setter -@NoArgsConstructor -public class Developer extends BBUser{ - @Override - public List getAuthority(){ - return List.of(new SimpleGrantedAuthority("ROLE_DEVELOPER")); - } -} Index: c/main/java/com/db/finki/www/build_board/entity/user_type/DeveloperAssociatedWithProject.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/user_type/DeveloperAssociatedWithProject.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,29 +1,0 @@ -package com.db.finki.www.build_board.entity.user_type; - -import com.db.finki.www.build_board.entity.compositeId.DeveloperAssociatedWithProjectId; -import com.db.finki.www.build_board.entity.thread.Project; -import jakarta.persistence.*; - -import java.time.LocalDateTime; - -@Entity -@Table(name = "developer_associated_with_project") -@IdClass(DeveloperAssociatedWithProjectId.class) -public class DeveloperAssociatedWithProject { - @Id - @ManyToOne - @JoinColumn(name = "about_dev") - private BBUser developer; - - @Id - @ManyToOne - @JoinColumn(name = "in_project") - private Project project; - - @Id - @Column(name = "started_at") - private LocalDateTime startedAt; - - @Column(name = "ended_at") - private LocalDateTime endedAt; -} Index: c/main/java/com/db/finki/www/build_board/entity/user_type/Moderator.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/user_type/Moderator.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,23 +1,0 @@ -package com.db.finki.www.build_board.entity.user_type; - -import jakarta.persistence.Entity; -import jakarta.persistence.Table; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.authority.SimpleGrantedAuthority; - -import java.util.List; - -@Entity -@Getter -@Setter -@NoArgsConstructor -@Table(name = "moderator") -public class Moderator extends BBUser { - @Override - public List getAuthority(){ - return List.of(new SimpleGrantedAuthority("ROLE_MODERATOR")); - } -} Index: c/main/java/com/db/finki/www/build_board/entity/user_type/ProjectOwner.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/user_type/ProjectOwner.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,23 +1,0 @@ -package com.db.finki.www.build_board.entity.user_type; - -import jakarta.persistence.Entity; -import jakarta.persistence.Table; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.authority.SimpleGrantedAuthority; - -import java.util.List; - -@Getter -@Setter -@NoArgsConstructor -@Entity -@Table(name = "project_manager") -public class ProjectOwner extends Developer{ - @Override - public List getAuthority(){ - return List.of(new SimpleGrantedAuthority("ROLE_PROJECT_OWNER")); - } -} Index: c/main/java/com/db/finki/www/build_board/entity/view/NamedThread.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/view/NamedThread.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,40 +1,0 @@ -package com.db.finki.www.build_board.entity.view; - - -import com.db.finki.www.build_board.service.util.FileUploadService; -import jakarta.persistence.Entity; -import jakarta.persistence.Id; -import jakarta.persistence.Table; -import lombok.Getter; -import lombok.Setter; -import org.hibernate.annotations.Immutable; - -import java.io.File; -import java.nio.file.Files; -import java.nio.file.Path; -import java.time.LocalDateTime; -import java.util.List; - -@Getter -@Setter -@Entity -@Immutable -@Table(name = "v_named_threads") -public class NamedThread { - @Id - private Integer id; - private String content; - private String title; - private String username; - private Integer userId; - private LocalDateTime createdAt; - private String type; - private List tags; - - public String getUsersAvatarUrl() { - Path path = - Path.of(FileUploadService.USER_AVATAR_DIR + File.separator + "avatar-" + userId); - return Files.exists(path) ? File.separator + "avatars" + File.separator + "avatar-"+userId: - File.separator + "default-avatar.jpg"; - } -} Index: c/main/java/com/db/finki/www/build_board/entity/view/RoleChannelPermissions.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/view/RoleChannelPermissions.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,44 +1,0 @@ -package com.db.finki.www.build_board.entity.view; - -import com.db.finki.www.build_board.entity.access_managment.ProjectRole; -import jakarta.persistence.*; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import org.hibernate.annotations.Immutable; - -import java.util.Objects; -import java.util.UUID; - -@Entity -@Immutable -@Table(name = "role_channel_permissions") -@Getter -@Setter -@AllArgsConstructor -@NoArgsConstructor -public class RoleChannelPermissions { - @Id - @Column(name = "channel_id") - private UUID channelId; - @Column(name = "name") - private String channelName; - @ManyToOne - @JoinColumn(name = "role_id",referencedColumnName = "id") - private ProjectRole role; - @Column(name = "permissions") - private String permissions; // comma seperated PERMISSIONS - - @Override - public boolean equals(Object o) { - if (o == null || getClass() != o.getClass()) return false; - RoleChannelPermissions that = (RoleChannelPermissions) o; - return Objects.equals(channelId, that.channelId) && Objects.equals(channelName, that.channelName) && Objects.equals(role, that.role) && Objects.equals(permissions, that.permissions); - } - - @Override - public int hashCode() { - return Objects.hash(channelId, channelName, role, permissions); - } -} Index: c/main/java/com/db/finki/www/build_board/mapper/Mapper.java =================================================================== --- src/main/java/com/db/finki/www/build_board/mapper/Mapper.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,12 +1,0 @@ -package com.db.finki.www.build_board.mapper; - -import java.util.List; - - -public interface Mapper { - S toDTO(T entity); - List toDTO(List entities); - - T fromDTO(S dto); - List fromDTO(List dtos); -} Index: c/main/java/com/db/finki/www/build_board/mapper/MessageMapper.java =================================================================== --- src/main/java/com/db/finki/www/build_board/mapper/MessageMapper.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,51 +1,0 @@ -package com.db.finki.www.build_board.mapper; - -import com.db.finki.www.build_board.dto.MessageDTO; -import com.db.finki.www.build_board.entity.channel.Channel; -import com.db.finki.www.build_board.entity.channel.Message; -import com.db.finki.www.build_board.entity.thread.Project; -import com.db.finki.www.build_board.entity.user_type.Developer; -import com.db.finki.www.build_board.repository.DeveloperRepository; -import com.db.finki.www.build_board.service.channel.ChannelService; -import com.db.finki.www.build_board.service.thread.impl.ProjectService; -import org.springframework.stereotype.Component; - -import java.util.List; - -@Component -public class MessageMapper implements Mapper{ - - private final ProjectService projectService; - private final DeveloperRepository developerRepository; - private final ChannelService channelService; - - public MessageMapper(ProjectService projectService, DeveloperRepository developerRepository, ChannelService channelService) { - this.projectService = projectService; - this.developerRepository = developerRepository; - this.channelService = channelService; - } - - @Override - public MessageDTO toDTO(Message message) { - return new MessageDTO(message.getChannel().getName(),message.getContent(),message.getSentBy().getUsername(),message.getSentAt(),message.getChannel().getProject().getId(),message.getSentBy().getAvatarUrl()); - } - - @Override - public List toDTO(List messages) { - return messages.stream().map(this::toDTO).toList(); - } - - @Override - public Message fromDTO(MessageDTO dto) { - Developer d = developerRepository.findByUsername(dto.getSenderUsername()); - Project p = projectService.getById((long)dto.getProjectId()); - Channel c = channelService.getByNameAndProject(dto.getChannelName(),p); - - return new Message(c,d,dto.getSentAt(), dto.getContent()); - } - - @Override - public List fromDTO(List dtos) { - return dtos.stream().map(this::fromDTO).toList(); - } -} Index: c/main/java/com/db/finki/www/build_board/repository/BlacklistedUserRepo.java =================================================================== --- src/main/java/com/db/finki/www/build_board/repository/BlacklistedUserRepo.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,36 +1,0 @@ -package com.db.finki.www.build_board.repository; - -import com.db.finki.www.build_board.entity.blacklisted_user.BlacklistedUser; -import com.db.finki.www.build_board.entity.blacklisted_user.BlacklistedUserId; -import jakarta.transaction.Transactional; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - -import java.time.LocalDateTime; -import java.util.List; - -public interface BlacklistedUserRepo extends JpaRepository { - @Query(nativeQuery = true, - value = """ - select exists( - select * - from blacklisted_user bu - where bu.end_date is NULL and bu.refers_to=:userId and bu.blacklisted_from = :topicId - ) - """) - boolean isUserInBlacklist(@Param("userId") long userId, @Param("topicId") long topicId); - - @Modifying - @Transactional - @Query(nativeQuery = true, - value = """ - update blacklisted_user - set end_date = now() - where blacklisted_from=:topic and refers_to = :user -""") - void revoke(@Param("topic") long topicId, @Param("user") int blacklistedUserId); - - List findAllByTopicIdAndEndTimeIsNull(Integer topicI); -} Index: c/main/java/com/db/finki/www/build_board/repository/DeveloperRepository.java =================================================================== --- src/main/java/com/db/finki/www/build_board/repository/DeveloperRepository.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,11 +1,0 @@ -package com.db.finki.www.build_board.repository; - -import com.db.finki.www.build_board.entity.user_type.Developer; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface DeveloperRepository extends JpaRepository { - Developer findById(int id); - Developer findByUsername(String username); -} Index: c/main/java/com/db/finki/www/build_board/repository/ModeratorRepository.java =================================================================== --- src/main/java/com/db/finki/www/build_board/repository/ModeratorRepository.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,7 +1,0 @@ -package com.db.finki.www.build_board.repository; - -import com.db.finki.www.build_board.entity.user_type.Moderator; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface ModeratorRepository extends JpaRepository { -} Index: c/main/java/com/db/finki/www/build_board/repository/NamedThreadRepository.java =================================================================== --- src/main/java/com/db/finki/www/build_board/repository/NamedThreadRepository.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,27 +1,0 @@ -package com.db.finki.www.build_board.repository; - -import com.db.finki.www.build_board.entity.view.NamedThread; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - -import java.util.List; - -public interface NamedThreadRepository extends JpaRepository { - @Query(nativeQuery = true, - value = """ - SELECT * - FROM v_named_threads t - WHERE (:title IS NULL OR t.title ILIKE :title || '%') - AND (CAST(:type as varchar) IS NULL OR t.type ilike :type || '%') - AND (CAST(:content as varchar) IS NULL OR t.content ILIKE :content || '%') - AND (CAST(:tags as varchar) IS NULL OR t.tags @> string_to_array(lower(:tags),',')::varchar[]) - """ - ) - List findAll( - @Param("title") String title, - @Param("type") String type, - @Param("content") String content, - @Param("tags") String tags - ); -} Index: c/main/java/com/db/finki/www/build_board/repository/ReportRepository.java =================================================================== --- src/main/java/com/db/finki/www/build_board/repository/ReportRepository.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,40 +1,0 @@ -package com.db.finki.www.build_board.repository; - -import com.db.finki.www.build_board.entity.request.Report; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - -import java.util.List; - -public interface ReportRepository extends JpaRepository { - @Query(value = """ - select * - from report r - join submission s - on s.id = r.id - where (:latest is null or (s.submitted_by ,s.created_at) IN ( select submitted_by,max(created_at) from submission r group by submitted_by)) - and r.for_misconduct_in =:topicId - and (:status is null or s.status=:status) - """, - nativeQuery = true - ) - List getLatestRequestByTopicAndStatus( - @Param("topicId") Integer topicId, - @Param("status") String status, - @Param("latest") String forLatest - ); - - @Query( - nativeQuery = true, - value = """ - select * - from report r - join submission s - on s.id = r.id - where s.submitted_by = :user_id and (:status is null or s.status= :status) - """ - ) - List findAllBySendByUsernameAndStatus(@Param("user_id") long userId, - @Param("status") String status); -} Index: c/main/java/com/db/finki/www/build_board/repository/UserRepository.java =================================================================== --- src/main/java/com/db/finki/www/build_board/repository/UserRepository.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,28 +1,0 @@ -package com.db.finki.www.build_board.repository; - -import com.db.finki.www.build_board.entity.user_type.BBUser; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; - -import java.util.List; -import java.util.Optional; - -@Repository -public interface UserRepository extends JpaRepository { - Optional findByUsername(String username); - - BBUser findById(long id); - - // select * from user join developer_asso - - @Query(""" - SELECT d.developer - FROM DeveloperAssociatedWithProject d - WHERE d.project.id = :projectId - AND d.endedAt IS NULL - """) - List findAllActiveDevelopersForProject(@Param("projectId") int projectId); - -} Index: c/main/java/com/db/finki/www/build_board/repository/access_managment/ProjectRolePermissionRepository.java =================================================================== --- src/main/java/com/db/finki/www/build_board/repository/access_managment/ProjectRolePermissionRepository.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,19 +1,0 @@ -package com.db.finki.www.build_board.repository.access_managment; - -import com.db.finki.www.build_board.entity.access_managment.ProjectRole; -import com.db.finki.www.build_board.entity.access_managment.ProjectRolePermission; -import com.db.finki.www.build_board.entity.compositeId.ProjectRolePermissionId; -import com.db.finki.www.build_board.entity.thread.Project; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public interface ProjectRolePermissionRepository extends JpaRepository { - List findAllByIdRole(ProjectRole role); - @Modifying(clearAutomatically = true) - void deleteAllByIdRole(ProjectRole role); -} Index: c/main/java/com/db/finki/www/build_board/repository/access_managment/ProjectRolePermissionResourceOverrideRepository.java =================================================================== --- src/main/java/com/db/finki/www/build_board/repository/access_managment/ProjectRolePermissionResourceOverrideRepository.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,66 +1,0 @@ -package com.db.finki.www.build_board.repository.access_managment; - -import com.db.finki.www.build_board.entity.access_managment.ProjectRole; -import com.db.finki.www.build_board.entity.access_managment.ProjectRolePermission; -import com.db.finki.www.build_board.entity.access_managment.ProjectRolePermissionResourceOverride; -import com.db.finki.www.build_board.entity.channel.Channel; -import com.db.finki.www.build_board.entity.compositeId.ProjectRolePermissionResourceOverrideId; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.stereotype.Repository; - - -//todo override_type vo project_role -import java.util.List; -import java.util.UUID; - -@Repository -public interface ProjectRolePermissionResourceOverrideRepository extends JpaRepository { - - @Query(value = """ - SELECT COALESCE( - EXISTS (SELECT 1 - FROM project_role_is_assigned_to_developer upr - JOIN project_role pr - ON upr.role_id = pr.id - JOIN role_permissions rp - ON pr.id = rp.for_role - LEFT JOIN role_permissions_overrides rpo - ON pr.id = rpo.for_role_permission_role_id - AND rpo.for_role_permission_permission_name = rp.for_permission - AND rpo.for_resource = :resourceId - - WHERE upr.user_id = :userId - AND pr.valid_in = :projectId - AND rp.for_permission = :permissionName - AND ( - (pr.override_type = 'INCLUDE' AND rpo.for_resource IS NOT NULL) - OR (pr.override_type = 'EXCLUDE' AND rpo.for_resource IS NULL) - )), FALSE - ) AS has_acces - """, nativeQuery = true) - boolean hasPermissionForResource(int projectId, int userId, String permissionName, UUID resourceId); - List findAllByIdProjectRolePermissionIdRole(ProjectRole role); - - @Query(nativeQuery = true,value = """ - SELECT COALESCE( - EXISTS (SELECT 1 - FROM project_role_is_assigned_to_developer upr - JOIN project_role pr - ON upr.role_id = pr.id - LEFT JOIN role_permissions rp - ON pr.id = rp.for_role AND rp.for_permission = :permissionName - WHERE upr.user_id = :userId - AND pr.valid_in = :projectId - AND ( - (pr.override_type = 'INCLUDE' AND rp.for_permission IS NOT NULL) - OR (pr.override_type = 'EXCLUDE' AND rp.for_permission IS NULL) - )), FALSE - ) AS has_access; -""") - boolean hasGlobalPermission(String permissionName,int projectId,int userId); - - @Modifying(clearAutomatically = true) - void deleteAllByIdProjectRolePermissionIdRole(ProjectRole role); -} Index: c/main/java/com/db/finki/www/build_board/repository/access_managment/ProjectRoleRepository.java =================================================================== --- src/main/java/com/db/finki/www/build_board/repository/access_managment/ProjectRoleRepository.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,18 +1,0 @@ -package com.db.finki.www.build_board.repository.access_managment; - -import com.db.finki.www.build_board.entity.access_managment.ProjectRole; -import com.db.finki.www.build_board.entity.thread.Project; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public interface ProjectRoleRepository extends JpaRepository { - List findByProject(Project project); - - List findByProjectId(Integer projectId); - - List findAllByNameInAndProject(List roleNames,Project project); - ProjectRole findByNameAndProject(String roleName,Project project); -} Index: c/main/java/com/db/finki/www/build_board/repository/access_managment/RoleChannelPermissionsRepository.java =================================================================== --- src/main/java/com/db/finki/www/build_board/repository/access_managment/RoleChannelPermissionsRepository.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,11 +1,0 @@ -package com.db.finki.www.build_board.repository.access_managment; - -import com.db.finki.www.build_board.entity.access_managment.ProjectRole; -import com.db.finki.www.build_board.entity.view.RoleChannelPermissions; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; - -public interface RoleChannelPermissionsRepository extends JpaRepository { - List findByRole(ProjectRole role); -} Index: c/main/java/com/db/finki/www/build_board/repository/access_managment/UserProjectRoleRepository.java =================================================================== --- src/main/java/com/db/finki/www/build_board/repository/access_managment/UserProjectRoleRepository.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,14 +1,0 @@ -package com.db.finki.www.build_board.repository.access_managment; - -import com.db.finki.www.build_board.entity.access_managment.UsersProjectRoles; -import com.db.finki.www.build_board.entity.compositeId.UsersProjectRolesId; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public interface UserProjectRoleRepository extends JpaRepository { - List findByIdRoleProjectIdAndIdUserId(int projectId, int userId); - void deleteByIdRoleIdAndIdUserId(int roleId, int userId); -} Index: c/main/java/com/db/finki/www/build_board/repository/channel/ChannelRepository.java =================================================================== --- src/main/java/com/db/finki/www/build_board/repository/channel/ChannelRepository.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,22 +1,0 @@ -package com.db.finki.www.build_board.repository.channel; - -import com.db.finki.www.build_board.entity.channel.Channel; -import com.db.finki.www.build_board.entity.thread.Project; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; -import java.util.UUID; - -@Repository -public interface ChannelRepository extends JpaRepository { - List findAllByProjectIdOrderByNameAsc(Integer projectId); - List findAllByDeveloperIdOrderByNameAsc(Integer developerId); - Channel findByProjectTitleAndNameOrderByNameAsc(String title, String name); - - List findByIdIn(List ids); - - void deleteByNameAndProjectId(String name, Integer projectId); - - Channel findByNameAndProject(String name,Project project); -} Index: c/main/java/com/db/finki/www/build_board/repository/channel/MessageRepository.java =================================================================== --- src/main/java/com/db/finki/www/build_board/repository/channel/MessageRepository.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,14 +1,0 @@ -package com.db.finki.www.build_board.repository.channel; - -import com.db.finki.www.build_board.entity.channel.Channel; -import com.db.finki.www.build_board.entity.channel.Message; -import com.db.finki.www.build_board.entity.compositeId.MessageId; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.time.LocalDateTime; -import java.util.List; - -@Repository -public interface MessageRepository extends JpaRepository { - List findAllByChannelNameAndChannelProjectIdOrderBySentAtAsc(String channelName, Integer projectId);} Index: c/main/java/com/db/finki/www/build_board/repository/request/FeedbackRepo.java =================================================================== --- src/main/java/com/db/finki/www/build_board/repository/request/FeedbackRepo.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,9 +1,0 @@ -package com.db.finki.www.build_board.repository.request; - -import com.db.finki.www.build_board.entity.request.Feedback; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface FeedbackRepo extends JpaRepository { -} Index: c/main/java/com/db/finki/www/build_board/repository/request/ProjectRequestRepo.java =================================================================== --- src/main/java/com/db/finki/www/build_board/repository/request/ProjectRequestRepo.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,34 +1,0 @@ -package com.db.finki.www.build_board.repository.request; - -import com.db.finki.www.build_board.entity.entity_enum.Status; -import com.db.finki.www.build_board.entity.request.ProjectRequests; -import com.db.finki.www.build_board.entity.user_type.BBUser; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public interface ProjectRequestRepo extends JpaRepository { - List findByStatusAndCreatorOrderByCreatedAtDesc(Status status, BBUser forUser); - List findByCreatorOrderByCreatedAtDesc(BBUser forUser); - - @Query(value = """ - select * - from project_request pr - join submission s - on s.id = pr.id - where (:latest is null or (s.submitted_by,s.created_at) IN ( select submitted_by,max(created_at) from submission pr group by submitted_by)) - and pr.project_receives =:projectId - and (:status is null or s.status=:status) - """, - nativeQuery = true - ) - List getLatestRequestByProjectAndStatus( - @Param("projectId") Integer projectId, - @Param("status") String status, - @Param("latest") String forLatest - ); -} Index: c/main/java/com/db/finki/www/build_board/repository/thread/BBThreadRepository.java =================================================================== --- src/main/java/com/db/finki/www/build_board/repository/thread/BBThreadRepository.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,10 +1,0 @@ -package com.db.finki.www.build_board.repository.thread; - -import com.db.finki.www.build_board.entity.thread.BBThread; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface BBThreadRepository extends JpaRepository { - BBThread findById(long id); -} Index: c/main/java/com/db/finki/www/build_board/repository/thread/DiscussionRepository.java =================================================================== --- src/main/java/com/db/finki/www/build_board/repository/thread/DiscussionRepository.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,21 +1,0 @@ -package com.db.finki.www.build_board.repository.thread; - -import com.db.finki.www.build_board.entity.thread.discussion_thread.Discussion; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; - -@Repository -public interface DiscussionRepository extends JpaRepository { - Discussion findDiscussionById(int discussionId); - - @Modifying - @Query( - value = """ - delete from discussion_thread dt where id=:id - """, nativeQuery = true - ) - void deleteById(@Param("id") long discussionId); -} Index: c/main/java/com/db/finki/www/build_board/repository/thread/EmbeddableRepo.java =================================================================== --- src/main/java/com/db/finki/www/build_board/repository/thread/EmbeddableRepo.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,9 +1,0 @@ -package com.db.finki.www.build_board.repository.thread; - -import com.db.finki.www.build_board.entity.thread.EmbeddableThread; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface EmbeddableRepo extends JpaRepository { -} Index: c/main/java/com/db/finki/www/build_board/repository/thread/ProjectRepository.java =================================================================== --- src/main/java/com/db/finki/www/build_board/repository/thread/ProjectRepository.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,30 +1,0 @@ -package com.db.finki.www.build_board.repository.thread; - -import com.db.finki.www.build_board.entity.thread.Project; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public interface ProjectRepository extends JpaRepository, JpaSpecificationExecutor { - Project findByTitle(String title); - void deleteByTitle(String title); - List findAllByUserId(int userId); - - @Modifying - @Query(nativeQuery = true, - value = "UPDATE developer_associated_with_project dap set ended_at=now() where dap" + - ".about_dev=:uid AND dap.in_project =:pid") - void removeUserFromProject(int pid,int uid); - - @Modifying - @Query(nativeQuery = true, - value = "INSERT INTO developer_associated_with_project (in_project, about_dev, " + - "started_at, ended_at) VALUES (:pid,:uid,now(),null)") - void addUserToProject(int pid,int uid); - -} Index: c/main/java/com/db/finki/www/build_board/repository/thread/TagRepository.java =================================================================== --- src/main/java/com/db/finki/www/build_board/repository/thread/TagRepository.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,13 +1,0 @@ -package com.db.finki.www.build_board.repository.thread; - -import com.db.finki.www.build_board.entity.thread.Tag; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.Optional; - -@Repository -public interface TagRepository extends JpaRepository { - Optional findByName(String name); - long deleteAllByName(String name); -} Index: c/main/java/com/db/finki/www/build_board/repository/thread/TopicRepository.java =================================================================== --- src/main/java/com/db/finki/www/build_board/repository/thread/TopicRepository.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,25 +1,0 @@ -package com.db.finki.www.build_board.repository.thread; - -import com.db.finki.www.build_board.entity.thread.Topic; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; - - -@Repository -public interface TopicRepository extends JpaRepository, JpaSpecificationExecutor { - Topic findByTitle(String title); - void deleteByTitle(String title); - Topic findById(long id); - - @Modifying - @Query(value=""" - delete from topic_thread where id=:id - """, - nativeQuery = true - ) - void deleteById(@Param("id") Long id); -} Index: c/main/java/com/db/finki/www/build_board/repository/thread/VDiscussRepo.java =================================================================== --- src/main/java/com/db/finki/www/build_board/repository/thread/VDiscussRepo.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,13 +1,0 @@ -package com.db.finki.www.build_board.repository.thread; - -import com.db.finki.www.build_board.entity.thread.discussion_thread.VDiscussion; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public interface VDiscussRepo extends JpaRepository { - List findVDiscussionByParentTopicIdOrderByCreatedAtDesc(Integer topicId); - VDiscussion findVDiscussionByDiscussionId(Integer discussionId); -} Index: c/main/java/com/db/finki/www/build_board/service/BlacklistedUserService.java =================================================================== --- src/main/java/com/db/finki/www/build_board/service/BlacklistedUserService.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,30 +1,0 @@ -package com.db.finki.www.build_board.service; - -import com.db.finki.www.build_board.entity.blacklisted_user.BlacklistedUser; -import com.db.finki.www.build_board.repository.BlacklistedUserRepo; -import org.springframework.stereotype.Service; - -import java.time.LocalDateTime; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; - -@Service -public class BlacklistedUserService { - private final BlacklistedUserRepo blacklistedUserRepo; - - public BlacklistedUserService(BlacklistedUserRepo blacklistedUserRepo) {this.blacklistedUserRepo = blacklistedUserRepo;} - - public boolean isBlacklisted(long userId, long topicId) { - return blacklistedUserRepo.isUserInBlacklist(userId, topicId); - } - - public void revoke(long topicId, int blacklistedUserId) { - blacklistedUserRepo.revoke(topicId,blacklistedUserId); - } - - public Set findForTopic(int topicId) { - return blacklistedUserRepo.findAllByTopicIdAndEndTimeIsNull(topicId).stream().map(b -> b.getRefersTo() - .getId()).collect(Collectors.toSet()); - } -} Index: c/main/java/com/db/finki/www/build_board/service/BlacklistedUserType.java =================================================================== --- src/main/java/com/db/finki/www/build_board/service/BlacklistedUserType.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,6 +1,0 @@ -package com.db.finki.www.build_board.service; - -public enum BlacklistedUserType { - CURRENT, - PREVIOUS -} Index: c/main/java/com/db/finki/www/build_board/service/ReportService.java =================================================================== --- src/main/java/com/db/finki/www/build_board/service/ReportService.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,137 +1,0 @@ -package com.db.finki.www.build_board.service; - -import com.db.finki.www.build_board.entity.blacklisted_user.BlacklistedUser; -import com.db.finki.www.build_board.entity.entity_enum.FeedbackFor; -import com.db.finki.www.build_board.entity.entity_enum.Status; -import com.db.finki.www.build_board.entity.request.ProjectRequests; -import com.db.finki.www.build_board.entity.request.Report; -import com.db.finki.www.build_board.entity.thread.Project; -import com.db.finki.www.build_board.entity.thread.Topic; -import com.db.finki.www.build_board.entity.user_type.BBUser; -import com.db.finki.www.build_board.entity.user_type.Moderator; -import com.db.finki.www.build_board.repository.BlacklistedUserRepo; -import com.db.finki.www.build_board.repository.ModeratorRepository; -import com.db.finki.www.build_board.repository.ReportRepository; -import com.db.finki.www.build_board.service.request.FeedbackService; -import com.db.finki.www.build_board.service.thread.itf.TopicService; -import org.apache.coyote.Request; -import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.time.LocalDateTime; -import java.util.List; -import java.util.Optional; - -@Service -public class ReportService { - private final ReportRepository reportRepository; - private final TopicService topicService; - private final UserDetailsService userDetailsService; - private final FeedbackService feedbackService; - private final BlacklistedUserRepo blacklistedUserRepo; - private final ModeratorRepository moderatorRepository; - - - public ReportService( - ReportRepository reportRepository, TopicService topicService, - UserDetailsService userDetailsService, FeedbackService feedbackService, - BlacklistedUserRepo blacklistedUserRepo, ModeratorRepository moderatorRepository - ) { - this.reportRepository = reportRepository; - this.topicService = topicService; - this.userDetailsService = userDetailsService; - this.feedbackService = feedbackService; - this.blacklistedUserRepo = blacklistedUserRepo; - this.moderatorRepository = moderatorRepository; - } - - public void createReport( - long topicId, String reason, BBUser creator, - String reportingUsername - ) { - Topic topic = topicService.getById(topicId); - BBUser reportedUser = (BBUser) userDetailsService.loadUserByUsername(reportingUsername); - - if(blacklistedUserRepo.isUserInBlacklist(reportedUser.getId(), topicId)){ - return; - } - - reportRepository.save( - new Report(topic, - creator, - reason, - reportedUser) - ); - } - - public List getByStatusAndProjectAndLatest( - Status status, Integer topicId, - String isLatest - ) { - return reportRepository.getLatestRequestByTopicAndStatus( - topicId, - status == null ? null : status.name(), - isLatest - ); - } - - @Transactional - public void accept(long reqId, String feedbackDesc, BBUser moderatorAsAUser) { - Report reqForReqId = - reportRepository - .findById(reqId) - .orElseThrow(() -> new RuntimeException("The id " + - "is invalid")); - String reason = reqForReqId.getDescription(); - Moderator moderator = - moderatorRepository - .findById(moderatorAsAUser.getId()) - .orElseThrow(() -> new RuntimeException("The user is not a moderator")); - - reqForReqId.setStatus(Status.ACCEPTED); - - feedbackService.create( - feedbackDesc, - moderator, - FeedbackFor.R, - reqForReqId - ); - - blacklistedUserRepo.save( - new BlacklistedUser( - reqForReqId.getTopic(), - moderator, - LocalDateTime.now(), - reqForReqId.getUser(), - reason - ) - ); - } - - @Transactional - public void deny(long reqId, String feedbackDesc, BBUser creator) { - Report report = - reportRepository - .findById(reqId) - .orElseThrow(() -> new RuntimeException("The " + - "report doesn't exist")); - report.setStatus(Status.DENIED); - - feedbackService.create( - feedbackDesc, - creator, - FeedbackFor.R, - report); - - reportRepository.save(report); - } - - public List getByStatusAndUser(Status status, BBUser byUser) { - return reportRepository.findAllBySendByUsernameAndStatus(byUser.getId(), - Optional - .ofNullable(status) - .map(Status::name) - .orElse(null)); - } -} Index: c/main/java/com/db/finki/www/build_board/service/access_managment/AddRoleDTOEntities.java =================================================================== --- src/main/java/com/db/finki/www/build_board/service/access_managment/AddRoleDTOEntities.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,20 +1,0 @@ -package com.db.finki.www.build_board.service.access_managment; - -import com.db.finki.www.build_board.common.enums.ProjectResourcePermissionOverrideType; -import com.db.finki.www.build_board.dto.PermissionResourceWrapper; -import com.db.finki.www.build_board.entity.access_managment.Permission; -import com.db.finki.www.build_board.entity.thread.Project; -import lombok.Getter; -import lombok.Setter; - -import java.util.List; - -@Getter -@Setter -public class AddRoleDTOEntities { - String name; - Project project; - List permissionsResourceWrappers; - List globalPermissions; - ProjectResourcePermissionOverrideType projectResourcePermissionOverrideType; -} Index: c/main/java/com/db/finki/www/build_board/service/access_managment/AddRoleDTOEntitiesMapper.java =================================================================== --- src/main/java/com/db/finki/www/build_board/service/access_managment/AddRoleDTOEntitiesMapper.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,69 +1,0 @@ -package com.db.finki.www.build_board.service.access_managment; - -import com.db.finki.www.build_board.common.enums.ProjectResourcePermissionOverrideType; -import com.db.finki.www.build_board.dto.AddRoleDTO; -import com.db.finki.www.build_board.dto.PermissionResourceDTO; -import com.db.finki.www.build_board.dto.PermissionResourceWrapper; -import com.db.finki.www.build_board.entity.access_managment.Permission; -import com.db.finki.www.build_board.entity.channel.Channel; -import com.db.finki.www.build_board.entity.thread.Project; -import com.db.finki.www.build_board.repository.channel.ChannelRepository; -import com.db.finki.www.build_board.service.channel.ChannelService; -import com.db.finki.www.build_board.service.thread.impl.ProjectService; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Map; -import java.util.UUID; -import java.util.function.Function; -import java.util.stream.Collectors; - -@Service -public class AddRoleDTOEntitiesMapper { - private final ProjectService projectService; - private final ChannelService channelService; - - public AddRoleDTOEntitiesMapper(ProjectService projectService, ChannelService channelService) { - this.projectService = projectService; - this.channelService = channelService; - } - - private Project findProject(String projectTitle){ - return projectService.getByTitle(projectTitle) ; - } - - private List findPermissionResource(List resourceDTOS) { - List channelResourceIds = resourceDTOS.stream() - .map(PermissionResourceDTO::getChannelId) - .toList(); - - List channels = channelService.getAllByIds(channelResourceIds); - - Map channelMap = channels.stream() - .collect(Collectors.toMap(Channel::getId, Function.identity())); - - return resourceDTOS.stream() - .map(dto -> new PermissionResourceWrapper( - new Permission(dto.getPermissionName().toUpperCase()), - channelMap.get(dto.getChannelId()) - )) - .toList(); - } - - - private List findGlobalPermissions(List global){ - return global.stream().map(String::toUpperCase).map(Permission::new).toList(); - } - - public AddRoleDTOEntities map(AddRoleDTO dto) { - AddRoleDTOEntities dto2 = new AddRoleDTOEntities(); - - dto2.setName(dto.getName()); - dto2.setProject(findProject(dto.getProjectTitle())); - dto2.setPermissionsResourceWrappers(findPermissionResource(dto.getPermissionResourceDTOS())); - dto2.setProjectResourcePermissionOverrideType(ProjectResourcePermissionOverrideType.valueOf(dto.getPermissionOverrideType())); - dto2.setGlobalPermissions(findGlobalPermissions(dto.getGlobalPermissions())); - - return dto2; - } -} Index: c/main/java/com/db/finki/www/build_board/service/access_managment/ProjectAccessManagementService.java =================================================================== --- src/main/java/com/db/finki/www/build_board/service/access_managment/ProjectAccessManagementService.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,194 +1,0 @@ -package com.db.finki.www.build_board.service.access_managment; - -import com.db.finki.www.build_board.dto.PermissionResourceWrapper; -import com.db.finki.www.build_board.entity.access_managment.*; -import com.db.finki.www.build_board.entity.channel.Channel; -import com.db.finki.www.build_board.entity.compositeId.ProjectRolePermissionId; -import com.db.finki.www.build_board.entity.compositeId.ProjectRolePermissionResourceOverrideId; -import com.db.finki.www.build_board.entity.compositeId.UsersProjectRolesId; -import com.db.finki.www.build_board.entity.thread.Project; -import com.db.finki.www.build_board.entity.user_type.BBUser; -import com.db.finki.www.build_board.repository.access_managment.ProjectRolePermissionResourceOverrideRepository; -import com.db.finki.www.build_board.repository.access_managment.ProjectRoleRepository; -import com.db.finki.www.build_board.repository.access_managment.ProjectRolePermissionRepository; -import com.db.finki.www.build_board.repository.access_managment.UserProjectRoleRepository; -import com.db.finki.www.build_board.service.channel.ChannelService; -import jakarta.transaction.Transactional; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.UUID; -import java.util.function.Function; -import java.util.stream.Collectors; - -@Service -public class ProjectAccessManagementService { - - private final ProjectRoleRepository projectRoleRepository; - private final ProjectRolePermissionRepository projectRolePermissionRepository; - private final ProjectRolePermissionResourceOverrideRepository projectRolePermissionResourceOverrideRepository; - private final UserProjectRoleRepository userProjectRoleRepository; - private final ChannelService channelService; - - public ProjectAccessManagementService( - ProjectRoleRepository projectRoleRepository, - ProjectRolePermissionRepository projectRolePermissionRepository, - ProjectRolePermissionResourceOverrideRepository projectRolePermissionResourceOverrideRepository, UserProjectRoleRepository userProjectRoleRepository, ChannelService channelService - ) { - this.projectRoleRepository = projectRoleRepository; - this.projectRolePermissionResourceOverrideRepository = - projectRolePermissionResourceOverrideRepository; - this.projectRolePermissionRepository = projectRolePermissionRepository; - this.userProjectRoleRepository = userProjectRoleRepository; - this.channelService = channelService; - } - - public boolean hasPermissionToAccessResource( - int userId, String permission, UUID resourceId, - Project project - ) { - if(project.getUser().getId() == userId) return true; - - if(resourceId == null){ - return projectRolePermissionResourceOverrideRepository.hasGlobalPermission(permission,project.getId(),userId); - }else { - return projectRolePermissionResourceOverrideRepository.hasPermissionForResource(project.getId(), userId,permission,resourceId); - } - - - } - - public List getRolesForDeveloperInProject(BBUser user, Project project) { - return userProjectRoleRepository.findByIdRoleProjectIdAndIdUserId(project.getId(), user.getId()).stream().map(UsersProjectRoles::getProjectRole).toList(); - } - - public List getRolesForMembersInProject(Project project) { - return projectRoleRepository.findByProject(project); - } - - private List mapGlobalsToProjectRolePermissions( - ProjectRole role, - List permissions - ) { - return permissions - .stream() - .map(p -> new ProjectRolePermission( - new ProjectRolePermissionId(p, role) - )) - .toList(); - } - - private List mapPerResourceToProjectRolePermissions( - ProjectRole role, - List permissions - ) { - return permissions - .stream() - .map(p -> new ProjectRolePermission( - new ProjectRolePermissionId( - p.getPermission(), - role) - )) - .toList(); - } - - private List mapToResourceOverrides( - List channels, - List rolePermissions - - ) { - List overrides = new ArrayList<>(); - - - for (int i = 0; i < channels.size(); i++) { - overrides.add( - new ProjectRolePermissionResourceOverride( - new ProjectRolePermissionResourceOverrideId( - rolePermissions.get(i), - channels.get(i) - ) - ) - ); - } - - return overrides; - } - - private List getResources(List rolePermissions) { - return rolePermissions.stream().map(PermissionResourceWrapper::getChannel).toList(); - } - - - @Transactional - public void updateRole(Integer id, AddRoleDTOEntities addRoleDTO) { - - ProjectRole existingRole = projectRoleRepository.findById(id).orElseThrow(() -> new IllegalArgumentException("bad role id")); - projectRolePermissionRepository.deleteAllByIdRole(existingRole); - - existingRole.setName(addRoleDTO.getName()); - existingRole.setOverrideType(addRoleDTO.getProjectResourcePermissionOverrideType().toString()); - - projectRoleRepository.save(existingRole); - - List newGlobalPermissions = mapGlobalsToProjectRolePermissions(existingRole, addRoleDTO.getGlobalPermissions()); - List newPerResourcePermissions = mapPerResourceToProjectRolePermissions(existingRole,addRoleDTO.getPermissionsResourceWrappers()); - List resourceOverrides = mapToResourceOverrides(getResources(addRoleDTO.getPermissionsResourceWrappers()),newPerResourcePermissions); - - - projectRolePermissionRepository.saveAll(newGlobalPermissions); - projectRolePermissionRepository.saveAll(newPerResourcePermissions); - projectRolePermissionResourceOverrideRepository.saveAll(resourceOverrides); - - } - - @Transactional - public void addRole(AddRoleDTOEntities addRoleDTO) { - ProjectRole role = projectRoleRepository.save( - new ProjectRole( - addRoleDTO.getProject(), - addRoleDTO.getName(), - addRoleDTO.getProjectResourcePermissionOverrideType().toString() - ) - ); - - List entities = mapPerResourceToProjectRolePermissions(role, addRoleDTO.getPermissionsResourceWrappers()); - projectRolePermissionRepository.saveAll(mapGlobalsToProjectRolePermissions(role, addRoleDTO.getGlobalPermissions())); - projectRolePermissionRepository.saveAll(entities); - projectRolePermissionResourceOverrideRepository.saveAll(mapToResourceOverrides( - getResources(addRoleDTO.getPermissionsResourceWrappers()), - entities - )); - } - - public void deleteRole(ProjectRole role) { - if(!role.getName().equals("Admin")) { - projectRoleRepository.deleteById(role.getId()); - } - } - - public void addRolesToUser(BBUser user, List roles) { - List usersProjectRoles = roles.stream() - .map(role -> new UsersProjectRoles(new UsersProjectRolesId(role, user))) - .toList(); - - userProjectRoleRepository.saveAll(usersProjectRoles); - - - } - - - public void deleteRoleForUser(BBUser user, Project project, String roleName) { - ProjectRole role = projectRoleRepository.findByNameAndProject(roleName,project); - userProjectRoleRepository.deleteById(new UsersProjectRolesId(role, user)); - } - - public List getRolePermissionsForRoleInProject(ProjectRole role) { - return projectRolePermissionRepository.findAllByIdRole(role); - } - - public List getResourceOverridesForRole(ProjectRole role) { - return projectRolePermissionResourceOverrideRepository.findAllByIdProjectRolePermissionIdRole(role); - } -} Index: c/main/java/com/db/finki/www/build_board/service/channel/ChannelService.java =================================================================== --- src/main/java/com/db/finki/www/build_board/service/channel/ChannelService.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,74 +1,0 @@ -package com.db.finki.www.build_board.service.channel; - -import com.db.finki.www.build_board.entity.access_managment.ProjectRole; -import com.db.finki.www.build_board.entity.channel.Channel; -import com.db.finki.www.build_board.entity.thread.Project; -import com.db.finki.www.build_board.entity.user_type.BBUser; -import com.db.finki.www.build_board.entity.user_type.Developer; -import com.db.finki.www.build_board.entity.view.RoleChannelPermissions; -import com.db.finki.www.build_board.repository.DeveloperRepository; -import com.db.finki.www.build_board.repository.access_managment.RoleChannelPermissionsRepository; -import com.db.finki.www.build_board.repository.access_managment.ProjectRolePermissionResourceOverrideRepository; -import com.db.finki.www.build_board.repository.channel.ChannelRepository; -import jakarta.transaction.Transactional; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.UUID; - -@Service -public class ChannelService { - private final ChannelRepository channelRepository; - private final DeveloperRepository developerRepository; - private final ProjectRolePermissionResourceOverrideRepository projectRolePermissionResourceOverrideRepository; - - private final String INVALID_INPUT_REGEX = "(^/|/$|[\\#?])"; - private final RoleChannelPermissionsRepository roleChannelPermissionsRepository; - - private boolean isInvalidInput(String input) { - return input.matches(INVALID_INPUT_REGEX); - } - - public ChannelService(ChannelRepository channelRepository, DeveloperRepository developerRepository, ProjectRolePermissionResourceOverrideRepository projectRolePermissionResourceOverrideRepository, RoleChannelPermissionsRepository roleChannelPermissionsRepository) { - this.channelRepository = channelRepository; - this.developerRepository = developerRepository; - this.projectRolePermissionResourceOverrideRepository = projectRolePermissionResourceOverrideRepository; - this.roleChannelPermissionsRepository = roleChannelPermissionsRepository; - } - - public List getAllChannelsForProject(Project project) { - return channelRepository.findAllByProjectIdOrderByNameAsc(project.getId()); - } - - public List getChannelPermissionsForRole(ProjectRole role) { - return roleChannelPermissionsRepository.findByRole(role); - } - - - public Channel create(Project project, String channelName, String description, BBUser user){ - if(channelRepository.findByProjectTitleAndNameOrderByNameAsc(project.getTitle(), channelName) != null) { - throw new IllegalArgumentException("Channel with title '" + channelName + "' already exists"); - } - - if(isInvalidInput(channelName)) { - throw new IllegalArgumentException("Channel name contains invalid characters"); - } - - Developer developer = developerRepository.findById(user.getId()); - Channel channel = new Channel(channelName,project,description,developer); - return channelRepository.save(channel); - } - public Channel getByNameAndProject(String channelName, Project project){ - return channelRepository.findByProjectTitleAndNameOrderByNameAsc(project.getTitle(), channelName); - } - @Transactional - public void deleteChannel(String channelName,Project project){ - channelRepository.deleteByNameAndProjectId(channelName,project.getId()); - } - - public List getAllByIds(List ids){ - return channelRepository.findByIdIn(ids); - } - - -} Index: c/main/java/com/db/finki/www/build_board/service/channel/MessageService.java =================================================================== --- src/main/java/com/db/finki/www/build_board/service/channel/MessageService.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,28 +1,0 @@ -package com.db.finki.www.build_board.service.channel; - -import com.db.finki.www.build_board.dto.MessageDTO; -import com.db.finki.www.build_board.entity.channel.Message; -import com.db.finki.www.build_board.mapper.MessageMapper; -import com.db.finki.www.build_board.repository.channel.MessageRepository; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class MessageService { - private final MessageRepository messageRepository; - private final MessageMapper messageMapper; - public MessageService(MessageRepository messageRepository, MessageMapper messageMapper) { - this.messageRepository = messageRepository; - this.messageMapper = messageMapper; - } - - public List getAllMessagesForProjectChannel(Integer projectId,String channelName) { - return messageRepository.findAllByChannelNameAndChannelProjectIdOrderBySentAtAsc(channelName,projectId); - } - public Message addMessage(MessageDTO messageDTO) { - Message message = messageMapper.fromDTO(messageDTO); - return messageRepository.save(message); - } - -} Index: c/main/java/com/db/finki/www/build_board/service/request/FeedbackService.java =================================================================== --- src/main/java/com/db/finki/www/build_board/service/request/FeedbackService.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,22 +1,0 @@ -package com.db.finki.www.build_board.service.request; - -import com.db.finki.www.build_board.entity.entity_enum.FeedbackFor; -import com.db.finki.www.build_board.entity.request.Feedback; -import com.db.finki.www.build_board.entity.request.Submission; -import com.db.finki.www.build_board.entity.user_type.BBUser; -import com.db.finki.www.build_board.repository.request.FeedbackRepo; -import org.springframework.stereotype.Service; - -@Service -public class FeedbackService { - private final FeedbackRepo feedbackRepo; - - public FeedbackService(FeedbackRepo feedbackRepo) {this.feedbackRepo = feedbackRepo;} - - public Feedback create(String description, BBUser creator, FeedbackFor feedbackFor, Submission submission) { - return feedbackRepo.save(new Feedback(feedbackFor, creator, description,submission)); - } - public Feedback create(BBUser creator, FeedbackFor feedbackFor, Submission sub){ - return feedbackRepo.save(new Feedback(feedbackFor, creator,sub)); - } -} Index: c/main/java/com/db/finki/www/build_board/service/request/ProjectRequestService.java =================================================================== --- src/main/java/com/db/finki/www/build_board/service/request/ProjectRequestService.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,69 +1,0 @@ -package com.db.finki.www.build_board.service.request; - -import com.db.finki.www.build_board.entity.entity_enum.FeedbackFor; -import com.db.finki.www.build_board.entity.entity_enum.Status; -import com.db.finki.www.build_board.entity.request.ProjectRequests; -import com.db.finki.www.build_board.entity.thread.Project; -import com.db.finki.www.build_board.entity.user_type.BBUser; -import com.db.finki.www.build_board.repository.request.ProjectRequestRepo; -import com.db.finki.www.build_board.service.thread.impl.ProjectService; -import jakarta.transaction.Transactional; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class ProjectRequestService { - private final ProjectRequestRepo prReqRepo; - private final FeedbackService feedbackService; - private final ProjectService projectService; - - - public ProjectRequestService(ProjectRequestRepo prReqRepo, FeedbackService feedbackService,ProjectService projectService) { - this.prReqRepo = prReqRepo; - this.feedbackService = feedbackService; - this.projectService = projectService; - } - - private ProjectRequests getRequestById(Integer id) { - return prReqRepo.findById((long) id) - .get(); - } - - @Transactional - public void deny(Integer reqId, String desc, BBUser creator) { - ProjectRequests prReq = getRequestById(reqId); - prReq.setStatus(Status.DENIED); - feedbackService.create(desc,creator,FeedbackFor.P,prReq); - prReqRepo.save(prReq); - } - - @Transactional - public void accept(BBUser creator, Integer reqId) { - ProjectRequests prReq = getRequestById(reqId); - prReq.setStatus(Status.ACCEPTED); - - feedbackService.create(creator,FeedbackFor.P,prReq); - projectService.addDeveloperToProject(prReq.getProject(), prReq.getCreator()); - prReqRepo.save(prReq); - } - - public List getByStatusAndProjectAndLatest(Status status, Project project, String isLatest) { - return prReqRepo.getLatestRequestByProjectAndStatus( - project.getId(), - status == null ? null : status.name(), - isLatest - ); - } - - public List getByStatusAndUser(Status status, BBUser forUser) { - if (status == null) { - return prReqRepo.findByCreatorOrderByCreatedAtDesc(forUser); - } - return prReqRepo.findByStatusAndCreatorOrderByCreatedAtDesc(status, forUser); - } - - public ProjectRequests createRequestFor(Project project, String reason, BBUser creator) { - return prReqRepo.save(new ProjectRequests(project, creator, reason)); - } -} Index: c/main/java/com/db/finki/www/build_board/service/thread/impl/DiscussionService.java =================================================================== --- src/main/java/com/db/finki/www/build_board/service/thread/impl/DiscussionService.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,78 +1,0 @@ -package com.db.finki.www.build_board.service.thread.impl; - -import com.db.finki.www.build_board.entity.thread.EmbeddableThread; -import com.db.finki.www.build_board.entity.thread.discussion_thread.Discussion; -import com.db.finki.www.build_board.entity.thread.discussion_thread.VDiscussion; -import com.db.finki.www.build_board.entity.user_type.BBUser; -import com.db.finki.www.build_board.repository.thread.DiscussionRepository; -import com.db.finki.www.build_board.repository.thread.EmbeddableRepo; -import com.db.finki.www.build_board.repository.thread.VDiscussRepo; -import jakarta.transaction.Transactional; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; - -@Service -public class DiscussionService { - private final VDiscussRepo vDiscussRepo; - private final DiscussionRepository discussionRepository; - private final EmbeddableRepo embeddableRepo; - - public DiscussionService(VDiscussRepo vDiscussRepo, DiscussionRepository discussionRepository, EmbeddableRepo embeddableRepo) { - this.vDiscussRepo = vDiscussRepo; - this.discussionRepository = discussionRepository; - this.embeddableRepo = embeddableRepo; - } - - public List getByTopic(int topicId){ - List discussions = vDiscussRepo.findVDiscussionByParentTopicIdOrderByCreatedAtDesc(topicId); - List level0Discussions = new ArrayList<>(); - - for(VDiscussion dis : discussions){ - if(dis.getDepth()==0){ - level0Discussions.add(dis); - }else{ - VDiscussion parent = vDiscussRepo.findById((long) dis.getDiscussion().getParent().getId()).get(); - parent.getChildren().add(dis); - } - } - - return level0Discussions; - } - - public VDiscussion getVDiscussionById(int discussionId){ - return vDiscussRepo.findVDiscussionByDiscussionId(discussionId); - } - public Discussion getDiscussionById(int discussionId){ - return discussionRepository.findDiscussionById(discussionId); - } - - public List getAll(){ - return vDiscussRepo.findAll(); - } - - @Transactional - public Discussion create(String content, int parentId, BBUser user){ - - EmbeddableThread parent = embeddableRepo.findById((long) parentId).get(); - - Discussion reply = new Discussion(); - reply.setContent(content); - reply.setUser(user); - reply.setParent(parent); - - return discussionRepository.save(reply); - } - - public Discussion edit(int replyId, String content) { - Discussion reply = discussionRepository.findDiscussionById(replyId); - reply.setContent(content); - return discussionRepository.save(reply); - } - - public void delete(int threadId) { - discussionRepository.deleteById((long) threadId); - } - -} Index: c/main/java/com/db/finki/www/build_board/service/thread/impl/ProjectService.java =================================================================== --- src/main/java/com/db/finki/www/build_board/service/thread/impl/ProjectService.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,101 +1,0 @@ -package com.db.finki.www.build_board.service.thread.impl; - -import java.util.List; - -import com.db.finki.www.build_board.entity.thread.Tag; -import com.db.finki.www.build_board.entity.thread.Topic; -import com.db.finki.www.build_board.entity.user_type.BBUser; -import com.db.finki.www.build_board.entity.thread.Project; -import com.db.finki.www.build_board.repository.UserRepository; -import com.db.finki.www.build_board.repository.thread.ProjectRepository; -import com.db.finki.www.build_board.service.user.BBUserDetailsService; -import com.db.finki.www.build_board.service.thread.itf.TagService; -import com.db.finki.www.build_board.service.thread.itf.TopicService; -import jakarta.transaction.Transactional; -import org.springframework.stereotype.Service; - -//TODO: trgni gi comopose.yml i env -@Service -public class ProjectService { - private final ProjectRepository projectRepository; - private final TopicService topicService; - private final TagService tagService; - private final BBUserDetailsService userDetailsService; - private final UserRepository userRepository; - - public ProjectService(ProjectRepository projectRepository, TopicServiceImpl topicService, TagServiceImpl tagService, BBUserDetailsService userDetailsService, UserRepository userRepository) { - this.projectRepository = projectRepository; - this.topicService = topicService; - this.tagService = tagService; - this.userDetailsService = userDetailsService; - this.userRepository = userRepository; - } - - public List getAll(){ - return projectRepository.findAll(); - } - - public void create(String title, String repoUrl, String description, BBUser user) { - title=title.strip(); - projectRepository.save( - new Project(title, repoUrl, description, user) - ); - } - - public Project getByTitle(String title) { - return projectRepository.findByTitle(title); - } - - public void createTopic(Project project, String title, String description, BBUser user) { - title=title.strip(); - Topic topic = topicService.create(title, description, user, project); - - project.getTopics().add(topic); - - projectRepository.save(project); - } - - public void addDeveloperToProject(Project project, BBUser user) { - projectRepository.addUserToProject(project.getId(),user.getId()); - } - - @Transactional - public void kickMember(Project project, int memberId) { - projectRepository.removeUserFromProject(project.getId(),memberId); - } - public List getAllDevelopersForProject(Project project) { - return userRepository.findAllActiveDevelopersForProject(project.getId()); - } - - public void addTag(Project project, String tagName, BBUser user) { - Tag tag = null ; - try{ - tag=tagService.getByName(tagName); - }catch (IllegalArgumentException ignore){ - tag=tagService.create(tagName,user); - } - project.getTags().add(tag); - projectRepository.save(project); - } - - public Project update(Project project, String repoUrl, String description, String newTitle) { - newTitle=newTitle.strip(); - project.setRepoUrl(repoUrl); - project.setDescription(description); - project.setTitle(newTitle); - return projectRepository.save(project); - } - - public Project getById(Long id) { - return projectRepository.findById(id).orElseThrow(() -> new IllegalArgumentException("Project not found")); - } - - public void delete(Project project) { - projectRepository.delete(project); - } - - public void deleteTag(Project project, String tagName) { - project.getTags().remove(tagService.getByName(tagName)); - projectRepository.save(project); - } -} Index: c/main/java/com/db/finki/www/build_board/service/thread/impl/TagServiceImpl.java =================================================================== --- src/main/java/com/db/finki/www/build_board/service/thread/impl/TagServiceImpl.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,38 +1,0 @@ -package com.db.finki.www.build_board.service.thread.impl; - -import com.db.finki.www.build_board.entity.thread.Tag; -import com.db.finki.www.build_board.entity.thread.Topic; -import com.db.finki.www.build_board.entity.user_type.BBUser; -import com.db.finki.www.build_board.repository.thread.TagRepository; -import com.db.finki.www.build_board.service.thread.itf.TagService; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class TagServiceImpl implements TagService { - private final TagRepository tagRepository; - - public TagServiceImpl(TagRepository tagRepository) { - this.tagRepository = tagRepository; - } - - @Override - public Tag getByName(String name) { - return tagRepository.findByName(name).orElseThrow(() -> new IllegalArgumentException("Tag not found")); - } - - @Override - public List getAll() { - return tagRepository.findAll(); - } - - public Tag create(String tagName, BBUser user) { - return tagRepository.save(new Tag(tagName, user)); - } - - @Override - public List getAllNotUsed(Topic t) { - return tagRepository.findAll().stream().filter(tag -> !t.getTags().contains(tag)).toList(); - } -} Index: c/main/java/com/db/finki/www/build_board/service/thread/impl/TopicServiceImpl.java =================================================================== --- src/main/java/com/db/finki/www/build_board/service/thread/impl/TopicServiceImpl.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,142 +1,0 @@ -package com.db.finki.www.build_board.service.thread.impl; - -import com.db.finki.www.build_board.entity.blacklisted_user.BlacklistedUser; -import com.db.finki.www.build_board.entity.thread.Project; -import com.db.finki.www.build_board.entity.user_type.BBUser; -import com.db.finki.www.build_board.entity.thread.BBThread; -import com.db.finki.www.build_board.entity.thread.Tag; -import com.db.finki.www.build_board.entity.thread.Topic; -import com.db.finki.www.build_board.repository.thread.TagRepository; -import com.db.finki.www.build_board.repository.thread.TopicRepository; -import com.db.finki.www.build_board.service.BlacklistedUserType; -import com.db.finki.www.build_board.service.thread.itf.TopicService; -import jakarta.transaction.Transactional; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.stream.Collectors; - -@Service -public class TopicServiceImpl implements TopicService { - private final TopicRepository topicRepository; - private final TagRepository tagRepository; - - public TopicServiceImpl(TopicRepository topicRepository, TagRepository tagRepository) { - this.topicRepository = topicRepository; - this.tagRepository = tagRepository; - } - - - @Override - public Topic create(String title, String description, BBUser user) { - Topic topic = new Topic(); - - topic.setTitle(title); - topic.setContent(description); - topic.setUser(user); - - return topicRepository.save(topic); - } - - public Topic create(String title, String description, BBUser user, Project parent) { - Topic topic = new Topic(); - - topic.setTitle(title); - topic.setContent(description); - topic.setUser(user); - topic.setParent(parent); - - return topicRepository.save(topic); - } - - @Override - public List getAll() { - return topicRepository.findAll(); - } - - @Override - public Topic getByTitle(String title) { - return topicRepository.findByTitle(title); - } - - @Override - public void deleteTopicById(Long id) { - topicRepository.deleteById(id); - } - - @Override - public void deleteTopicByTitle(String title) { - topicRepository.deleteByTitle(title); - } - - @Override - public Topic getById(Long id) { - return topicRepository - .findById(id) - .orElse(null); - } - - @Override - @Transactional - public void addTagToTopic(Topic topic, String tagName, BBUser user) { - tagRepository - .findByName(tagName) - .ifPresentOrElse(tag -> { - topic - .getTags() - .add(tag); - tag - .getThreads() - .add(topic); - topicRepository.save(topic); - tagRepository.save(tag); - }, - () -> { - Tag tag = new Tag(tagName, - user); - tagRepository.save(tag); - topic - .getTags() - .add(tag); - tag - .getThreads() - .add(topic); - topicRepository.save(topic); - }); - } - - @Override - public Topic edit(Topic t, String title, String description) { - t.setTitle(title); - t.setContent(description); - return topicRepository.save(t); - } - - @Override - @Transactional - public Topic deleteTagFromTopic(long id, String tagName) { - Topic t = getById(id); - boolean removed = t - .getTags() - .removeIf(tag -> tag - .getName() - .equals(tagName)); - if (!removed) throw new IllegalArgumentException("Tag not found"); - return topicRepository.save(t); - } - - public Map> getBlacklistedUsersForTopicById(long id) { - return topicRepository - .findById(id) - .getBlacklistedUsers() - .stream() - .collect(Collectors.groupingBy( - b -> b.getEndTime() == null - ? BlacklistedUserType.CURRENT - : BlacklistedUserType.PREVIOUS - )); - } -} Index: c/main/java/com/db/finki/www/build_board/service/thread/itf/TagService.java =================================================================== --- src/main/java/com/db/finki/www/build_board/service/thread/itf/TagService.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,14 +1,0 @@ -package com.db.finki.www.build_board.service.thread.itf; - -import com.db.finki.www.build_board.entity.thread.Tag; -import com.db.finki.www.build_board.entity.thread.Topic; -import com.db.finki.www.build_board.entity.user_type.BBUser; - -import java.util.List; - -public interface TagService { - Tag getByName(String name); - List getAll(); - List getAllNotUsed(Topic t); - Tag create(String name, BBUser user); -} Index: c/main/java/com/db/finki/www/build_board/service/thread/itf/TopicService.java =================================================================== --- src/main/java/com/db/finki/www/build_board/service/thread/itf/TopicService.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,25 +1,0 @@ -package com.db.finki.www.build_board.service.thread.itf; - -import com.db.finki.www.build_board.entity.blacklisted_user.BlacklistedUser; -import com.db.finki.www.build_board.entity.thread.Project; -import com.db.finki.www.build_board.entity.user_type.BBUser; -import com.db.finki.www.build_board.entity.thread.BBThread; -import com.db.finki.www.build_board.entity.thread.Topic; -import com.db.finki.www.build_board.service.BlacklistedUserType; - -import java.util.List; -import java.util.Map; - -public interface TopicService { - Topic create(String title, String description, BBUser user); - Topic create(String title, String description, BBUser user, Project parent); - List getAll(); - Topic getByTitle(String title); - void deleteTopicById(Long id); - void deleteTopicByTitle(String title); - Topic getById(Long id); - void addTagToTopic(Topic topic, String tagName, BBUser user); - Topic edit(Topic t, String title, String description); - Topic deleteTagFromTopic(long id, String tagName); - Map> getBlacklistedUsersForTopicById(long id); -} Index: c/main/java/com/db/finki/www/build_board/service/user/AuthenticationSuccessHandlerImpl.java =================================================================== --- src/main/java/com/db/finki/www/build_board/service/user/AuthenticationSuccessHandlerImpl.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,37 +1,0 @@ -package com.db.finki.www.build_board.service.user; - -import com.db.finki.www.build_board.entity.user_type.BBUser; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.servlet.http.HttpSession; -import org.springframework.security.core.Authentication; -import org.springframework.security.web.authentication.AuthenticationSuccessHandler; -import org.springframework.security.web.savedrequest.DefaultSavedRequest; -import org.springframework.security.web.savedrequest.HttpSessionRequestCache; - -import java.io.IOException; -import java.util.Objects; - -public class AuthenticationSuccessHandlerImpl implements AuthenticationSuccessHandler { - @Override - public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException, ServletException { - BBUser user = (BBUser) authentication.getPrincipal(); - HttpSession session = request.getSession(); - session.setAttribute("user", user); - session.setMaxInactiveInterval(1800); - - String redirectUrl = getSavedRequestUrl(request); - - System.out.println(redirectUrl + "REDIR"); - - response.sendRedirect(Objects.requireNonNullElse(redirectUrl, "/")); - - } - - private String getSavedRequestUrl(HttpServletRequest request) { - HttpSessionRequestCache requestCache = new HttpSessionRequestCache(); - DefaultSavedRequest savedRequest = (DefaultSavedRequest) requestCache.getRequest(request, null); - return (savedRequest != null) ? savedRequest.getRedirectUrl() : null; - } -} Index: c/main/java/com/db/finki/www/build_board/service/user/BBUserDetailsService.java =================================================================== --- src/main/java/com/db/finki/www/build_board/service/user/BBUserDetailsService.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,75 +1,0 @@ -package com.db.finki.www.build_board.service.user; - -import com.db.finki.www.build_board.entity.user_type.BBUser; -import com.db.finki.www.build_board.repository.UserRepository; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.security.core.userdetails.UsernameNotFoundException; -import org.springframework.security.crypto.password.PasswordEncoder; -import org.springframework.stereotype.Service; - -@Service -public class BBUserDetailsService implements UserDetailsService { - private final UserRepository userRepository; - private final PasswordEncoder passwordEncoder; - - public BBUserDetailsService(UserRepository userRepository, PasswordEncoder passwordEncoder) { - this.userRepository = userRepository; - this.passwordEncoder = passwordEncoder; - } - - @Override - public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { - return userRepository.findByUsername(username) - .orElseThrow( - () -> new UsernameNotFoundException("User not found with username: " + username)); - } - - public BBUser changeInfoForUserWithUsername(String oldUsername, String newUsername, String email, String name, String description, String password) { - oldUsername=oldUsername.strip(); - newUsername=newUsername.strip(); - email=email.strip(); - password=password.strip(); - - BBUser user = (BBUser) loadUserByUsername(oldUsername); - - user.setUsername(newUsername); - user.setEmail(email); - user.setName(name); - user.setDescription(description); - - if (!password.isBlank() && !password.isEmpty()) { - user.setPassword( - passwordEncoder.encode(password) - ); - } - - return userRepository.save(user); - } - - public BBUser createUser(String username, String email, String name, String password, String description, String sex) { - password = passwordEncoder.encode(password); - sex = sex.equals("male") ? "m" : "f"; - return userRepository.save( - new BBUser( - username, - email, - name, - password, - description, - sex - ) - ); - } - - public Authentication registerUser(String username, String email, String name, String password, String description, String sex) { - BBUser user = createUser(username, email, name, password, description, sex); - return new UsernamePasswordAuthenticationToken(user,user.getPassword(),user.getAuthorities()); - } - - public BBUser loadUserById(int id) { - return userRepository.findById(id); - } -} Index: c/main/java/com/db/finki/www/build_board/service/user/UserStatisticsService.java =================================================================== --- src/main/java/com/db/finki/www/build_board/service/user/UserStatisticsService.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,22 +1,0 @@ -package com.db.finki.www.build_board.service.user; - -import com.db.finki.www.build_board.entity.thread.Project; -import com.db.finki.www.build_board.entity.user_type.BBUser; -import com.db.finki.www.build_board.repository.UserRepository; -import com.db.finki.www.build_board.repository.thread.ProjectRepository; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class UserStatisticsService { - private final ProjectRepository projectRepository; - - public UserStatisticsService(UserRepository userRepository, ProjectRepository projectRepository) { - this.projectRepository = projectRepository; - } - - public List getAllActiveProjectsForUser(BBUser user) { - return projectRepository.findAllByUserId(user.getId()); - } -} Index: c/main/java/com/db/finki/www/build_board/service/util/FileUploadService.java =================================================================== --- src/main/java/com/db/finki/www/build_board/service/util/FileUploadService.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,53 +1,0 @@ -package com.db.finki.www.build_board.service.util; - - -import jakarta.annotation.PostConstruct; -import org.apache.tomcat.util.http.fileupload.FileUploadException; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; - -import java.io.File; -import java.io.IOException; - -@Service -public class FileUploadService { - - public static String USER_AVATAR_DIR = System.getProperty("user.dir") + File.separator + "/uploads/user-avatars"; - public static long MAX_FILE_SIZE = 5 * 1024 * 1024; - - public void uploadAvatar(MultipartFile file, long userId) throws IOException { - System.out.println(USER_AVATAR_DIR); - - if(file.isEmpty()){ - throw new FileUploadException("File is empty"); - } - - String contentType = file.getContentType(); - if (!contentType.startsWith("image/")) { - throw new IOException("Only image files are allowed."); - } - - if (file.getSize() > MAX_FILE_SIZE) { - throw new IOException("File size exceeds the limit."); - } - - - String fileName = "avatar-" + userId; - File saveFile = new File(USER_AVATAR_DIR + File.separator + fileName); - - if (saveFile.exists()) { - saveFile.delete(); - } - - file.transferTo(saveFile); - } - - @PostConstruct - public void initDirectories(){ - File directory = new File(USER_AVATAR_DIR); - if (!directory.exists()) { - directory.mkdirs(); - } - } - -} Index: c/main/java/com/db/finki/www/build_board/service/util/NamedThreadService.java =================================================================== --- src/main/java/com/db/finki/www/build_board/service/util/NamedThreadService.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,32 +1,0 @@ -package com.db.finki.www.build_board.service.util; - -import com.db.finki.www.build_board.entity.view.NamedThread; -import com.db.finki.www.build_board.repository.NamedThreadRepository; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class NamedThreadService { - private final NamedThreadRepository namedThreadRepository; - - public NamedThreadService(NamedThreadRepository namedThreadRepository) { - this.namedThreadRepository = namedThreadRepository; - } - - public List getAll( - String title, - String content, - String type, - List tagList - ) { - String tag = tagList == null || tagList.isEmpty() ? null : String.join(",",tagList); - - return namedThreadRepository.findAll( - title, - type, - content, - tag - ) ; - } -} Index: c/main/java/com/db/finki/www/build_board/service/util/ThreadService.java =================================================================== --- src/main/java/com/db/finki/www/build_board/service/util/ThreadService.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,35 +1,0 @@ -package com.db.finki.www.build_board.service.util; - -import com.db.finki.www.build_board.entity.thread.BBThread; -import com.db.finki.www.build_board.entity.user_type.BBUser; -import com.db.finki.www.build_board.repository.UserRepository; -import com.db.finki.www.build_board.repository.thread.BBThreadRepository; -import org.springframework.stereotype.Service; - -import java.util.Set; - -@Service -public class ThreadService { - private final BBThreadRepository bbThreadRepository; - private final UserRepository userRepository; - - public ThreadService(BBThreadRepository bbThreadRepository, UserRepository userRepository) { - this.bbThreadRepository = bbThreadRepository; - this.userRepository = userRepository; - } - - public BBThread rate(int threadId, int userId,boolean like){ - BBThread thread = bbThreadRepository.findById(threadId); - BBUser user = userRepository.findById(userId); - if(like){ - Set users = thread.getLikes(); - if(!users.contains(user)){ - thread.getLikes().add(user); - } - - } else { - thread.getLikes().remove(user); - } - return bbThreadRepository.save(thread); - } -} Index: c/main/resources/application-local.properties =================================================================== --- src/main/resources/application-local.properties (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,6 +1,0 @@ -spring.datasource.username=${POSTGRES_USER} -spring.datasource.password=${POSTGRES_PASS} -spring.datasource.url=jdbc:postgresql://localhost:${POSTGRES_PORT}/${POSTGRES_DB} - -spring.flyway.password=${POSTGRES_PASS} -spring.flyway.user=${POSTGRES_USER} Index: c/main/resources/application-remote.properties =================================================================== --- src/main/resources/application-remote.properties (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,6 +1,0 @@ -spring.datasource.username=${REMOTE_USER} -spring.datasource.password=${REMOTE_PASS} -spring.datasource.url=jdbc:postgresql://localhost:${REMOTE_PORT}/${REMOTE_DB} - -spring.flyway.password=${REMOTE_PASS} -spring.flyway.user=${REMOTE_USER} Index: c/main/resources/application.properties =================================================================== --- src/main/resources/application.properties (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,11 +1,0 @@ -spring.application.name=build_board -spring.jpa.hibernate.ddl-auto=validate -spring.jpa.show-sql=true - -avatar.upload-dir=/uploads/user-avatars - -logging.level.org.hibernate.SQL=DEBUG -logging.level.org.hibernate.orm.jdbc.bind=TRACE -logging.level.org.springframework.security=DEBUG - -spring.profiles.active=local Index: c/main/resources/db/migration/V1__init_ddl.sql =================================================================== --- src/main/resources/db/migration/V1__init_ddl.sql (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,239 +1,0 @@ -DROP TABLE IF EXISTS users CASCADE; -DROP TABLE IF EXISTS moderator CASCADE; -DROP TABLE IF EXISTS developer CASCADE; -DROP TABLE IF EXISTS project_manager CASCADE; -DROP TABLE IF EXISTS thread CASCADE; -DROP TABLE IF EXISTS likes CASCADE; -DROP TABLE IF EXISTS topic_thread_is_moderated_by_moderator CASCADE; -DROP TABLE IF EXISTS tag CASCADE; -DROP TABLE IF EXISTS tag_assigned_to_thread CASCADE; -DROP TABLE IF EXISTS topic_thread CASCADE; -DROP TABLE IF EXISTS topic_belongs_to_project CASCADE; -DROP TABLE IF EXISTS blacklisted_user CASCADE; -DROP TABLE IF EXISTS project_thread CASCADE; -DROP TABLE IF EXISTS discussion_thread CASCADE; -DROP TABLE IF EXISTS developer_associated_with_project CASCADE; -DROP TABLE IF EXISTS permissions CASCADE; -DROP TABLE IF EXISTS project_role CASCADE; -DROP TABLE IF EXISTS project_role_is_assigned_to_developer CASCADE; -DROP TABLE IF EXISTS role_permissions CASCADE; -DROP TABLE IF EXISTS role_permissions_overrides CASCADE; -DROP TABLE IF EXISTS project_request CASCADE; -DROP TABLE IF EXISTS report CASCADE; -DROP TABLE IF EXISTS channel CASCADE; -DROP TABLE IF EXISTS messages CASCADE; -DROP TABLE IF EXISTS threads_moderators CASCADE; -DROP TYPE IF EXISTS status; -DROP VIEW IF EXISTS v_topic_thread CASCADE; -DROP VIEW IF EXISTS v_project_thread CASCADE; -DROP VIEW IF EXISTS v_discussion_thread CASCADE; -DROP VIEW IF EXISTS v_project_owner CASCADE; -DROP VIEW IF EXISTS v_moderator CASCADE; -drop function if exists fn_insert_project_manager CASCADE; -drop function if exists fn_insert_topics_creator_as_moderator CASCADE; -drop function if exists fn_validate_topic_title CASCADE; -drop function if exists clean_tables CASCADE; -drop function if exists clean_routines CASCADE; -DROP TRIGGER IF EXISTS validate_same_parent ON discussion_thread CASCADE; -drop table if exists topic_guidelines cascade; -drop table if exists submission cascade; -drop table if exists feedback; -drop table if exists embeddable_thread; - -CREATE EXTENSION IF NOT EXISTS "uuid-ossp"; - - ----- DDL -CREATE TABLE users -( - id SERIAL PRIMARY KEY, - username VARCHAR(32) UNIQUE NOT NULL, - email varchar(60) not null, - name varchar(32) not null, - is_activate bool DEFAULT true, - password VARCHAR(72) NOT NULL, - description VARCHAR(200), - registered_at TIMESTAMP DEFAULT NOW() NOT NULL, - sex VARCHAR(1) NOT NULL -); -CREATE TABLE moderator -( - id INT PRIMARY KEY REFERENCES users (id) on delete cascade -); -CREATE TABLE developer -( - id INT PRIMARY KEY REFERENCES users (id) on delete cascade -); -CREATE TABLE project_manager -( - id INT PRIMARY KEY REFERENCES users (id) on delete cascade -); -CREATE TABLE thread -( - id SERIAL PRIMARY KEY, - content TEXT, - created_at timestamp DEFAULT NOW() NOT NULL, - is_created_by INT REFERENCES users (id) NOT NULL --IS_CREATED_BY TOTAL -); -CREATE TABLE project_thread -( - title VARCHAR(256) UNIQUE NOT NULL, - repo_url TEXT, - id INT PRIMARY KEY REFERENCES thread (id) on delete cascade --INHERITANCE -); -create table embeddable_thread -( - id int primary key references thread (id) on delete cascade -); - -CREATE TABLE topic_thread -( - title VARCHAR(256) NOT NULL, - id INT PRIMARY KEY REFERENCES embeddable_thread (id) on delete cascade, --INHERITANCE - referenced_by int REFERENCES project_thread (id) on delete CASCADE, --PARENT - UNIQUE (referenced_by, title) -); -create table topic_guidelines -( - id serial, - topic_id int references topic_thread (id) on delete cascade, - description text, - PRIMARY KEY (id, topic_id) -); -CREATE TABLE discussion_thread -( - id INT PRIMARY KEY REFERENCES embeddable_thread (id) on delete cascade, --INHERITANCE, - contained_in int REFERENCES embeddable_thread (id) NOT NULL --on delete CASCADE ne tuku preku trigger PARENT TOTAL BIGINT -); - -CREATE TABLE likes -( - user_id INT REFERENCES users (id) on delete cascade, - thread_id INT REFERENCES thread (id) on delete cascade, - PRIMARY KEY (user_id, thread_id) -); -CREATE TABLE topic_thread_is_moderated_by_moderator -( - thread_id INT REFERENCES topic_thread (id) ON DELETE CASCADE NOT NULL, - user_id INT REFERENCES moderator (id) ON DELETE CASCADE NOT NULL, - started_at TIMESTAMP DEFAULT NOW() NOT NULL, - PRIMARY KEY (thread_id, user_id) -); -CREATE TABLE tag -( - name VARCHAR(64) PRIMARY KEY, - creator_id int REFERENCES users (id) on delete CASCADE not null -); -CREATE TABLE tag_assigned_to_thread -( - thread_id INT REFERENCES thread (id) ON DELETE CASCADE, - tag_name VARCHAR(64) REFERENCES tag (name) ON DELETE CASCADE, - PRIMARY KEY (thread_id, tag_name) -); - -CREATE TABLE blacklisted_user -( - id serial primary key, - blacklisted_from INT REFERENCES topic_thread (id) ON DELETE CASCADE NOT NULL , - refers_to INT REFERENCES users (id) ON DELETE CASCADE NOT NULL, - blacklisted_by INT REFERENCES moderator (id) ON DELETE CASCADE NOT NULL, - start_date TIMESTAMP NOT NULL, - end_date TIMESTAMP, - reason TEXT, - UNIQUE (refers_to, blacklisted_by, blacklisted_from, start_date) -); -CREATE TABLE developer_associated_with_project -( - in_project INT REFERENCES project_thread (id) on delete cascade NOT NULL, - about_dev INT REFERENCES developer (id) on delete cascade NOT NULL, - started_at TIMESTAMP DEFAULT NOW() NOT NULL, - ended_at TIMESTAMP, - PRIMARY KEY (in_project, about_dev, started_at) -); -CREATE TABLE channel -( - id uuid primary key default uuid_generate_v4(), - name VARCHAR(64) NOT NULL, - description VARCHAR(200), - project_has INT REFERENCES project_thread (id) ON DELETE CASCADE NOT NULL, --HAS - constructed_by INT REFERENCES developer (id) NOT NULL, --CONSTRUCTS - UNIQUE (name,project_has) -); -CREATE TABLE permissions -( - name VARCHAR(32) PRIMARY KEY -); - - -create table project_role -( - id serial PRIMARY KEY , - name varchar(32) NOT NULL, - valid_in int references project_thread (id) ON DELETE CASCADE NOT NULL, - override_type varchar(20) check ( override_type in ('INCLUDE','EXCLUDE')) NOT NULL DEFAULT 'EXCLUDE' -); - -CREATE TABLE role_permissions -( - for_permission VARCHAR(32) NOT NULl, - for_role INT REFERENCES project_role(id) ON DELETE CASCADE NOT NULL, - FOREIGN KEY (for_permission) REFERENCES permissions(name), - PRIMARY KEY (for_permission, for_role) -); - -CREATE TABLE role_permissions_overrides -( - for_resource uuid references channel(id) on delete cascade , - for_role_permission_permission_name VARCHAR(32) NOT NULL, - for_role_permission_role_id INT REFERENCES project_role(id) ON DELETE CASCADE NOT NULL, - FOREIGN KEY (for_role_permission_permission_name, for_role_permission_role_id) REFERENCES role_permissions(for_permission, for_role) ON DELETE CASCADE, - PRIMARY KEY (for_role_permission_role_id,for_role_permission_permission_name,for_resource) -); - -CREATE TABLE project_role_is_assigned_to_developer -( - user_id INT REFERENCES developer (id) on delete cascade NOT NULL, - role_id INT REFERENCES project_role(id) on delete cascade NOT NULL, - PRIMARY KEY (user_id, role_id) -); - - -create table submission -( - id serial primary key, - created_at TIMESTAMP default now() NOT NULL , - description VARCHAR(200) NOT NULL, - status varchar(32) default 'PENDING' CHECK (status IN ('ACCEPTED', 'DENIED', 'PENDING')) NOT NULL, - submitted_by int REFERENCES users (id) NOT NULL -); - -CREATE TABLE project_request -( - id int PRIMARY KEY REFERENCES submission (id), - project_receives INT REFERENCES project_thread (id) ON DELETE CASCADE NOT NULL --RECIEVES -); - -create table feedback -( - description TEXT, - submission_type varchar(1) CHECK (submission_type IN ('P', 'R')) NOT NULL, - created_at timestamp default now() not null, - written_by int references users (id) NOT NULL, --WRITTEN_BY - submitted_for int PRIMARY KEY references submission (id) on delete cascade -); - -CREATE TABLE report -( - id int PRIMARY KEY REFERENCES submission (id), - for_misconduct_in INT REFERENCES topic_thread (id) on delete cascade NOT NULL, --FOR_MISCONDUCT - about INT REFERENCES users (id) on delete cascade NOT NULL --ABOUT -); - -CREATE TABLE messages -( - sent_at TIMESTAMP NOT NULL, - content VARCHAR(200) NOT NULL, - sent_by INT REFERENCES developer (id) on delete no action NOT NULL, - sent_in uuid references channel(id) ON DELETE CASCADE NOT NULL, - PRIMARY KEY (sent_in,sent_by,sent_at) -); Index: c/main/resources/db/migration/V2__views.sql =================================================================== --- src/main/resources/db/migration/V2__views.sql (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,105 +1,0 @@ -CREATE OR REPLACE VIEW v_project_thread -AS -SELECT thread.id, content, is_created_by, title, repo_url -FROM project_thread project - JOIN thread - ON project.id = thread.id; -CREATE OR REPLACE VIEW v_topic_thread -AS -SELECT thread.id, content, is_created_by, title, topic.referenced_by -FROM topic_thread topic - JOIN thread - ON topic.id = thread.id; -CREATE OR REPLACE VIEW v_moderator -AS -SELECT users.id, username, is_activate, password, description, registered_at, sex -FROM moderator - JOIN users ON moderator.id = users.id; - -create or replace view v_discussion_thread -as -with recursive - depth_table as - (select contained_in, id, 0 as depth - from discussion_thread - UNION ALL - select discuss.contained_in, dpth.id, dpth.depth + 1 - from depth_table dpth - join discussion_thread discuss - on dpth.contained_in = discuss.id), - tmp as (select id, max(depth) as depth - from depth_table - group by id) -select d.id as id, t.is_created_by as user_id, d.depth as depth, d1.contained_in as parent_id, t.created_at as "created_at" -from tmp d - join depth_table d1 - on d.id = d1.id and d1.depth = d.depth - join thread t - on t.id = d.id; - - -CREATE OR REPLACE VIEW role_channel_permissions AS -SELECT - c.id as channel_id, - c.name, - pr.id as role_id, - COALESCE( - STRING_AGG( - DISTINCT rp.for_permission, ',' ORDER BY rp.for_permission - ) FILTER ( - WHERE - (pr.override_type = 'INCLUDE' AND rpo.for_resource IS NOT NULL) - OR - (pr.override_type = 'EXCLUDE' AND rpo.for_resource IS NULL) - ), - '' - ) AS permissions -FROM channel c - JOIN project_role pr - ON pr.valid_in = c.project_has - LEFT JOIN role_permissions rp - ON rp.for_role = pr.id - AND rp.for_permission IN ('READ','WRITE') - LEFT JOIN role_permissions_overrides rpo - ON rpo.for_role_permission_role_id = pr.id - AND rpo.for_role_permission_permission_name = rp.for_permission - AND rpo.for_resource = c.id -GROUP BY c.id, c.name,pr.id; - -create or replace view v_named_threads as -WITH topics_projects AS (SELECT pr.id, - pr.title, - 'projects'::text AS "type" - FROM project_thread pr - UNION - SELECT topic_thread.id, - topic_thread.title, - 'topics'::text AS "type" - FROM topic_thread), - topics_projects_threads AS (SELECT t.id, - t.content, - tp.type, - tp.title, - u.username, - u.id AS user_id, - t.created_at - FROM thread t - JOIN users u ON u.id = t.is_created_by - JOIN topics_projects tp ON tp.id = t.id) - , - named_threads_tags as (select tt.thread_id as "id", - array_agg(tt.tag_name) as "tags" - from tag_assigned_to_thread tt - where tt.thread_id in (select id from topics_projects_threads) - group by tt.thread_id) -SELECT tpt.id, - tpt.content, - tpt.title, - tpt.type, - tpt.username, - tpt.user_id, - tpt.created_at, - coalesce((select ntt.tags as "tags" - from named_threads_tags ntt - where ntt.id = tpt.id),'{}') as "tags" -FROM topics_projects_threads tpt; Index: c/main/resources/db/migration/V3__triggers_ddl.sql =================================================================== --- src/main/resources/db/migration/V3__triggers_ddl.sql (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,297 +1,0 @@ -CREATE OR REPLACE FUNCTION fn_validate_topic_title() - RETURNS TRIGGER - LANGUAGE plpgsql -AS -$$ -BEGIN - IF new.title IN - (SELECT title - FROM topic_thread AS t - WHERE t.referenced_by = new.referenced_by - OR (t.referenced_by IS NULL AND new.referenced_by IS NULL) - ) - THEN - RAISE EXCEPTION 'There already exists a topic with title % in parent topic with id %', new.title, new.referenced_by; - END IF; - RETURN new; -END; -$$; - -CREATE OR REPLACE FUNCTION check_if_user_exists_in(table_name text, field_name text, field_value text) RETURNS boolean - LANGUAGE plpgsql -AS -$$ -DECLARE - result BOOL; -BEGIN - EXECUTE format('SELECT EXISTS (SELECT 1 FROM %I WHERE %I = %L)', table_name, field_name, field_value) - INTO result; - RETURN result; -END; -$$; - -CREATE OR REPLACE FUNCTION fn_insert_topics_creator_as_moderator() - RETURNS TRIGGER - LANGUAGE plpgsql -AS -$$ -DECLARE - v_user_id INT; -BEGIN - SELECT v_topic_thread.is_created_by - INTO v_user_id - FROM v_topic_thread - WHERE v_topic_thread.id = NEW.id; - - IF NOT check_if_user_exists_in('moderator', 'id', v_user_id::text) THEN - INSERT INTO moderator VALUES (v_user_id); - END IF; - - INSERT INTO topic_thread_is_moderated_by_moderator(thread_id, user_id) VALUES (NEW.id, v_user_id); - RETURN NEW; -END; -$$; - -CREATE OR REPLACE FUNCTION fn_insert_project_manager() - RETURNS TRIGGER - LANGUAGE plpgsql -AS -$$ -DECLARE - usrId INT; - new_project_id INT; -BEGIN - SELECT is_created_by, id - INTO usrId, new_project_id - FROM v_project_thread p - WHERE NEW.id = p.id; - - IF NOT EXISTS( - SELECT 1 - FROM developer_associated_with_project dawp - WHERE dawp.in_project = new_project_id - AND dawp.about_dev = usrId - ) THEN - INSERT INTO developer_associated_with_project(in_project, about_dev, started_at) - VALUES (new_project_id, usrId, NOW()); - END IF; - - IF NOT check_if_user_exists_in('project_manager', 'id', usrId::text) THEN - INSERT INTO project_manager VALUES (usrId); - END IF; - - RETURN NEW; -END; -$$; - -CREATE OR REPLACE FUNCTION fn_remove_unused_tags() - RETURNS TRIGGER - LANGUAGE plpgsql -AS -$$ -BEGIN - IF NOT check_if_user_exists_in('tag_assigned_to_thread', 'tag_name', OLD.tag_name) THEN - DELETE FROM tag WHERE name = OLD.tag_name; - END IF; - RETURN OLD; -END; -$$; - -CREATE OR REPLACE FUNCTION fn_add_dev_if_not_exist() - RETURNS TRIGGER - LANGUAGE plpgsql -AS -$$ -BEGIN - IF NOT check_if_user_exists_in('developer', 'id', NEW.about_dev::text) THEN - INSERT INTO developer VALUES (NEW.about_dev); - END IF; - RETURN NEW; -END; -$$; - -CREATE OR REPLACE FUNCTION fn_insert_general_for_project() - RETURNS TRIGGER - LANGUAGE plpgsql -AS -$$ -DECLARE - developer_id INT; -BEGIN - SELECT is_created_by - INTO developer_id - FROM thread t - WHERE t.id = NEW.id; - - INSERT INTO channel(name, description, project_has, constructed_by) - VALUES ('General', 'General', NEW.id, developer_id); - - RETURN NEW; -END; -$$; - -CREATE OR REPLACE FUNCTION fn_remove_orphan_moderator() - RETURNS TRIGGER - LANGUAGE plpgsql -AS -$$ -BEGIN - IF NOT EXISTS ( - SELECT 1 - FROM topic_thread_is_moderated_by_moderator t - WHERE t.user_id = OLD.user_id - ) THEN - DELETE FROM moderator WHERE id = OLD.user_id; - END IF; - - IF NOT EXISTS ( - SELECT 1 - FROM topic_thread_is_moderated_by_moderator t - WHERE t.thread_id = OLD.thread_id - ) THEN - DELETE FROM discussion_thread WHERE contained_in = OLD.thread_id; - DELETE FROM topic_thread WHERE id = OLD.thread_id; - END IF; - - RETURN OLD; -END; -$$; - -CREATE OR REPLACE FUNCTION fn_aa_rm_orphan_dics() - RETURNS TRIGGER - LANGUAGE plpgsql -AS -$$ -BEGIN - DELETE FROM discussion_thread dt - WHERE dt.contained_in = OLD.id; - - DELETE FROM embeddable_thread - WHERE id = OLD.id; - - DELETE FROM thread t - WHERE t.id = OLD.id; - - RETURN OLD; -END; -$$; - -CREATE OR REPLACE FUNCTION fn_change_status_on_pending_reports() - RETURNS TRIGGER - LANGUAGE plpgsql -AS -$$ -BEGIN - RAISE NOTICE 'user_id: %, topic_id: %', NEW.refers_to, NEW.blacklisted_from; - - UPDATE submission - SET status = 'ACCEPTED' - WHERE id IN ( - SELECT id - FROM report r - WHERE r.about = NEW.refers_to - AND r.for_misconduct_in = NEW.blacklisted_from - ); - - RETURN NEW; -END; -$$; - -CREATE OR REPLACE FUNCTION fn_add_blacklisted_user() - RETURNS TRIGGER - LANGUAGE plpgsql -AS -$$ -BEGIN - IF NOT EXISTS ( - SELECT 1 - FROM blacklisted_user - WHERE blacklisted_from = NEW.blacklisted_from - AND refers_to = NEW.refers_to - AND end_date IS NULL - ) THEN - RETURN NEW; - END IF; - RETURN NULL; -END; -$$; - -CREATE OR REPLACE FUNCTION fn_delete_dangling_tags() - RETURNS TRIGGER - LANGUAGE plpgsql -AS -$$ -BEGIN - IF NOT EXISTS ( - SELECT 1 - FROM tag_assigned_to_thread - WHERE tag_name = OLD.tag_name - GROUP BY tag_name - ) THEN - DELETE FROM tag WHERE name = OLD.tag_name; - END IF; - RETURN OLD; -END; -$$; - ------------------------------------------------------------- - -CREATE OR REPLACE TRIGGER tr_check_topic_name - BEFORE INSERT OR UPDATE - ON topic_thread - FOR EACH ROW -EXECUTE FUNCTION fn_validate_topic_title(); - -CREATE OR REPLACE TRIGGER tr_insert_topics_creator_as_moderator - AFTER INSERT - ON topic_thread - FOR EACH ROW -EXECUTE FUNCTION fn_insert_topics_creator_as_moderator(); - -CREATE OR REPLACE TRIGGER tr_remove_orphan_moderator - AFTER DELETE - ON topic_thread_is_moderated_by_moderator - FOR EACH ROW -EXECUTE FUNCTION fn_remove_orphan_moderator(); - -CREATE OR REPLACE TRIGGER tr_a_insert_project_manager - AFTER INSERT - ON project_thread - FOR EACH ROW -EXECUTE FUNCTION fn_insert_project_manager(); - -CREATE OR REPLACE TRIGGER tr_add_dev_if_not_exist - BEFORE INSERT - ON developer_associated_with_project - FOR EACH ROW -EXECUTE FUNCTION fn_add_dev_if_not_exist(); - -CREATE OR REPLACE TRIGGER tr_insert_general_for_project - AFTER INSERT - ON project_thread - FOR EACH ROW -EXECUTE FUNCTION fn_insert_general_for_project(); - -CREATE OR REPLACE TRIGGER tr_rm_orphan_disc - AFTER DELETE - ON discussion_thread - FOR EACH ROW -EXECUTE FUNCTION fn_aa_rm_orphan_dics(); - -CREATE OR REPLACE TRIGGER tr_add_blacklisted_user - BEFORE INSERT - ON blacklisted_user - FOR EACH ROW -EXECUTE FUNCTION fn_add_blacklisted_user(); - -CREATE OR REPLACE TRIGGER tr_change_status_on_pending_reports - AFTER INSERT - ON blacklisted_user - FOR EACH ROW -EXECUTE FUNCTION fn_change_status_on_pending_reports(); - -CREATE OR REPLACE TRIGGER tr_delete_dangling_tags - AFTER DELETE - ON tag_assigned_to_thread - FOR EACH ROW -EXECUTE FUNCTION fn_delete_dangling_tags(); Index: c/main/resources/db/migration/V4__procedures.sql =================================================================== --- src/main/resources/db/migration/V4__procedures.sql (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,75 +1,0 @@ -CREATE OR REPLACE PROCEDURE mark_denied_reports_older_than_1month() - LANGUAGE plpgsql -AS $$ -DECLARE - older_reports RECORD; - user_id INT; -BEGIN - FOR older_reports IN - SELECT - r.id AS submission_id, - r.for_misconduct_in AS topic - FROM report r - JOIN submission s ON s.id = r.id - WHERE s.status = 'PENDING' AND now() - s.created_at >= INTERVAL '1 month' - LOOP - BEGIN - UPDATE submission - SET status = 'DENIED' - WHERE id = older_reports.submission_id; - - SELECT t.is_created_by - INTO user_id - FROM thread t - WHERE t.id = older_reports.topic; - - INSERT INTO feedback(description, submission_type, created_at, submitted_for, written_by) - VALUES ( - 'Stale report. Closing due to inactivity.', - 'R', - NOW(), - older_reports.submission_id, - user_id - ); - END; - END LOOP; -END; -$$; - -CREATE OR REPLACE PROCEDURE mark_denied_pr_requests_older_than_1month() - LANGUAGE plpgsql -AS $$ -DECLARE - older_reports RECORD; - user_id INT; -BEGIN - FOR older_reports IN - SELECT - pr.id AS submission_id, - pr.project_receives AS project_id - FROM project_request pr - JOIN submission s ON s.id = pr.id - WHERE s.status = 'PENDING' AND now() - s.created_at >= INTERVAL '1 month' - LOOP - BEGIN - UPDATE submission - SET status = 'DENIED' - WHERE id = older_reports.submission_id; - - SELECT t.is_created_by - INTO user_id - FROM thread t - WHERE t.id = older_reports.project_id; - - INSERT INTO feedback(description, submission_type, created_at, submitted_for, written_by) - VALUES ( - 'Stale report. Closing due to inactivity.', - 'P', - NOW(), - older_reports.submission_id, - user_id - ); - END; - END LOOP; -END; -$$; Index: c/main/resources/db/migration/V5__indexes.sql =================================================================== --- src/main/resources/db/migration/V5__indexes.sql (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,1 +1,0 @@ - Index: c/main/resources/db/migration/V6__add_test_data.sql =================================================================== --- src/main/resources/db/migration/V6__add_test_data.sql (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,197 +1,0 @@ -INSERT INTO users (username, is_activate, password, description, registered_at, sex, name, email) -VALUES - ('user1', true, '$2a$12$0f.x7aBM2wFBZBXoLPj0BObVsk.J1kXFYo5nb4niAWkI4hk5tHvDy', 'First user', NOW(), 'M','viki', 'viki@gmail.com'), - ('user2', true, '$2a$12$VkR0a47LDVM6aUqFcEJGSu9jhZCz.05tCoyiRicFObt4f2x2gijKa', 'Second user', NOW(), 'F','stefan', 'stefan@gmail.com'), - ('user3', true, '$2a$12$eSLdHHJ1KFgv.dOupmloXeItjrt2o1IB6ER6Nq7WYj9Jfr2bEwK2a', 'Third user', NOW(), 'M','darko', 'darko@gmail.com'), - ('user4', true, '$2a$12$dF5SXcNhMulgU3Qre3nh1e.aatRiJZsnfoBSqReGnXe9rIbHYVWhe', 'Fourth user', NOW(), 'F','andrej', 'andrej@gmail.com'), - ('user5', true, '$2a$12$zHrloz8WG2zo5S6MTf1C0ez1raMlmDJdB8OOa2I1S2pVy9oI76YTa', 'Fifth user', NOW(), 'M','ramche', 'ramche@gmail.com'); - - -INSERT INTO thread (content, is_created_by) -VALUES - ('Main content for topic thread 1', 1), --1 - ('Main content for topic thread 2', 2), --2 - ('Discussion content for topic 1', 1), --3 - ('Discussion content for topic 2', 2), --4 - ('Project-specific thread content', 3), --5 - ('Reply to topic 1', 4), -- 6 - ('Further discussion on topic 2', 5), --7 - ('Main content for topic thread', 1), --8 - ('Project-specific thread content 2', 5); --9 - -insert into embeddable_thread(id) -values (1),(2),(3),(4),(6),(7),(8); - - -INSERT INTO project_thread (id, title, repo_url) -VALUES - (5, 'Project 1 Thread', 'http://github.com/project1'), - (9, 'Project 2 Thread', 'http://github.com/project1'); - -INSERT INTO topic_thread (id, title, referenced_by) -VALUES - (1, 'Topic 1' , 5), - (2, 'Topic 2', NULL), - (8, 'Topic 7' , NULL); - -insert into topic_guidelines(topic_id,description) -values - (1,'Follow guidelines'), - (2,'Be respectful'); - -INSERT INTO discussion_thread (id, contained_in) -VALUES - (3, 1), - (4, 2), - (6, 1), - (7, 4); - - -INSERT INTO likes (user_id, thread_id) -VALUES - (1, 3), - (2, 4), - (3, 5), - (4, 6), - (5, 7); - --- blacklisted_user matches DDL, so skipped for now - -INSERT INTO permissions (name) -VALUES - ('READ'), - ('WRITE'), - ('CREATE'), - ('DELETE'); - -INSERT INTO project_role (name, valid_in, override_type) -VALUES - ('Admin', 5,'EXCLUDE'), - ('Developer', 5,'INCLUDE'); - - -INSERT INTO project_role_is_assigned_to_developer (user_id, role_id) -VALUES - (3, 1), - (5, 2); - -INSERT INTO role_permissions (for_permission, for_role) -VALUES - ('READ', 1), - ('WRITE', 1), - ('CREATE', 1), - ('DELETE', 1); - -insert into submission(submitted_by, status, description) -values - (1,'PENDING','Inappropriate content'), - (3,'DENIED','Spam content'); - -INSERT INTO report (id, for_misconduct_in, about) -VALUES - (1, 2, 1), - (2, 1, 3); - - -INSERT INTO channel (name, description, project_has, constructed_by) -VALUES - ('Updates', 'Project updates channel', 5, 3); - - ----------------- NOV TEST DATA - --- Add new users (already correct) -INSERT INTO users (username, is_activate, password, description, registered_at, sex, name, email) -VALUES - ('user6', true, '$2a$12$jB9g/.KP95fsYYOTy0pwZ.kFrwA/G2cMvPvFLzGtCk8jJ2qO3O.3u', 'Sixth user', NOW(), 'M', 'marko', 'marko@gmail.com'), - ('user7', true, '$2a$12$KRxRufuMscrlQOLKGw4fBehNLWaP7Zu.M964G2JedKVM4o4wTiJaG', 'Seventh user', NOW(), 'F', 'jana', 'jana@gmail.com'), - ('user8', true, '$2a$12$SCqlK.Rl72tFT0kIUNP6KuSy6BYzfdb9sKJPSWbIK8/uk7y8U7hgS', 'Eighth user', NOW(), 'M', 'nikola', 'nikola@gmail.com'), - ('user9', true, '$2a$12$LpDTYNb/i0cohkmszkx93ef9rkgFTNFQz/KqHEYIAE9MPOmlyXJ9m', 'Ninth user', NOW(), 'F', 'elena', 'elena@gmail.com'), - ('user10', true, '$2a$12$p/kZdDKCUCmXjWTsknss/.UaD4a8vxrTcfvc6mdkpHRRPqRZLLtr6', 'Tenth user', NOW(), 'M', 'petar', 'petar@gmail.com'); - --- Add new developers (matches DDL) -INSERT INTO developer (id) -VALUES (6),(7),(8),(9),(10); - --- Add new threads -INSERT INTO thread (content, is_created_by) -VALUES - ('Main content for topic thread 3', 6), --10 - ('Main content for topic thread 4', 7), --11 - ('Discussion content for topic 3', 6), --12 - ('Discussion content for topic 4', 7), --13 - ('Project-specific thread content 3', 8), --14 - ('Reply to topic 3', 9), --15 - ('Further discussion on topic 4', 10), --16 - ('Main content for topic thread 5', 6), --17 - ('Project-specific thread content 4', 10); --18 - --- Add embeddable_thread entries -INSERT INTO embeddable_thread (id) -VALUES (10),(11),(12),(13),(15),(16),(17); - --- New project_threads (matches DDL) -INSERT INTO project_thread (id, title, repo_url) -VALUES - (14, 'Project 3 Thread', 'http://github.com/project3'), - (18, 'Project 4 Thread', 'http://github.com/project4'); - --- New topic_threads -INSERT INTO topic_thread (id, title, referenced_by) -VALUES - (10, 'Topic 3', 14), - (11, 'Topic 4', NULL), - (17, 'Topic 8', NULL); - --- Guidelines -INSERT INTO topic_guidelines (topic_id, description) -VALUES - (10, 'Stay on topic'), - (11, 'No personal attacks'); - --- New discussion_threads -INSERT INTO discussion_thread (id, contained_in) -VALUES - (12, 10), - (13, 11), - (15, 10), - (16, 13); - --- Likes (matches DDL) -INSERT INTO likes (user_id, thread_id) -VALUES - (6, 12), - (7, 13), - (8, 14), - (9, 15), - (10, 16); - --- blacklisted_user (already matches DDL) - --- New submissions -INSERT INTO submission (submitted_by, status, description) -VALUES - (6, 'PENDING', 'Request for new feature'), - (7, 'ACCEPTED', 'Bug report'); - --- Reports -INSERT INTO report (id, for_misconduct_in, about) -VALUES - (3, 10, 7), - (4, 11, 8); - --- Associate developers with projects -INSERT INTO developer_associated_with_project (in_project, about_dev, started_at) -VALUES - (14, 6, NOW()), - (14, 7, NOW()), - (18, 8, NOW()), - (18, 9, NOW()); - --- Channels -INSERT INTO channel (name, description, project_has, constructed_by) -VALUES - ('General2', 'General discussion', 14, 6), - ('Bugs', 'Bug reports and fixes', 14, 7), - ('General2', 'General discussion', 18, 8), - ('Ideas', 'Feature ideas', 18, 9); Index: c/main/resources/static/css/chat.css =================================================================== --- src/main/resources/static/css/chat.css (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,174 +1,0 @@ -body { - background-color: #f8f9fa; - margin: 0; - padding: 0; -} -.chat-container { - width: 80%; /* Chat takes 80% of the screen width */ - height: 85vh; /* Chat box height takes up 85% of the viewport */ - max-width: 1200px; /* Max-width for large screens */ - border-radius: 12px; - overflow: hidden; - box-shadow: 1px 4px 12px rgba(0, 0, 0, 0.6); - display: flex; - flex-direction: column; - position: relative; - padding: 0; -} -.chat-header { - background-color: #e9ecef; - padding: 25px; - text-align: center; -} -.chat-header h3{ - padding-bottom: 1rem; - border-bottom: 1px solid rgba(0, 0, 0, 0.3); -} -.chat-messages { - background-color: #e9ecef; - height: calc(100% - 160px); /* Adjust the height based on header and input section */ - overflow-y: auto; - padding: 20px; - display: flex; - flex-direction: column; - gap: 20px; -} - -.input-container { - background-color: #ffffff; /* Light background for the input area */ - padding: 15px; - display: flex; - gap: 10px; - align-items: center; /* Align items vertically */ - border-top: 1px solid #e9ecef; /* Add a subtle border at the top */ - box-shadow: 0 -2px 8px rgba(0, 0, 0, 0.1); /* Add a shadow to separate from messages */ -} - -#chat-message { - flex: 1; /* Allow the textarea to take up remaining space */ - padding: 12px 16px; /* Add padding for better text alignment */ - border: 1px solid #ced4da; /* Add a border */ - border-radius: 8px; /* Rounded corners */ - font-size: 14px; /* Adjust font size */ - resize: none; /* Disable resizing */ - outline: none; /* Remove default outline */ - transition: border-color 0.3s ease; /* Smooth transition for focus */ -} - -#chat-message:focus { - border-color: #007bff; /* Highlight border on focus */ - box-shadow: 0 0 0 2px rgba(0, 123, 255, 0.25); /* Add a subtle glow */ -} - -#send-message-button { - background-color: #2DA1E1FF; /* Primary button color */ - color: white; /* Text color */ - border: none; /* Remove default border */ - padding: 10px 16px; /* Smaller padding for a compact look */ - border-radius: 20px; /* More rounded corners for a pill-like shape */ - font-size: 14px; /* Adjust font size */ - cursor: pointer; /* Pointer cursor on hover */ - transition: background-color 0.3s ease, transform 0.2s ease, box-shadow 0.3s ease; /* Smooth transitions */ - display: flex; /* Use flexbox for alignment */ - align-items: center; /* Center content vertically */ - justify-content: center; /* Center content horizontally */ - width: auto; /* Let the button size adjust to its content */ - min-width: 80px; /* Set a minimum width to avoid being too narrow */ - box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); /* Subtle shadow for depth */ -} -/*2DA1E1FF*/ -#send-message-button:hover { - background-color: #007dc2; /* Darker shade on hover */ - box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2); /* Slightly larger shadow on hover */ -} - -#send-message-button:active { - transform: scale(0.95); /* Slight scale-down effect on click */ - box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); /* Reset shadow on click */ -} - -#send-message-button:focus { - outline: none; /* Remove default outline */ - box-shadow: 0 0 0 3px rgba(0, 123, 255, 0.3); /* Add a focus ring */ -} -.message-bubble { - width: 100%; - word-wrap: break-word; - padding: 12px 20px; - border-radius: 20px; - display: flex; - align-items: center; - gap: 1rem; -} -.message-info p{ - margin: 0; -} -.message-bubble.outgoing { - background-color: #007bff; - color: white; - align-self: flex-end; -} -.message-bubble.incoming { - background-color: #e2e5ea; - color: black; - align-self: flex-start; -} -.input-container { - background-color: #f1f3f5; - padding: 15px; - display: flex; - gap: 10px; -} -.button{ - -} -.user-list { - background-color: #f1f3f5; - padding: 15px; - border-radius: 8px; - box-shadow: 0px 4px 10px rgba(0, 0, 0, 0.1); - max-height: 40vh; - overflow-y: auto; -} -.channel-list { - background-color: #f1f3f5; - padding: 15px; - border-radius: 8px; - box-shadow: 2px 4px 8px rgba(3, 2, 2, 0.27); - width: 20%; - overflow-y: auto; -} -.user-item { - display: flex; - align-items: center; - gap: 12px; - padding: 12px 8px; - border-radius: 8px; -} -.user-item:hover { - background-color: #e9ecef; -} - -.channel-item { - display: flex; - align-items: center; - gap: 12px; - padding: 12px 8px; - border-radius: 8px; - background-color: rgba(108, 111, 114, 0.07); - margin-top: 0.85rem; -} -.channel-item:hover { - transition: background-color 300ms; - background-color: rgba(129, 144, 178, 0.29); -} - -.avatar { - width: 50px; - height: 50px; - display: inline-flex; - justify-content: center; - align-items: center; - border-radius: 50%; - color: white; -} Index: c/main/resources/static/css/icon.css =================================================================== --- src/main/resources/static/css/icon.css (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,18 +1,0 @@ -.icon-small{ - width: 3rem !important; - height: 3rem !important; - object-fit: cover; - vertical-align: middle; -} -.icon-medium{ - width: 4rem; - height: 4rem; - object-fit: cover; - vertical-align: middle; -} -.icon-big{ - width: 15rem; - height: 15rem; - object-fit: cover; - vertical-align: middle; -} Index: c/main/resources/static/js/modal_utils.js =================================================================== --- src/main/resources/static/js/modal_utils.js (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,10 +1,0 @@ -const modalConts = [] -document.addEventListener("keydown", ev => { - if (ev.key !== 'Escape') return null; - modalConts.forEach(cont => { - if (cont.classList.contains("show")) { - const close = cont.querySelector(".btn-close") - close.click() - } - }) -}) Index: c/main/resources/static/project_imgs/im-kick-user.svg =================================================================== --- src/main/resources/static/project_imgs/im-kick-user.svg (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,1 +1,0 @@ - Index: c/main/resources/templates/blacklisted.html =================================================================== --- src/main/resources/templates/blacklisted.html (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,31 +1,0 @@ - - - - - - - Add - Topic - - - - -

-
-

- The moderators have blacklisted you from this site -

-
- Index: c/main/resources/templates/channels/list-channels.html =================================================================== --- src/main/resources/templates/channels/list-channels.html (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,14 +1,0 @@ - - - - - All Channels - - -
-
    -
  • -
-
- - Index: c/main/resources/templates/channels/show-channel.html =================================================================== --- src/main/resources/templates/channels/show-channel.html (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,208 +1,0 @@ - - - - - - Channel - - - - - - -
- -
- -
- -
-
-
-
Channels
-
- Channel Name -
-
- -
- -
-

Channel Name

-
- - -
-
-
- user-logo -
-
- - Username -  datum • vreme - -

Message Content

-
- -
- -
- - -
- - -
-
- -
- - -
-
Users
-
-
- user-logo - -
-
-
- - - - - - - - - - - - - - Index: c/main/resources/templates/create-topic.html =================================================================== --- src/main/resources/templates/create-topic.html (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,53 +1,0 @@ - - - - - - Add Topic - - - - -
-
-
-
-

Add a New Topic

-
-
-
-
- - -
-
- - -
- - - -
-
-
-
-
-
Error
-

-
-
-
- - - - Index: c/main/resources/templates/error_pages/error.html =================================================================== --- src/main/resources/templates/error_pages/error.html (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,30 +1,0 @@ - - - - - - Error - - - - - -logo -
-
-

Error

-
-

- - -

-
-

Description

- Back to Home -
-
- - - - - Index: c/main/resources/templates/fragments/chat_message.html =================================================================== --- src/main/resources/templates/fragments/chat_message.html (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,10 +1,0 @@ - - - - - - - - - - Index: c/main/resources/templates/fragments/discussion.html =================================================================== --- src/main/resources/templates/fragments/discussion.html (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,186 +1,0 @@ - -
-
-
- Profile Picture - Reply Author - - - - - -
-
- -
- -
- -
-
- - - -
-
-
-
- -
-
- - -
-
-

- Reply - content - goes - here.

-
-
-
- - - - - - -
- -
- - -
-
-
- - -
-
- - -
-
-
- -
-
-
- - - -
-
-
- - -
-
- - -
- -
-
-
-
-
-
- Index: c/main/resources/templates/fragments/user_fields.html =================================================================== --- src/main/resources/templates/fragments/user_fields.html (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,31 +1,0 @@ -
-
Personal Details
- - - - - - - -
Index: c/main/resources/templates/home_pages/home.html =================================================================== --- src/main/resources/templates/home_pages/home.html (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,295 +1,0 @@ - - - - - - Home Page - - - - - - - - - -
-
-
-
- -
-
- - - - - -
- -
-
-
-
- -
- - - -
-
- Filters: -
- - -
-
- - -
-
-
- - -
-
- - -
-
- -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- -
- - - -
-
-
- - -
-
-

Thread Title

-
- user-logo - -
-
-
-

Thread content goes - here.

-
- - -
- -
-
-
-
- - - - - - - - - - - - - - - - - - - - Index: c/main/resources/templates/home_pages/login.html =================================================================== --- src/main/resources/templates/home_pages/login.html (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,37 +1,0 @@ - - - - - - Login - - - - - -
-
-
-

Login

-
-
- - -
-
- - -
- -
-
- Don't have an account? Register -
-
-
-
- - - - - Index: c/main/resources/templates/home_pages/private-profile.html =================================================================== --- src/main/resources/templates/home_pages/private-profile.html (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,97 +1,0 @@ - - - - - - - Profile - - - - -
-
- -
-
-

User Profile

-
- -
- - -
-
- Profile Picture - - - - - -
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
- - - - - Index: c/main/resources/templates/home_pages/project_description.html =================================================================== --- src/main/resources/templates/home_pages/project_description.html (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,66 +1,0 @@ - - - - - - - - About BuildBoard - - -
-
-
- Logo for BuildBoard project -

BuildBoard

-
-
-

Purpose

-
-

- In today's world, there is an endless number of resources and ways for someone to acquire knowledge. The - problem - does not lie in the abundance of available knowledge but in the guidance, specifically, how to achieve - the - desired outcome. Every solution to a problem has its own path to reach the goal. This project aims to - solve - the - issue of guidance by enabling software developers to guide and assist one another. -

-

- Another issue being addressed is the problem of centralization. This issue is closely related to the - aforementioned one, as it is much easier to guide someone who wants to learn if all the necessary - resources - are - in one place. On our platform, this is reflected through various informative threads and discussion - threads. -

-
-

BuildBoard

-

BuildBoard is intended to be a social platform focused on - software - developers. The idea is to facilitate open discussions about technologies, approaches to problems, and more, - making it accessible to every software developer. Additionally, the application offers an integrated project - management system where multiple software developers can collaborate and build their own applications. The - goal is to create a single platform where people can talk, learn, and discuss software development while - also having the opportunity to explore real projects and connect with the developers behind them, whether - for consultation or collaboration purposes.

-

Contact

- -
-
- - - Index: c/main/resources/templates/home_pages/public-profile.html =================================================================== --- src/main/resources/templates/home_pages/public-profile.html (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,135 +1,0 @@ - - - - - - - Public Profile - - - - - - -
- - -
-
-
- -
- -
- - Edit - - - Profile Picture -

Username

-
- - -
-
-
- -
Username
-

Username

- - -
-
About Me
-

- This is a sample description about the user. It can be a few lines long. -

-
-
-
Projects worked in:
-
- - View project requests - - - View submitted reports - -
-
-
-
-
-
-
- - - - - - - Index: c/main/resources/templates/home_pages/register.html =================================================================== --- src/main/resources/templates/home_pages/register.html (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,113 +1,0 @@ - - - - - Register new user - - - - -
-
-
-
-

Create new user

-
- -
- - - - - - -
- - - -
- -
-
-
-
-
-

-
-
-
- - - - - Index: c/main/resources/templates/project_pages/edit-role.html =================================================================== --- src/main/resources/templates/project_pages/edit-role.html (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,222 +1,0 @@ - - - - - Update Role - - - - -
- - - - - - - - - - - Index: c/main/resources/templates/project_pages/members.html =================================================================== --- src/main/resources/templates/project_pages/members.html (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,204 +1,0 @@ - - - - - Members - - - - - - -
- -
-

Projects Tittles

-
-
-
-
-
- -
- -
-
-
- - - - - -
-
- -
-
- - - -
- Developer
-
Owner
-
- -
- -
-
-
-
- - - - - - - - - - Index: c/main/resources/templates/project_pages/project-create.html =================================================================== --- src/main/resources/templates/project_pages/project-create.html (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,63 +1,0 @@ - - - - - - Add project - - - - -
-
-
-
Error
-

-
-
-
-
-
-

Create new project

-
-
-
-
- - -
-
- - -
-
- - -
- - -
-
-
-
- - - - Index: c/main/resources/templates/project_pages/project-roles.html =================================================================== --- src/main/resources/templates/project_pages/project-roles.html (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,328 +1,0 @@ - - - - - - - Project - Roles - - - - -
- -
-
-
-
- Error
-

-
-
- -
-
-
-

- Roles - for - Project Title -

-
- -
-
- -
-
- No - roles - defined - for - this - project - yet. -
- -
-
-
- Role - Name
- -
-
- -
- -
-
-
-
-
-
-
- - - - - - - - - Index: c/main/resources/templates/project_pages/requests/show-requests.html =================================================================== --- src/main/resources/templates/project_pages/requests/show-requests.html (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,164 +1,0 @@ - - - - - Requests - - - -
-
-
-
-
- - - - -
-
-
-
-
-

Creator of request

-

- Status: - -

-
-
-
-

Description

-

Description of the project goes here.

-

-
-
-
- -
- -
-
- - -

-
-
- -
-
- - - - - Index: c/main/resources/templates/project_pages/requests/show-user-requests.html =================================================================== --- src/main/resources/templates/project_pages/requests/show-user-requests.html (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,103 +1,0 @@ - - - - - Users Requests - - - -
-
-
-
-
- - - -
-
-
-
-
-

Creator of request

-

- Status: - -

-
-
-
-

Description

-

Description of the project goes here.

-

-
-
-
- - -
-
-
- - - - - Index: c/main/resources/templates/project_pages/show-project.html =================================================================== --- src/main/resources/templates/project_pages/show-project.html (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,282 +1,0 @@ - - - - - - - - - - -
-
-
-
Error
-

-
-
- -
-
-
-

Project Title

-
- - Show members - -
-
-
-
-

Description

-

Description of the project goes here.

-
-
-

Repository

- - There's no provided url for this project -
-
-
    -
  • - Tag Name -
    - - -
    -
    • -
-
-
-
-

Topics:

-
-
-
-
- -
- -
- - -
-
-
- -
-

Channels:

-
-
-
-
-
- -
-
- -
-
-
-
- -
-
- -
-
-
-
- -
-
- -
-
-
-
-
-
- - -
-
-
- -
- -
-

-
- - - - - - - - - - - - - - - Index: c/main/resources/templates/show-blacklisted-users.html =================================================================== --- src/main/resources/templates/show-blacklisted-users.html (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,145 +1,0 @@ - - - - - Reports - - - -
-
-
-
-
-

- Latest

-
-
-
- Start time -
-
-
-
-
- -
- - -
-
-
-

- Reason

-
- -
-

- Start - time

-
-
- -
-
-
-

- Previous

-
-
- Start time - End time -
-
-
-
- -
- -
-
-
-

- Reason

-

- Start - time

-

- End - time

-
-
- -
-
-
-
- - - Index: c/main/resources/templates/show-reports.html =================================================================== --- src/main/resources/templates/show-reports.html (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,221 +1,0 @@ - - - - - - Requests - - - -
-
-
-
-
- - - - -
-
-
-
-
-

- Creator - of - request

-

- Status: - -

-
-
-
-

- Description

-

- Description - of - the - project - goes - here.

-

-

- Created by: - Created by -

-
- - - -
- - -
-
- - -

-
-
- -
-
- - - - - Index: c/main/resources/templates/show-topic.html =================================================================== --- src/main/resources/templates/show-topic.html (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,530 +1,0 @@ - - - - - - - - - - - -
-
-
-
- Error
-

-
-
-
- -
-
-

- Topic - Title

- -
- - - - - Show - reports - - - Show blacklisted users - -
-
- -
- -
-

- Description - of - the - topic - goes - here.

- -
-
    -
  • - - Tag Name -
    - - -
    -     -
    • -
-
-
- - -
- -
- -
- - -
-
- - -
-
- - -
-
-
-
-
-
- - -
-
- - -
- -
-
-
-
-
-
- - -
-
- -
- - - -
-
-
- - - -
- - - -
- - - - - - - - - - - - - - - - Index: c/main/resources/templates/show-user-reports.html =================================================================== --- src/main/resources/templates/show-user-reports.html (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,104 +1,0 @@ - - - - - Users Requests - - - -
-
-
-
-
- - - -
-
-
-
-
-

Creator of request

-

- Status: - -

-
-
-
-

Description

-

Description of the project goes here.

-

-
-
-
- - -
-
-
- - - - - Index: c/test/java/com/db/finki/www/build_board/DemoApplicationTests.java =================================================================== --- src/test/java/com/db/finki/www/build_board/DemoApplicationTests.java (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,13 +1,0 @@ -package com.db.finki.www.build_board; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class DemoApplicationTests { - - @Test - void contextLoads() { - } - -} Index: nnel-skripta-linux/tunnel/tunnel_scripta.sh =================================================================== --- tunnel-skripta-linux/tunnel/tunnel_scripta.sh (revision 34f579826d1475c146faa6836b4ebb85f9647846) +++ (revision ) @@ -1,15 +1,0 @@ -#!/bin/bash -echo "PRED DA JA STARTUVATE SKRIPTATA TREBA VO NEA DA GI STAVITE" -echo "VASHETO KORISNICHKO IME I LOZINKA ZA TUNELOT." -echo "PO STARTUVANJETO, BAZATA KJE BIDE DOSTAPNA NA PORTA LOCALHOST:9999" -echo "AKO SAKATE DA SLUSHA NA DRUGA PORTA, SMENETE JA SKRIPTATA SOODVETNO" -echo "AKO SAKATE DA STOPIRATE (CTRL+C)" -read -p "Press any key to continue ..." - -ssh -v -2 -C -N -L 9999:localhost:5432 t_buildboard@194.149.135.130 - -echo "VRSKATA TREBA DA STOI OTVORENA SE DODEKA IMATE PRISTAP DO SERVEROT" -echo "OVAA PORAKA KAZHUVA DEKA TUNELOT VEKJE SE ZATVORIL" -echo "AKO TOA SE SLUCHILO SAMO OD SEBE, IMATE PROBLEM SO VOSPOSTAVUVANJE" -echo "NA VRSKATA DO SERVEROT (BLOKADA) ILI VI SE POGRESHNI PARAMETRITE" -read -p "Press any key to continue ..."