Commit 7f3dfc26 authored by Matthieu Tanon's avatar Matthieu Tanon

Fix chatRoomId refactoring, selectGenericConferenceEvent and selectGenericConferenceNotifiedEvent

parent f566cb70
......@@ -60,18 +60,18 @@ private:
const tm &creationTime
);
long long insertChatRoom (const std::shared_ptr<AbstractChatRoom> &chatRoom, unsigned int notifyId = 0);
long long insertChatRoomParticipant (long long conferenceId, long long participantSipAddressId, bool isAdmin);
long long insertChatRoomParticipant (long long chatRoomId, long long participantSipAddressId, bool isAdmin);
void insertChatRoomParticipantDevice (long long participantId, long long participantDeviceSipAddressId);
void insertChatMessageParticipant (long long chatMessageId, long long sipAddressId, int state, time_t stateChangeTime);
long long selectSipAddressId (const std::string &sipAddress) const;
long long selectChatRoomId (long long peerSipAddressId, long long localSipAddressId) const;
long long selectChatRoomId (const ConferenceId &conferenceId) const;
long long selectChatRoomParticipantId (long long conferenceId, long long participantSipAddressId) const;
long long selectChatRoomParticipantId (long long chatRoomId, long long participantSipAddressId) const;
long long selectOneToOneChatRoomId (long long sipAddressIdA, long long sipAddressIdB, bool encrypted) const;
void deleteContents (long long chatMessageId);
void deleteChatRoomParticipant (long long conferenceId, long long participantSipAddressId);
void deleteChatRoomParticipant (long long chatRoomId, long long participantSipAddressId);
void deleteChatRoomParticipantDevice (long long participantId, long long participantDeviceSipAddressId);
// ---------------------------------------------------------------------------
......@@ -98,7 +98,7 @@ private:
const soci::row &row
) const;
std::shared_ptr<EventLog> selectGenericConferenceNotifiedEvent (
std::shared_ptr<EventLog> selectConferenceInfoEvent (
const ConferenceId &conferenceId,
const soci::row &row
) const;
......@@ -146,12 +146,12 @@ private:
) const;
long long insertEvent (const std::shared_ptr<EventLog> &eventLog);
long long insertConferenceEvent (const std::shared_ptr<EventLog> &eventLog, long long *conferenceId = nullptr);
long long insertConferenceEvent (const std::shared_ptr<EventLog> &eventLog, long long *chatRoomId = nullptr);
long long insertConferenceCallEvent (const std::shared_ptr<EventLog> &eventLog);
long long insertConferenceChatMessageEvent (const std::shared_ptr<EventLog> &eventLog);
void updateConferenceChatMessageEvent(const std::shared_ptr<EventLog> &eventLog);
long long insertConferenceNotifiedEvent (const std::shared_ptr<EventLog> &eventLog, long long *conferenceId = nullptr);
long long insertConferenceParticipantEvent (const std::shared_ptr<EventLog> &eventLog, long long *conferenceId = nullptr);
long long insertConferenceNotifiedEvent (const std::shared_ptr<EventLog> &eventLog, long long *chatRoomId = nullptr);
long long insertConferenceParticipantEvent (const std::shared_ptr<EventLog> &eventLog, long long *chatRoomId = nullptr);
long long insertConferenceParticipantDeviceEvent (const std::shared_ptr<EventLog> &eventLog);
long long insertConferenceSubjectEvent (const std::shared_ptr<EventLog> &eventLog);
long long insertConferenceSecurityEvent (const std::shared_ptr<EventLog> &eventLog);
......@@ -173,7 +173,7 @@ private:
std::shared_ptr<EventLog> getEventFromCache (long long storageId) const;
std::shared_ptr<ChatMessage> getChatMessageFromCache (long long storageId) const;
void invalidConferenceEventsFromQuery (const std::string &query, long long conferenceId);
void invalidConferenceEventsFromQuery (const std::string &query, long long chatRoomId);
// ---------------------------------------------------------------------------
// Versions.
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment