Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Peer to peer call with Kurento server #5

Merged
merged 53 commits into from
Dec 30, 2024
Merged
Changes from 1 commit
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
0716b13
[Backend] Expose user field
May 27, 2024
12d07c5
[Backend] Add CI
May 27, 2024
04d9eac
[Backend] Add CI
May 27, 2024
c0cd6da
[Backend] Add CI
May 27, 2024
b785f41
Rename .java to .kt
May 27, 2024
96ec88c
[Backend] Add CI
May 27, 2024
ad7b90a
Merge remote-tracking branch 'origin/develop' into develop
physcom May 27, 2024
22631e4
[Backend] Fix message save
May 27, 2024
3148a22
Merge remote-tracking branch 'origin/develop' into develop
physcom May 27, 2024
21680b6
gemini response fix
physcom May 27, 2024
149c571
[Backend] Fix message save
May 27, 2024
30ac2d2
[Backend] Add endpoint for controller
May 27, 2024
9df44a6
[Backend] Fix message save
Jun 3, 2024
0579435
[Backend] Add ai entities
Jun 4, 2024
d1bbba5
[Backend]
Jun 6, 2024
5a4d50c
[Backend]
Jun 6, 2024
2b3c4ff
attachment fix
physcom Jun 6, 2024
45a9942
Merge remote-tracking branch 'origin/AI-modeling' into AI-modeling
physcom Jun 6, 2024
a5ac30f
permit attachment download url
physcom Jun 12, 2024
4b9ddf2
fixed message attachment save
physcom Jun 12, 2024
536ef75
[Backend]
Jun 13, 2024
05e5163
[Backend]
Jun 20, 2024
9b97c09
[Backend]
Jun 20, 2024
8687c01
[Backend]
Jun 24, 2024
790491c
[Backend]
Aug 7, 2024
8ac0a9b
Ws server
borbuevbeksultan Nov 4, 2024
03c7647
Add Kurento module
borbuevbeksultan Nov 20, 2024
e890c51
Remove old build script
borbuevbeksultan Nov 20, 2024
8714926
Add new workflow
borbuevbeksultan Nov 20, 2024
535de51
Add new workflow
borbuevbeksultan Nov 20, 2024
d1f018c
Add new workflow
borbuevbeksultan Nov 20, 2024
9ccb23d
Add new workflow
borbuevbeksultan Nov 20, 2024
37e22b1
Add new workflow
borbuevbeksultan Nov 20, 2024
47d7fe8
Add new workflow
borbuevbeksultan Nov 20, 2024
0ff605d
Add new workflow
borbuevbeksultan Nov 20, 2024
ac704a1
Add new workflow
borbuevbeksultan Nov 20, 2024
b606a21
Add new workflow
borbuevbeksultan Nov 20, 2024
7cf3af8
Add new workflow
borbuevbeksultan Nov 20, 2024
f9dbfbb
Add new workflow
borbuevbeksultan Nov 20, 2024
dced6ec
Add new workflow
borbuevbeksultan Nov 20, 2024
deba1af
Add new workflow
borbuevbeksultan Nov 21, 2024
9f8117c
Add new workflow
borbuevbeksultan Nov 21, 2024
f2ac5ff
Add new workflow
borbuevbeksultan Nov 21, 2024
f8d3f3e
Add new workflow
borbuevbeksultan Nov 21, 2024
ee9f8eb
Add new workflow
borbuevbeksultan Nov 21, 2024
6bda1c4
Add new workflow
borbuevbeksultan Nov 21, 2024
715d502
Add new workflow
borbuevbeksultan Nov 21, 2024
f1e80c5
Add group call
borbuevbeksultan Nov 25, 2024
3535008
Add group call
borbuevbeksultan Nov 25, 2024
5d21906
One to one call
borbuevbeksultan Dec 5, 2024
4a336c1
Recording mixed file
borbuevbeksultan Dec 9, 2024
87233cf
Recording mixed file
borbuevbeksultan Dec 30, 2024
b4acb51
Recording mixed file
borbuevbeksultan Dec 30, 2024
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
Prev Previous commit
Next Next commit
[Backend] Fix message save
Beksultan committed May 27, 2024
commit 149c5716aae55ce3b6b19e243c5cdb19d8fc6a9c
Original file line number Diff line number Diff line change
@@ -6,6 +6,8 @@ import lombok.RequiredArgsConstructor
import org.springframework.jdbc.core.RowMapper
import org.springframework.jdbc.core.namedparam.MapSqlParameterSource
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations
import org.springframework.jdbc.support.GeneratedKeyHolder
import org.springframework.jdbc.support.KeyHolder
import org.springframework.stereotype.Repository
import java.sql.ResultSet

@@ -159,7 +161,7 @@ class MessageRepository(
)
}

fun save(message: MessageEntity) {
fun save(message: MessageEntity): Int {
val sql = """
INSERT INTO message(private_chat_id, group_chat_id, body, content_type, sender, recipient, received_at, sent_at)
VALUES (:privateChatId, :groupChatId, :body, :content_type, :sender, :recipient, :receivedAt, :sentAt)
@@ -174,7 +176,11 @@ class MessageRepository(
.addValue("content_type", message.contentType.name)
.addValue("receivedAt", message.receivedAt)
.addValue("sentAt", message.sentAt)
jdbcOperations!!.update(sql, parameterSource)

val keyHolder = GeneratedKeyHolder()
jdbcOperations.update(sql, parameterSource, keyHolder)

return keyHolder.keys?.get("id") as Int
}

fun findGroupMessages(username: String?): List<MessageEntity> {
@@ -200,7 +206,7 @@ class MessageRepository(
""".trimIndent()
val parameterSource = MapSqlParameterSource()
.addValue("user", username)
return jdbcOperations!!.query(
return jdbcOperations.query(
sql,
parameterSource,
groupMessageSelectMapper()
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ package io.openfuture.openmessanger.repository.entity
import java.time.LocalDateTime

class MessageEntity {
var id = 0
var id: Int = 0
var body: String?
var sender: String
var recipient: String? = null
Original file line number Diff line number Diff line change
@@ -134,16 +134,16 @@ class MessageServiceImpl(
LocalDateTime.now(),
privateChat.id
)
messageRepository.save(responseMessage)
val id = messageRepository.save(responseMessage)
return MessageResponse(
message.id,
message.sender,
message.recipient!!,
id,
responseMessage.sender,
responseMessage.recipient!!,
response!!,
message.contentType,
message.receivedAt!!,
message.sentAt,
message.privateChatId!!,
responseMessage.contentType,
responseMessage.receivedAt!!,
responseMessage.sentAt,
responseMessage.privateChatId!!,
null
)
}
Loading