Merge remote-tracking branch 'origin/main' into develop

depromeet · Feb 15, 2024 · a33d209 · a33d209
2 parents c49ca1e + 736e0bf
commit a33d209
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/main/java/net/teumteum/user/service/UserService.java b/src/main/java/net/teumteum/user/service/UserService.java
@@ -74,7 +74,7 @@ public void addFriends(Long myId, Long friendId) {
         var me = getUser(myId);
         var friend = getUser(friendId);
 
-        me.addFriend(friend);
+        friend.addFriend(me);
     }
 
     @Transactional

diff --git a/src/main/resources/db/migration/V17__alter_alert_type.sql b/src/main/resources/db/migration/V17__alter_alert_type.sql
@@ -0,0 +1,2 @@
+alter table alert drop column type;
+alter table alert add column type enum('BEFORE_MEETING', 'END_MEETING', 'RECOMMEND_USER') not null;
diff --git a/src/test/resources/schema.sql b/src/test/resources/schema.sql
@@ -99,7 +99,7 @@ create table if not exists alert(
     user_id bigint not null,
     title text not null,
     `body` text not null,
-    type enum('BEFORE_MEETING'),
+    type enum('BEFORE_MEETING', 'END_MEETING', 'RECOMMEND_USER'),
     created_at datetime not null,
     updated_at datetime not null,
     is_read boolean not null,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		alter table alert drop column type;
		alter table alert add column type enum('BEFORE_MEETING', 'END_MEETING', 'RECOMMEND_USER') not null;