Index: docs/buildboard-ddl.sql
===================================================================
--- docs/buildboard-ddl.sql (revision 5cad1def03cc15d467828e6f6469d1b47224f6b0)
+++ docs/buildboard-ddl.sql (revision 3ccd81931d7e2bb606e6c2b830a8a67db06fc6a5)
@@ -116,4 +116,5 @@
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,
@@ -122,5 +123,5 @@
end_date TIMESTAMP,
reason TEXT,
- PRIMARY KEY (user_id, moderator_id, topic_id, start_date)
+ UNIQUE (user_id, moderator_id, topic_id, start_date)
);
Index: docs/versioning/er_models/ER_BUILD_BOARD_v5.1.xml
===================================================================
--- docs/versioning/er_models/ER_BUILD_BOARD_v5.1.xml (revision 5cad1def03cc15d467828e6f6469d1b47224f6b0)
+++ docs/versioning/er_models/ER_BUILD_BOARD_v5.1.xml (revision 3ccd81931d7e2bb606e6c2b830a8a67db06fc6a5)
@@ -1,1 +1,1 @@
-RECIEVESPROJECT_THREADIS_MODERATED_BYStarted_atTHREADtrue16dTOPIC_THREADUSER33DEVELOPERtrue16oPROJECT_OWNERPERMISSIONSDOUBLE3HASDOUBLE3CHANNEL3NCONSTRUCTS3NIS_CREATED_BY3NMODERATORtruetrueNamePasswordContentASSOCIATED_WITHNRegister_at3trueNameSENDS_MESSAGE_INNContentStarted_atEnded_atSent_atTAGCREATESASSISGNED_TONtruetrueNameDescriptionLIKESNIs_active3NSexDescriptionSUBBMITTED_BYSUBMISSION3MABOUTREPORT3NFOR_MISCONDUCTtruetrueIdPROJECT_REQUEST3NStatusDescriptionReasonIS_ASSIGNEDNDISCUSSION_THREADTitleTitleP3NRepo_urlDOUBLE3BLACKLISTED_USERDOUBLE3BLACKLISTED_BYDOUBLE3REFERS_TODOUBLE3BLACKLISTED_FROM3N3trueStart_dateEnd_date3N3NQtruetrueIdDOUBLE3FEEDBACKDescriptionSubmission_typeCreated_atWRITTEN_BYtruetrueIdDOUBLE3SUBBMITED_FOR3DOUBLE3GuidelinesCreated_atCreated_atEmailNameUernametrue16d333N3MEMBEDDABLEREFERENCED_BYMCONTAINED_IN3Ntrue16d3M3N3M33PROJECT_RESOURCEtruetrueidIS_A_CHANNEL3DOUBLE3ROLE_PERMISSIONSDOUBLE3FOR_ROLE3DOUBLE3FOR_PERMISSION3Noverride_typeFOR_RESOURCENMPROJECT_ROLEVALID_IN3N3truetrueidnameNMSent_at
+NametruetrueIdRECIEVESPROJECT_THREADIS_MODERATED_BYTHREADtrue16dTOPIC_THREADUSER33DEVELOPERtrue16oPROJECT_OWNERPERMISSIONSCONSTRUCTSIS_CREATED_BY3NMODERATORtruetrueNamePasswordContentASSOCIATED_WITHNRegister_atSENDS_MESSAGE_INContentStarted_atEnded_atSent_atTAGCREATESASSISGNED_TONtruetrueNameDescriptionLIKESNIs_active3NSexDescriptionSUBBMITTED_BYSUBMISSION3MABOUTREPORT3NFOR_MISCONDUCTtruetrueIdPROJECT_REQUEST3NStatusDescriptionReasonIS_ASSIGNEDNDISCUSSION_THREADTitleTitleN3NRepo_urlEnd_dateMtruetrueIdDOUBLE3FEEDBACKDescriptionSubmission_typeCreated_atWRITTEN_BYtruetrueIdDOUBLE3SUBBMITED_FOR3DOUBLE3GuidelinesCreated_atCreated_atEmailNameUernametrue16d333N3MEMBEDDABLEREFERENCED_BYMCONTAINED_IN3Ntrue16d3N3N3M33DOUBLE3ROLE_PERMISSIONSDOUBLE3FOR_ROLE3DOUBLE3FOR_PERMISSION3Noverride_typePROJECT_ROLEVALID_IN3NtruetrueidnameNMCHANNEL3MHAS3MFOR_RESOURCE3NtruetrueIdStart_dateBLACKLISTED_USERBLACKLISTED_BY3NRFERS_TO3MBLACKLISTED_FROM3MP
Index: docs/versioning/er_models/ER_BUILD_BOARD_v5.2.xml
===================================================================
--- docs/versioning/er_models/ER_BUILD_BOARD_v5.2.xml (revision 3ccd81931d7e2bb606e6c2b830a8a67db06fc6a5)
+++ docs/versioning/er_models/ER_BUILD_BOARD_v5.2.xml (revision 3ccd81931d7e2bb606e6c2b830a8a67db06fc6a5)
@@ -0,0 +1,1 @@
+NametruetrueIdRECIEVESPROJECT_THREADIS_MODERATED_BYTHREADtrue16dTOPIC_THREADUSER33DEVELOPERtrue16oPROJECT_OWNERPERMISSIONSCONSTRUCTSIS_CREATED_BY3NMODERATORtruetrueNamePasswordContentASSOCIATED_WITHNRegister_atContentStarted_atEnded_atTAGCREATESASSISGNED_TONtruetrueNameDescriptionLIKESNIs_active3NSexDescriptionSUBBMITTED_BYSUBMISSION3MABOUTREPORT3NFOR_MISCONDUCTtruetrueIdPROJECT_REQUEST3NStatusDescriptionReasonIS_ASSIGNEDNDISCUSSION_THREADTitleTitleN3NRepo_urlEnd_datetruetrueIdDOUBLE3FEEDBACKDescriptionSubmission_typeCreated_atWRITTEN_BYtruetrueIdDOUBLE3SUBBMITED_FOR3DOUBLE3GuidelinesCreated_atCreated_atEmailNameUernametrue16d333N3MEMBEDDABLEREFERENCED_BYMCONTAINED_IN3Ntrue16d3N3N3M33DOUBLE3ROLE_PERMISSIONSDOUBLE3FOR_ROLE3DOUBLE3FOR_PERMISSION3Noverride_typePROJECT_ROLEVALID_IN3NtruetrueidnameNMCHANNEL3NHAS3MFOR_RESOURCE3NtruetrueIdStart_dateBLACKLISTED_USERBLACKLISTED_BY3NRFERS_TO3MBLACKLISTED_FROM3MDOUBLE3MESSAGE3trueSent_atDOUBLE3SENT_INDOUBLE3SENT_BY3M3M
Index: docs/versioning/er_models/ER_BUILD_BOARD_v5.3.xml
===================================================================
--- docs/versioning/er_models/ER_BUILD_BOARD_v5.3.xml (revision 3ccd81931d7e2bb606e6c2b830a8a67db06fc6a5)
+++ docs/versioning/er_models/ER_BUILD_BOARD_v5.3.xml (revision 3ccd81931d7e2bb606e6c2b830a8a67db06fc6a5)
@@ -0,0 +1,1 @@
+NametruetrueIdRECIEVESPROJECT_THREADIS_MODERATED_BYTHREADtrue16dTOPIC_THREADUSER33DEVELOPERtrue16oPROJECT_OWNERPERMISSIONSCONSTRUCTSIS_CREATED_BY3NMODERATORtruetrueNamePasswordContentASSOCIATED_WITHNRegister_atContentStarted_atEnded_atTAGCREATESASSISGNED_TONtruetrueNameDescriptionLIKESNIs_active3NSexDescriptionSUBBMITTED_BYSUBMISSION3MABOUTREPORT3NFOR_MISCONDUCTtruetrueIdPROJECT_REQUEST3NStatusDescriptionReasonIS_ASSIGNEDNDISCUSSION_THREADTitleTitleN3NRepo_urlEnd_datetruetrueIdDOUBLE3FEEDBACKDescriptionSubmission_typeCreated_atWRITTEN_BYtruetrueIdDOUBLE3SUBBMITED_FOR3DOUBLE3GuidelinesCreated_atCreated_atEmailNameUernametrue16d333N3MEMBEDDABLEREFERENCED_BYMCONTAINED_IN3Ntrue16d3N3N3M33DOUBLE3ROLE_PERMISSIONSDOUBLE3FOR_ROLE3DOUBLE3FOR_PERMISSION3Noverride_typePROJECT_ROLEVALID_IN3NtruetrueidnameNMCHANNEL3NHAS3MFOR_RESOURCE3NtruetrueIdStart_dateBLACKLISTED_USERBLACKLISTED_BY3NRFERS_TO3MBLACKLISTED_FROM3MDOUBLE3MESSAGE3trueSent_atDOUBLE3SENT_INDOUBLE3SENT_BY3M3M
Index: src/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 5cad1def03cc15d467828e6f6469d1b47224f6b0)
+++ src/main/java/com/db/finki/www/build_board/controller/channel/ChannelWebSocketController.java (revision 3ccd81931d7e2bb606e6c2b830a8a67db06fc6a5)
@@ -49,8 +49,8 @@
messageDTO.setSentAt(LocalDateTime.now());
- Message m = messageService.save(messageDTO);
- MessageDTO rabotaj = messageMapper.toDTO(m);
- rabotaj.setAvatarUrl(m.getSentBy().getAvatarUrl());
- return rabotaj;
+ Message m = messageService.addMessage(messageDTO);
+ MessageDTO newMessage = messageMapper.toDTO(m);
+ newMessage.setAvatarUrl(m.getSentBy().getAvatarUrl());
+ return newMessage;
}
}
Index: src/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 5cad1def03cc15d467828e6f6469d1b47224f6b0)
+++ src/main/java/com/db/finki/www/build_board/entity/channel/Message.java (revision 3ccd81931d7e2bb606e6c2b830a8a67db06fc6a5)
@@ -20,11 +20,9 @@
@AllArgsConstructor
public class Message {
- @Id
- @Column(name = "channel_name")
- private String name;
+
@Id
@ManyToOne
- @JoinColumn(name = "project_id",referencedColumnName = "id",nullable = false)
- private Project project;
+ @JoinColumn(name = "channel_id",referencedColumnName = "id")
+ private Channel channel;
@Id
@ManyToOne
Index: src/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 5cad1def03cc15d467828e6f6469d1b47224f6b0)
+++ src/main/java/com/db/finki/www/build_board/entity/compositeId/MessageId.java (revision 3ccd81931d7e2bb606e6c2b830a8a67db06fc6a5)
@@ -6,24 +6,23 @@
import java.time.LocalDateTime;
import java.util.Objects;
+import java.util.UUID;
@Getter
@Setter
public class MessageId {
- private String name;
- private int project;
- private int sentBy;
- private LocalDateTime sentAt;
+ private UUID channel;
+ private int sentBy;
+ private LocalDateTime sentAt;
@Override
public boolean equals(Object o) {
- if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
MessageId messageId = (MessageId) o;
- return project == messageId.project && sentBy == messageId.sentBy && Objects.equals(name, messageId.name) && Objects.equals(sentAt, messageId.sentAt);
+ return sentBy == messageId.sentBy && Objects.equals(channel, messageId.channel) && Objects.equals(sentAt, messageId.sentAt);
}
@Override
public int hashCode() {
- return Objects.hash(name, project, sentBy, sentAt);
+ return Objects.hash(channel, sentBy, sentAt);
}
}
Index: src/main/java/com/db/finki/www/build_board/mapper/MessageMapper.java
===================================================================
--- src/main/java/com/db/finki/www/build_board/mapper/MessageMapper.java (revision 5cad1def03cc15d467828e6f6469d1b47224f6b0)
+++ src/main/java/com/db/finki/www/build_board/mapper/MessageMapper.java (revision 3ccd81931d7e2bb606e6c2b830a8a67db06fc6a5)
@@ -2,8 +2,10 @@
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;
@@ -16,13 +18,15 @@
private final ProjectService projectService;
private final DeveloperRepository developerRepository;
+ private final ChannelService channelService;
- public MessageMapper(ProjectService projectService, DeveloperRepository developerRepository) {
+ 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.getName(),message.getContent(),message.getSentBy().getUsername(),message.getSentAt(),message.getProject().getId(),message.getSentBy().getAvatarUrl());
+ return new MessageDTO(message.getChannel().getName(),message.getContent(),message.getSentBy().getUsername(),message.getSentAt(),message.getChannel().getProject().getId(),message.getSentBy().getAvatarUrl());
}
@@ -36,5 +40,7 @@
Developer d = developerRepository.findByUsername(dto.getSenderUsername());
Project p = projectService.getById((long)dto.getProjectId());
- return new Message(dto.getChannelName(),p,d,dto.getSentAt(), dto.getContent());
+ Channel c = channelService.getByNameAndProject(dto.getChannelName(),p);
+
+ return new Message(c,d,dto.getSentAt(), dto.getContent());
}
Index: src/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 5cad1def03cc15d467828e6f6469d1b47224f6b0)
+++ src/main/java/com/db/finki/www/build_board/repository/access_managment/ProjectRoleRepository.java (revision 3ccd81931d7e2bb606e6c2b830a8a67db06fc6a5)
@@ -15,3 +15,4 @@
List findAllByNameInAndProject(List roleNames,Project project);
+ ProjectRole findByNameAndProject(String roleName,Project project);
}
Index: src/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 5cad1def03cc15d467828e6f6469d1b47224f6b0)
+++ src/main/java/com/db/finki/www/build_board/repository/channel/MessageRepository.java (revision 3ccd81931d7e2bb606e6c2b830a8a67db06fc6a5)
@@ -1,4 +1,5 @@
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;
@@ -6,8 +7,8 @@
import org.springframework.stereotype.Repository;
+import java.time.LocalDateTime;
import java.util.List;
@Repository
public interface MessageRepository extends JpaRepository {
- List findAllByNameAndProjectIdOrderBySentAtAsc(String channelName, Integer projectId);
-}
+ List findAllByChannelNameAndChannelProjectIdOrderBySentAtAsc(String channelName, Integer projectId);}
Index: src/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 5cad1def03cc15d467828e6f6469d1b47224f6b0)
+++ src/main/java/com/db/finki/www/build_board/service/access_managment/ProjectAccessManagementService.java (revision 3ccd81931d7e2bb606e6c2b830a8a67db06fc6a5)
@@ -179,6 +179,7 @@
}
+
public void deleteRoleForUser(BBUser user, Project project, String roleName) {
- ProjectRole role = new ProjectRole(project, roleName);
+ ProjectRole role = projectRoleRepository.findByNameAndProject(roleName,project);
userProjectRoleRepository.deleteById(new UsersProjectRolesId(role, user));
}
Index: src/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 5cad1def03cc15d467828e6f6469d1b47224f6b0)
+++ src/main/java/com/db/finki/www/build_board/service/channel/MessageService.java (revision 3ccd81931d7e2bb606e6c2b830a8a67db06fc6a5)
@@ -19,7 +19,7 @@
public List getAllMessagesForProjectChannel(Integer projectId,String channelName) {
- return messageRepository.findAllByNameAndProjectIdOrderBySentAtAsc(channelName,projectId);
+ return messageRepository.findAllByChannelNameAndChannelProjectIdOrderBySentAtAsc(channelName,projectId);
}
- public Message save(MessageDTO messageDTO) {
+ public Message addMessage(MessageDTO messageDTO) {
Message message = messageMapper.fromDTO(messageDTO);
return messageRepository.save(message);
Index: src/main/resources/db/migration/V1__init_ddl.sql
===================================================================
--- src/main/resources/db/migration/V1__init_ddl.sql (revision 5cad1def03cc15d467828e6f6469d1b47224f6b0)
+++ src/main/resources/db/migration/V1__init_ddl.sql (revision 3ccd81931d7e2bb606e6c2b830a8a67db06fc6a5)
@@ -233,11 +233,8 @@
sent_at TIMESTAMP NOT NULL,
content VARCHAR(200) NOT NULL,
- sent_by INT REFERENCES developer (id) NOT NULL,
- project_id INT NOT NULL,
- channel_name VARCHAR(64) NOT NULL,
- FOREIGN KEY (channel_name, project_id)
- REFERENCES channel (name, project_id) ON DELETE CASCADE,
- PRIMARY KEY (channel_name, project_id, sent_at, sent_by)
-);
-
-
+ sent_by INT REFERENCES developer (id) on delete no action NOT NULL,
+ channel_id uuid references channel(id) ON DELETE CASCADE NOT NULL,
+ PRIMARY KEY (channel_id,sent_by,sent_at)
+);
+
+
Index: src/main/resources/db/migration/V5__add_test_data.sql
===================================================================
--- src/main/resources/db/migration/V5__add_test_data.sql (revision 5cad1def03cc15d467828e6f6469d1b47224f6b0)
+++ src/main/resources/db/migration/V5__add_test_data.sql (revision 3ccd81931d7e2bb606e6c2b830a8a67db06fc6a5)
@@ -102,8 +102,4 @@
('Updates', 'Project updates channel', 5, 3);
-INSERT INTO messages (sent_at, content, sent_by, project_id, channel_name)
-VALUES
- (NOW(), 'Zdravo. Ova e real-time chat za dopisuvanje', 3, 5, 'General'),
- (NOW(), 'Resen ladno a?', 3, 5, 'Updates');
---------------- NOV TEST DATA
@@ -220,17 +216,11 @@
('Ideas', 'Feature ideas', 18, 9); -- Created by user9 for Project 4
--- Add new messages (only users associated with the project can send messages)
-INSERT INTO messages (sent_at, content, sent_by, project_id, channel_name)
-VALUES
- (NOW(), 'Welcome to Project 3!', 6, 14, 'General'), -- Sent by user6 in Project 3
- (NOW(), 'Found a bug in the login module.', 7, 14, 'Bugs'), -- Sent by user7 in Project 3
- (NOW(), 'Let’s discuss new features.', 8, 18, 'General'), -- Sent by user8 in Project 4
- (NOW(), 'I have an idea for a new feature.', 9, 18, 'Ideas'); -- Sent by user9 in Project 4
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+