Skip to content

Commit 5a185d5

Browse files
committed
Hotfix for crashing communication module
1 parent dd4b99a commit 5a185d5

File tree

3 files changed

+4
-16
lines changed

3 files changed

+4
-16
lines changed

feature/metis/conversation/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/feature/metis/conversation/ui/post/PostContextBottomSheet.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.Arrangement
77
import androidx.compose.foundation.layout.Box
88
import androidx.compose.foundation.layout.BoxScope
99
import androidx.compose.foundation.layout.Column
10+
import androidx.compose.foundation.layout.PaddingValues
1011
import androidx.compose.foundation.layout.Row
1112
import androidx.compose.foundation.layout.fillMaxHeight
1213
import androidx.compose.foundation.layout.fillMaxWidth
@@ -78,7 +79,7 @@ internal fun PostContextBottomSheet(
7879
Column(
7980
modifier = Modifier
8081
.fillMaxWidth()
81-
.padding(horizontal = Spacings.ScreenHorizontalSpacing)
82+
.padding(start = Spacings.ScreenHorizontalSpacing, end = Spacings.ScreenHorizontalSpacing, bottom = 40.dp)
8283
) {
8384
postActions.onClickReaction?.let { onClickReaction ->
8485
EmojiReactionBar(

feature/metis/shared/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/feature/metis/shared/db/entities/MetisPostContextEntity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import androidx.room.Index
1414
*/
1515
@Entity(
1616
tableName = "metis_post_context",
17-
primaryKeys = ["client_post_id", "course_id", "conversation_id", "type"],
17+
primaryKeys = ["client_post_id", "course_id", "conversation_id", "type", "server_id"],
1818
foreignKeys = [
1919
ForeignKey(
2020
entity = BasePostingEntity::class,

feature/metis/shared/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/feature/metis/shared/db/entities/PostReactionEntity.kt

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,7 @@ import androidx.room.Index
77

88
@Entity(
99
tableName = "reactions",
10-
primaryKeys = ["post_id", "emoji", "author_id"],
11-
foreignKeys = [
12-
ForeignKey(
13-
entity = BasePostingEntity::class,
14-
parentColumns = ["id"],
15-
childColumns = ["post_id"],
16-
onDelete = ForeignKey.CASCADE
17-
),
18-
ForeignKey(
19-
entity = MetisUserEntity::class,
20-
parentColumns = ["server_id", "id"],
21-
childColumns = ["server_id", "author_id"]
22-
)
23-
],
10+
primaryKeys = ["post_id", "emoji", "author_id", "server_id"],
2411
indices = [Index("server_id", "author_id", name = "server_id_author_id_index")]
2512
)
2613
data class PostReactionEntity(

0 commit comments

Comments
 (0)