Merge pull request #41 from insea-connect/bot

Bot
insea-connect · May 23, 2024 · 865c00b · 865c00b
2 parents 87029ab + 23cf01f
commit 865c00b
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 44 deletions.
diff --git a/packages/insea-connect-backend/src/main/java/ma/insea/connect/ConnectApplication.java b/packages/insea-connect-backend/src/main/java/ma/insea/connect/ConnectApplication.java
@@ -1,23 +1,9 @@
 package ma.insea.connect;
 
-import ma.insea.connect.keycloak.DTO.AddKeycloakDTO;
-import ma.insea.connect.keycloak.controller.KeyCloakController;
-import ma.insea.connect.user.DTO.AddUserDTO;
-import ma.insea.connect.user.Role;
-import ma.insea.connect.user.UserController;
-
-
-import org.hibernate.mapping.List;
-import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Profile;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
-import org.springframework.security.crypto.password.PasswordEncoder;
 
-import ma.insea.connect.user.User;
-import ma.insea.connect.user.UserRepository;
 @SpringBootApplication
 @EnableJpaAuditing
 public class ConnectApplication {
@@ -26,23 +12,4 @@ public static void main(String[] args) {
 		SpringApplication.run(ConnectApplication.class, args);
 	}
 
-	// @Profile("dev")
-	// @Bean
-	// public CommandLineRunner addAdmin(UserController userController, KeyCloakController keyCloakController) {
-	// 	return args -> {
-	// 		AddUserDTO user = AddUserDTO.builder()
-	// 				.username("admin")
-	// 				.email("[email protected]")
-	// 				.firstName("admin")
-	// 				.lastName("admin")
-	// 				.role(Role.ADMIN)
-	// 				.password("admin")
-
-	// 				.build();
-	// 		System.out.println("here it is "+AddKeycloakDTO.mapToAddKeycloakDTO(user).toString());
-	// 		userController.addUser1(user);
-
-
-	// 	};
-	// }
 }
diff --git a/packages/insea-connect-backend/src/main/java/ma/insea/connect/utils/DummyUserLoader.java b/packages/insea-connect-backend/src/main/java/ma/insea/connect/utils/DummyUserLoader.java
@@ -1,15 +1,11 @@
 package ma.insea.connect.utils;
 
-import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Component;
 
 import lombok.AllArgsConstructor;
-import lombok.RequiredArgsConstructor;
 import ma.insea.connect.chat.common.chatMessage.ChatMessage;
 import ma.insea.connect.chat.common.chatMessage.ChatMessageRepository;
 import ma.insea.connect.chat.common.chatMessage.GroupMessage;
@@ -22,12 +18,10 @@
 import ma.insea.connect.chat.group.MembershipKey;
 import ma.insea.connect.chat.group.MembershipRepository;
 import ma.insea.connect.keycloak.DTO.AddKeycloakDTO;
-import ma.insea.connect.user.DegreePath;
 import ma.insea.connect.user.Role;
 import ma.insea.connect.user.User;
 import ma.insea.connect.user.UserController;
 import ma.insea.connect.user.UserRepository;
-import ma.insea.connect.user.UserService;
 import ma.insea.connect.user.DTO.AddUserDTO;
 
 @Component
@@ -36,7 +30,6 @@
 public class DummyUserLoader implements CommandLineRunner {
 
     private final UserController userController;
-    private final UserService userService;
     private final UserRepository userRepository;
     private final GroupRepository groupRepository;
     private final MembershipRepository membershipRepository;
@@ -125,6 +118,17 @@ private void loadDummyUsers(UserRepository userRepository,GroupRepository groupR
 			System.out.println("here it is "+AddKeycloakDTO.mapToAddKeycloakDTO(user6).toString());
 			userController.addUser1(user6);
 
+            AddUserDTO bot = AddUserDTO.builder()
+					.username("bot")
+					.email("[email protected]")
+					.firstName("bot")
+					.lastName("bot")
+					.role(Role.ADMIN)
+					.password("admin")
+
+					.build();
+			userController.addUser1(bot);
+
 
 
             User anas =userRepository.findByUsername("anas").get();
@@ -133,8 +137,18 @@ private void loadDummyUsers(UserRepository userRepository,GroupRepository groupR
             User mohammed =userRepository.findByUsername("mohammed").get();
             User ahmed =userRepository.findByUsername("ahmed").get();
             User saad =userRepository.findByUsername("saad").get();
-
-
+            User the_bot =userRepository.findByUsername("bot").get();
+
+            List<User> users = List.of(anas,hamza,soulayman,mohammed,saad);
+            //initialize conversation with the bot
+            for(User u:users){
+                var chatId = getChatRoomId(Long.toString(u.getId()),Long.toString(the_bot.getId()), true);
+                Conversation conversation = new Conversation();
+                conversation.setChatId(chatId);
+                conversation.setMember1(u);
+                conversation.setMember2(the_bot);
+                conversationRepository.save(conversation);
+            }
 
             Group group = new Group();
             group.setName("1A dse");

diff --git a/packages/insea-connect-backend/src/main/java/ma/insea/connect/utils/Functions.java b/packages/insea-connect-backend/src/main/java/ma/insea/connect/utils/Functions.java
@@ -8,9 +8,7 @@
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
 import lombok.RequiredArgsConstructor;