Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2,852 changes: 2,852 additions & 0 deletions avy-backend/src/main/resources/log/avyLog.log

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
package com.example.avyproject.converter;

import com.example.avyproject.dto.ChatMessageDto;
import com.example.avyproject.entity.AvyUser;
import com.example.avyproject.entity.ChatMessage;
import com.example.avyproject.service.AvyUserService;
import lombok.RequiredArgsConstructor;
import org.modelmapper.ModelMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component;

import java.util.ArrayList;
import java.util.List;

@Component
@RequiredArgsConstructor
public class ChatMessageDtoConverter {

private final ModelMapper mapper;

@Lazy
@Autowired
private AvyUserService userService;

public ChatMessage dtoToChatMessage(ChatMessageDto chatMessageDto){
ChatMessage chatMessage = mapper.map(chatMessageDto, ChatMessage.class);
AvyUser user = userService.getById(chatMessageDto.getUserId());
chatMessage.setUser(user);
return chatMessage;
}

public ChatMessageDto chatMessageToDto(ChatMessage chatMessage){
ChatMessageDto dto = mapper.map(chatMessage, ChatMessageDto.class);
dto.setUserId(chatMessage.getUser().getId());
return dto;
}

public List<ChatMessageDto> chatMessagesToDtos(List<ChatMessage> chatMessages){
List<ChatMessageDto> chatMessageDtos = new ArrayList<>();
for (ChatMessage chatMessage : chatMessages){
ChatMessageDto dto = mapper.map(chatMessage, ChatMessageDto.class);
dto.setUserId(chatMessage.getUser().getId());
chatMessageDtos.add(dto);
}
return chatMessageDtos;
}
}
19 changes: 19 additions & 0 deletions src/main/java/com/example/avyproject/dto/ChatMessageDto.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package com.example.avyproject.dto;

import lombok.*;

import java.time.LocalDateTime;

@Setter
@Getter
@AllArgsConstructor
@Builder
@NoArgsConstructor
public class ChatMessageDto {

private Long id;
private Long userId;
private String content;
private String messageType;
private LocalDateTime timestamp;
}
33 changes: 33 additions & 0 deletions src/main/java/com/example/avyproject/entity/ChatMessage.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package com.example.avyproject.entity;

import lombok.*;

import javax.persistence.*;
import java.time.LocalDateTime;

@Entity
@Setter
@Getter
@AllArgsConstructor
@Builder
@ToString
@NoArgsConstructor
public class ChatMessage {

@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;

@ManyToOne
@JoinColumn(name = "user_id", nullable = false)
private AvyUser user;

@Column(nullable = false)
private String content;

@Column(nullable = false)
private String messageType;

@Column(nullable = false)
private LocalDateTime timestamp;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package com.example.avyproject.repository;

import com.example.avyproject.entity.ChatMessage;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;

import java.util.List;

@Repository
public interface ChatMessageRepository extends JpaRepository<ChatMessage,Long> {
List<ChatMessage> findByUserId(Long userId);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package com.example.avyproject.service;

import com.example.avyproject.dto.ChatMessageDto;

import java.util.List;

public interface ChatMessageService {

ChatMessageDto createChatMessage(ChatMessageDto chatMessageDto);
List<ChatMessageDto> getAllMessages();
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package com.example.avyproject.service;

import com.example.avyproject.converter.ChatMessageDtoConverter;
import com.example.avyproject.dto.ChatMessageDto;
import com.example.avyproject.entity.ChatMessage;
import com.example.avyproject.repository.ChatMessageRepository;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;

import java.util.List;

@Service
@RequiredArgsConstructor
public class ChatMessageServiceImpl implements ChatMessageService{

private final ChatMessageRepository chatMessageRepository;
private final ChatMessageDtoConverter chatMessageDtoConverter;

@Override
public ChatMessageDto createChatMessage(ChatMessageDto chatMessageDto) {
ChatMessage chatMessage = chatMessageDtoConverter.dtoToChatMessage(chatMessageDto);
chatMessage = chatMessageRepository.save(chatMessage);

return chatMessageDtoConverter.chatMessageToDto(chatMessage);
}

@Override
public List<ChatMessageDto> getAllMessages() {
List<ChatMessage> chatMessages = chatMessageRepository.findAll();
return chatMessageDtoConverter.chatMessagesToDtos(chatMessages);
}
}
Binary file modified target/AVYproject-0.0.1-SNAPSHOT.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,18 @@ com\example\avyproject\enums\AwardType.class
com\example\avyproject\dto\AvyUserConverter$AvyUserConverterBuilder.class
com\example\avyproject\entity\Award.class
com\example\avyproject\controller\AvyModuleController.class
com\example\avyproject\service\ChatMessageService.class
com\example\avyproject\exceptions\ExceptionHandler.class
com\example\avyproject\dto\lesson\TextLessonDto.class
com\example\avyproject\dto\AvyUserDto.class
com\example\avyproject\entity\AvyUser$AvyUserBuilder.class
com\example\avyproject\exceptions\NoFileAttachedException.class
com\example\avyproject\service\AwardService.class
com\example\avyproject\dto\CourseFullDto.class
com\example\avyproject\entity\ChatMessage$ChatMessageBuilder.class
com\example\avyproject\repository\RoleRepository.class
com\example\avyproject\service\JwtService.class
com\example\avyproject\entity\ChatMessage.class
com\example\avyproject\entity\AvyUser.class
com\example\avyproject\controller\TextLessonController.class
com\example\avyproject\entity\Course.class
Expand Down Expand Up @@ -111,6 +114,7 @@ com\example\avyproject\enums\payment\SubscriptionType.class
com\example\avyproject\controller\CourseController.class
com\example\avyproject\dto\AchievementDto.class
com\example\avyproject\service\AuthService.class
com\example\avyproject\dto\ChatMessageDto.class
com\example\avyproject\exceptions\CourseProgressNotFoundException.class
com\example\avyproject\repository\TextLessonRepository.class
com\example\avyproject\dto\OfferDto.class
Expand All @@ -128,6 +132,7 @@ com\example\avyproject\dto\CreateOfferDto.class
com\example\avyproject\dto\CourseDto$CourseDtoBuilder.class
com\example\avyproject\service\LessonProgressService.class
com\example\avyproject\entity\VideoLesson.class
com\example\avyproject\dto\ChatMessageDto$ChatMessageDtoBuilder.class
com\example\avyproject\controller\payment\SubscriptionController.class
com\example\avyproject\dto\AdminUserDto$AdminUserDtoBuilder.class
com\example\avyproject\entity\CourseProgress$CourseProgressBuilder.class
Expand All @@ -141,6 +146,7 @@ com\example\avyproject\controller\ImageController.class
com\example\avyproject\dto\AvyUserAuthDto.class
com\example\avyproject\repository\AchievementRepository.class
com\example\avyproject\entity\Offer$OfferBuilder.class
com\example\avyproject\repository\ChatMessageRepository.class
com\example\avyproject\controller\payment\SessionController.class
com\example\avyproject\repository\AvyModuleRepository.class
com\example\avyproject\service\utility\RelativePathConverter.class
Expand All @@ -156,6 +162,7 @@ com\example\avyproject\dto\CourseFullDto$CourseFullDtoBuilder.class
com\example\avyproject\service\strategy\VideoLessonStrategy.class
com\example\avyproject\converter\OfferDtoConverter.class
com\example\avyproject\repository\CourseRepository.class
com\example\avyproject\converter\ChatMessageDtoConverter.class
com\example\avyproject\service\TextLessonServiceImpl.class
com\example\avyproject\service\ModuleItemService.class
com\example\avyproject\entity\UserProgress.class
Expand Down Expand Up @@ -186,6 +193,7 @@ com\example\avyproject\service\TextLessonService.class
com\example\avyproject\service\RoleService.class
com\example\avyproject\converter\ModuleItemDtoConverter.class
com\example\avyproject\repository\ModuleItemRepository.class
com\example\avyproject\service\ChatMessageServiceImpl.class
com\example\avyproject\entity\Role.class
com\example\avyproject\dto\AvyUserDto$AvyUserDtoBuilder.class
com\example\avyproject\controller\AdminController.class
Expand Down
Loading