mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-28 08:39:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(MainDb): supports notify id in database

Browse source
This commit is contained in:
Ronan Abhamon 2017-10-17 17:02:41 +02:00
parent 8906a4d89b
commit 3a1a899c83
3 changed files with 38 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/c-wrapper/api/c-event-log.cpp
View file

@ -23,9 +23,7 @@
#include "c-wrapper/c-wrapper.h"
#include "call/call.h"
#include "chat/chat-message/chat-message.h"
#include "event-log/call/call-event.h"
#include "event-log/chat/chat-message-event.h"
#include "event-log/conference/conference-participant-event.h"
#include "event-log/events.h"
// =============================================================================

1
src/db/main-db-p.h
View file

@ -71,6 +71,7 @@ private:
long insertCallEvent (const EventLog &eventLog);
long insertMessageEvent (const EventLog &eventLog);
long insertConferenceEvent (const EventLog &eventLog);
long insertConferenceNotifiedEvent (const EventLog &eventLog);
long insertConferenceParticipantEvent (const EventLog &eventLog);
long insertConferenceParticipantDeviceEvent (const EventLog &eventLog);
long insertConferenceSubjectEvent (const EventLog &eventLog);

54
src/db/main-db.cpp
View file

@ -31,10 +31,7 @@
#include "content/content-type.h"
#include "content/content.h"
#include "db/session/db-session-provider.h"
#include "event-log/call/call-event.h"
#include "event-log/chat/chat-message-event.h"
#include "event-log/conference/conference-participant-device-event.h"
#include "event-log/conference/conference-subject-event.h"
#include "event-log/events.h"
#include "event-log/event-log-p.h"
#include "logger/logger.h"
#include "main-db-p.h"
@ -266,14 +263,25 @@ MainDb::MainDb () : AbstractDb(*new MainDbPrivate) {}
return eventId;
}
long MainDbPrivate::insertConferenceParticipantEvent (const EventLog &eventLog) {
long MainDbPrivate::insertConferenceNotifiedEvent (const EventLog &eventLog) {
long eventId = insertConferenceEvent(eventLog);
soci::session *session = dbSession.getBackendSession<soci::session>();
*session << "INSERT INTO conference_notified_event (event_id, notify_id)"
" VALUES (:eventId, :notifyId)", soci::use(eventId), soci::use(
static_cast<const ConferenceNotifiedEvent &>(eventLog).getNotifyId()
);
return eventId;
}
long MainDbPrivate::insertConferenceParticipantEvent (const EventLog &eventLog) {
long eventId = insertConferenceNotifiedEvent(eventLog);
long participantAddressId = insertSipAddress(
static_cast<const ConferenceParticipantEvent &>(eventLog).getParticipantAddress().asString()
);
soci::session *session = dbSession.getBackendSession<soci::session>();
*session << "INSERT INTO conference_participant_event (conference_event_id, participant_address_id)"
*session << "INSERT INTO conference_participant_event (event_id, participant_address_id)"
" VALUES (:eventId, :participantAddressId)", soci::use(eventId), soci::use(participantAddressId);
return eventId;
}
@ -285,16 +293,16 @@ MainDb::MainDb () : AbstractDb(*new MainDbPrivate) {}
);
soci::session *session = dbSession.getBackendSession<soci::session>();
*session << "INSERT INTO conference_participant_device_event (conference_participant_event_id, gruu_address_id)"
*session << "INSERT INTO conference_participant_device_event (event_id, gruu_address_id)"
" VALUES (:eventId, :gruuAddressId)", soci::use(eventId), soci::use(gruuAddressId);
return eventId;
}
long MainDbPrivate::insertConferenceSubjectEvent (const EventLog &eventLog) {
long eventId = insertConferenceEvent(eventLog);
long eventId = insertConferenceNotifiedEvent(eventLog);
soci::session *session = dbSession.getBackendSession<soci::session>();
*session << "INSERT INTO conference_subject_event (conference_event_id, subject)"
*session << "INSERT INTO conference_subject_event (event_id, subject)"
" VALUES (:eventId, :subject)", soci::use(eventId), soci::use(
static_cast<const ConferenceSubjectEvent &>(eventLog).getSubject()
);
@ -406,13 +414,23 @@ MainDb::MainDb () : AbstractDb(*new MainDbPrivate) {}
" ON DELETE CASCADE"
")";
*session <<
"CREATE TABLE IF NOT EXISTS conference_notified_event ("
" event_id INT UNSIGNED PRIMARY KEY,"
" notify_id INT UNSIGNED NOT NULL,"
" FOREIGN KEY (event_id)"
" REFERENCES conference_event(event_id)"
" ON DELETE CASCADE"
")";
*session <<
"CREATE TABLE IF NOT EXISTS conference_participant_event ("
" conference_event_id INT UNSIGNED PRIMARY KEY,"
" event_id INT UNSIGNED PRIMARY KEY,"
" participant_address_id INT UNSIGNED NOT NULL,"
" FOREIGN KEY (conference_event_id)"
" REFERENCES event(event_id)"
" FOREIGN KEY (event_id)"
" REFERENCES conference_notified_event(event_id)"
" ON DELETE CASCADE,"
" FOREIGN KEY (participant_address_id)"
" REFERENCES sip_address(id)"
@ -421,11 +439,11 @@ MainDb::MainDb () : AbstractDb(*new MainDbPrivate) {}
*session <<
"CREATE TABLE IF NOT EXISTS conference_participant_device_event ("
" conference_participant_event_id INT UNSIGNED PRIMARY KEY,"
" event_id INT UNSIGNED PRIMARY KEY,"
" gruu_address_id INT UNSIGNED NOT NULL,"
" FOREIGN KEY (conference_participant_event_id)"
" REFERENCES conference_participant_event(conference_event_id)"
" FOREIGN KEY (event_id)"
" REFERENCES conference_participant_event(event_id)"
" ON DELETE CASCADE,"
" FOREIGN KEY (gruu_address_id)"
" REFERENCES sip_address(id)"
@ -434,11 +452,11 @@ MainDb::MainDb () : AbstractDb(*new MainDbPrivate) {}
*session <<
"CREATE TABLE IF NOT EXISTS conference_subject_event ("
" conference_event_id INT UNSIGNED PRIMARY KEY,"
" event_id INT UNSIGNED PRIMARY KEY,"
" subject VARCHAR(255),"
" FOREIGN KEY (conference_event_id)"
" REFERENCES event(event_id)"
" FOREIGN KEY (event_id)"
" REFERENCES conference_notified_event(event_id)"
" ON DELETE CASCADE"
")";