From ad2ef89e525c9199768f2e33c301fac3550b0afc Mon Sep 17 00:00:00 2001
From: Andrea Gianarda <andrea.gianarda@belledonne-communications.com>
Date: Tue, 31 Oct 2023 10:54:42 +0100
Subject: [PATCH] - Add 'security_level' column to conference_info table in
version 27 of the database ot fix compatibility issues when migrating from
release/5.2 - Allow to update participant parameters in DB - Improve handling
of organizer addition and merge into participant if it is also specified in
the participant list - Add test to perform migration from DB version 22 of
release 5.2 to DB version 27 of master
---
src/conference/conference-info.cpp | 38 +++---
src/db/internal/statements.cpp | 2 +-
src/db/main-db-p.h | 19 +--
src/db/main-db.cpp | 116 ++++++++++++-------
src/db/main-db.h | 8 +-
tester/CMakeLists.txt | 1 +
tester/db/chatroom_conference.db | Bin 0 -> 221184 bytes
tester/local_conference_tester_functions.cpp | 1 -
tester/main-db-tester.cpp | 20 +++-
9 files changed, 137 insertions(+), 68 deletions(-)
create mode 100644 tester/db/chatroom_conference.db
diff --git a/src/conference/conference-info.cpp b/src/conference/conference-info.cpp
index 87362e7e91..331c4efb6d 100644
--- a/src/conference/conference-info.cpp
+++ b/src/conference/conference-info.cpp
@@ -49,7 +49,13 @@ const std::shared_ptr<Address> &ConferenceInfo::getOrganizerAddress() const {
}
void ConferenceInfo::setOrganizer(const std::shared_ptr<const ParticipantInfo> &organizer) {
- mOrganizer = organizer->clone()->toSharedPtr();
+ const auto &participant = findParticipant(organizer->getAddress());
+ if (participant) {
+ mOrganizer = participant;
+ mOrganizer->addParameters(organizer->getAllParameters());
+ } else {
+ mOrganizer = organizer->clone()->toSharedPtr();
+ }
}
void ConferenceInfo::setOrganizer(const std::shared_ptr<const Address> &organizer) {
@@ -111,13 +117,15 @@ void ConferenceInfo::addParticipants(const ConferenceInfo::participant_list_t &p
void ConferenceInfo::addParticipant(const std::shared_ptr<const ParticipantInfo> &participantInfo) {
const auto &address = participantInfo->getAddress();
- if (!hasParticipant(address)) {
+ const auto &participant = findParticipant(address);
+ const auto &organizerAddress = mOrganizer ? mOrganizer->getAddress() : nullptr;
+ const auto isOrganizer = (organizerAddress && (address->weakEqual(*organizerAddress)));
+ if (!participant) {
std::shared_ptr<ParticipantInfo> newInfo = nullptr;
- // Check whetner the participant to be added is the organizer
- if (mOrganizer && (participantInfo->getAddress()->weakEqual(*mOrganizer->getAddress()))) {
- // Update the organizer role and parameters
+ // Check whether the participant to be added is the organizer
+ if (isOrganizer) {
+ // Update the organizer parameters
newInfo = mOrganizer;
- newInfo->setRole(participantInfo->getRole());
newInfo->addParameters(participantInfo->getAllParameters());
} else {
newInfo = participantInfo->clone()->toSharedPtr();
@@ -129,6 +137,10 @@ void ConferenceInfo::addParticipant(const std::shared_ptr<const ParticipantInfo>
} else {
lInfo() << "Participant with address " << *address << " is already in the list of conference info " << this
<< " (address " << (getUri() ? getUri()->toString() : std::string("<unknown address>")) << ")";
+ if (isOrganizer) {
+ // Update the organizer parameters
+ participant->addParameters(participantInfo->getAllParameters());
+ }
}
}
@@ -142,14 +154,14 @@ void ConferenceInfo::removeParticipant(const std::shared_ptr<const ParticipantIn
}
void ConferenceInfo::removeParticipant(const std::shared_ptr<const Address> &participant) {
- auto it = findParticipantIt(participant);
- if (it == mParticipants.cend()) {
- lDebug() << "Unable to remove participant with address " << *participant << " in conference info " << this
- << " (address " << (getUri() ? getUri()->toString() : std::string("<unknown address>")) << ")";
- } else {
+ if (hasParticipant(participant)) {
lInfo() << "Participant with address " << *participant << " has been removed from conference info " << this
<< " (address " << (getUri() ? getUri()->toString() : std::string("<unknown address>")) << ")";
+ auto it = findParticipantIt(participant);
mParticipants.erase(it);
+ } else {
+ lDebug() << "Unable to remove participant with address " << *participant << " in conference info " << this
+ << " (address " << (getUri() ? getUri()->toString() : std::string("<unknown address>")) << ")";
}
}
@@ -184,8 +196,8 @@ ConferenceInfo::findParticipant(const std::shared_ptr<const Address> &address) c
if (it != mParticipants.end()) {
return *it;
};
- lInfo() << "Unable to find participant with address " << *address << " in conference info " << this << " (address "
- << (getUri() ? getUri()->toString() : std::string("<unknown address>")) << ")";
+ lDebug() << "Unable to find participant with address " << *address << " in conference info " << this << " (address "
+ << (getUri() ? getUri()->toString() : std::string("<unknown address>")) << ")";
return nullptr;
}
diff --git a/src/db/internal/statements.cpp b/src/db/internal/statements.cpp
index f58ab8d38f..380c93574c 100644
--- a/src/db/internal/statements.cpp
+++ b/src/db/internal/statements.cpp
@@ -124,7 +124,7 @@ constexpr const char *select[SelectCount] = {
/* SelectConferenceInfoParticipantId */ R"(
SELECT id
FROM conference_info_participant
- WHERE conference_info_id = :1 AND participant_sip_address_id = :2 and is_organizer = :3
+ WHERE conference_info_id = :1 AND participant_sip_address_id = :2
)",
/* SelectConferenceInfoOrganizerId */ R"(
diff --git a/src/db/main-db-p.h b/src/db/main-db-p.h
index ae6f571324..5ff5bf22db 100644
--- a/src/db/main-db-p.h
+++ b/src/db/main-db-p.h
@@ -75,16 +75,23 @@ private:
const long long participantId) const;
long long insertConferenceInfo(const std::shared_ptr<ConferenceInfo> &conferenceInfo,
const std::shared_ptr<ConferenceInfo> &oldConferenceInfo);
+ long long insertOrUpdateConferenceInfoParticipant(long long conferenceInfoId,
+ const std::shared_ptr<ParticipantInfo> &participantInfo,
+ bool deleted,
+ bool isOrganizer,
+ bool isParticipant);
long long insertOrUpdateConferenceInfoParticipant(long long conferenceInfoId,
long long participantSipAddressId,
bool deleted,
const ParticipantInfo::participant_params_t params,
- bool isOrganizer);
+ bool isOrganizer,
+ bool isParticipant);
long long insertOrUpdateConferenceInfoOrganizer(long long conferenceInfoId,
long long organizerSipAddressId,
- const ParticipantInfo::participant_params_t params);
+ const ParticipantInfo::participant_params_t params,
+ bool isParticipant);
void insertOrUpdateConferenceInfoParticipantParams(long long conferenceInfoParticipantId,
- const ParticipantInfo::participant_params_t params);
+ const ParticipantInfo::participant_params_t params) const;
long long insertOrUpdateConferenceCall(const std::shared_ptr<CallLog> &callLog,
const std::shared_ptr<ConferenceInfo> &conferenceInfo = nullptr);
@@ -97,9 +104,7 @@ private:
long long selectChatRoomParticipantId(long long chatRoomId, long long participantSipAddressId) const;
long long selectOneToOneChatRoomId(long long sipAddressIdA, long long sipAddressIdB, bool encrypted) const;
long long selectConferenceInfoId(long long uriSipAddressId);
- long long selectConferenceInfoParticipantId(long long conferenceInfoId,
- long long participantSipAddressId,
- bool isOrganizer) const;
+ long long selectConferenceInfoParticipantId(long long conferenceInfoId, long long participantSipAddressId) const;
long long selectConferenceCallId(const std::string &callId);
void deleteContents(long long chatMessageId);
@@ -196,7 +201,7 @@ private:
// ---------------------------------------------------------------------------
#ifdef HAVE_DB_STORAGE
- std::shared_ptr<ConferenceInfo> selectConferenceInfo(const soci::row &row) const;
+ std::shared_ptr<ConferenceInfo> selectConferenceInfo(const soci::row &row);
#endif
// ---------------------------------------------------------------------------
diff --git a/src/db/main-db.cpp b/src/db/main-db.cpp
index 740dc9962e..0d598c43ff 100644
--- a/src/db/main-db.cpp
+++ b/src/db/main-db.cpp
@@ -71,7 +71,7 @@ LINPHONE_BEGIN_NAMESPACE
#ifdef HAVE_DB_STORAGE
namespace {
-constexpr unsigned int ModuleVersionEvents = makeVersion(1, 0, 26);
+constexpr unsigned int ModuleVersionEvents = makeVersion(1, 0, 27);
constexpr unsigned int ModuleVersionFriends = makeVersion(1, 0, 0);
constexpr unsigned int ModuleVersionLegacyFriendsImport = makeVersion(1, 0, 0);
constexpr unsigned int ModuleVersionLegacyHistoryImport = makeVersion(1, 0, 0);
@@ -582,7 +582,9 @@ long long MainDbPrivate::insertConferenceInfo(const std::shared_ptr<ConferenceIn
lError() << "Trying to insert a Conference Info without organizer or URI!";
return -1;
}
- const long long &organizerSipAddressId = insertSipAddress(conferenceInfo->getOrganizerAddress());
+ const auto &organizer = conferenceInfo->getOrganizer();
+ const auto &organizerAddress = organizer->getAddress();
+ const long long &organizerSipAddressId = insertSipAddress(organizerAddress);
const long long &uriSipAddressid = insertSipAddress(conferenceUri);
auto startTime = dbSession.getTimeWithSociIndicator(conferenceInfo->getDateTime());
const unsigned int duration = conferenceInfo->getDuration();
@@ -633,13 +635,18 @@ long long MainDbPrivate::insertConferenceInfo(const std::shared_ptr<ConferenceIn
conferenceInfoId = dbSession.getLastInsertId();
}
- insertOrUpdateConferenceInfoOrganizer(conferenceInfoId, organizerSipAddressId,
- conferenceInfo->getOrganizer()->getAllParameters());
-
const auto &participantList = conferenceInfo->getParticipants();
+ const bool isOrganizerAParticipant =
+ std::find_if(participantList.cbegin(), participantList.cend(), [&organizerAddress](const auto &info) {
+ return organizerAddress->weakEqual(*info->getAddress());
+ }) != participantList.cend();
+ insertOrUpdateConferenceInfoOrganizer(conferenceInfoId, organizerSipAddressId, organizer->getAllParameters(),
+ isOrganizerAParticipant);
+
for (const auto &participantInfo : participantList) {
- insertOrUpdateConferenceInfoParticipant(conferenceInfoId, insertSipAddress(participantInfo->getAddress()),
- false, participantInfo->getAllParameters(), false);
+ const auto participantAddress = participantInfo->getAddress();
+ insertOrUpdateConferenceInfoParticipant(conferenceInfoId, participantInfo, false,
+ participantAddress->weakEqual(*organizerAddress), true);
}
for (const auto &oldParticipantInfo : dbParticipantList) {
@@ -648,9 +655,11 @@ long long MainDbPrivate::insertConferenceInfo(const std::shared_ptr<ConferenceIn
return (p->getAddress()->weakEqual(*oldParticipantInfo->getAddress()));
}) == participantList.cend());
if (deleted) {
- insertOrUpdateConferenceInfoParticipant(conferenceInfoId,
- insertSipAddress(oldParticipantInfo->getAddress()), true,
- oldParticipantInfo->getAllParameters(), false);
+ const auto participantAddress = oldParticipantInfo->getAddress();
+ const auto &isOrganizer = participantAddress->weakEqual(*organizerAddress);
+ // If the participant to be deleted is the organizer, do not change the participant information parameters
+ const auto &info = isOrganizer ? organizer : oldParticipantInfo;
+ insertOrUpdateConferenceInfoParticipant(conferenceInfoId, info, true, isOrganizer, true);
}
}
@@ -662,8 +671,8 @@ long long MainDbPrivate::insertConferenceInfo(const std::shared_ptr<ConferenceIn
#endif
}
-void MainDbPrivate::insertOrUpdateConferenceInfoParticipantParams(long long conferenceInfoParticipantId,
- const ParticipantInfo::participant_params_t params) {
+void MainDbPrivate::insertOrUpdateConferenceInfoParticipantParams(
+ long long conferenceInfoParticipantId, const ParticipantInfo::participant_params_t params) const {
#ifdef HAVE_DB_STORAGE
soci::session *session = dbSession.getBackendSession();
ParticipantInfo::participant_params_t paramsCopy = params;
@@ -688,8 +697,9 @@ void MainDbPrivate::insertOrUpdateConferenceInfoParticipantParams(long long conf
// Add new name values pairs
for (const auto &[name, value] : paramsCopy) {
- *session << "INSERT INTO conference_info_participant_params (conference_info_participant_id, name, value) "
- "VALUES ( :participantId, :name, :value)",
+ *session << "INSERT OR REPLACE INTO conference_info_participant_params (conference_info_participant_id, name, "
+ "value) "
+ "VALUES ( :participantId, :name, :value )",
soci::use(conferenceInfoParticipantId), soci::use(name), soci::use(value);
}
#endif
@@ -697,31 +707,48 @@ void MainDbPrivate::insertOrUpdateConferenceInfoParticipantParams(long long conf
long long MainDbPrivate::insertOrUpdateConferenceInfoOrganizer(long long conferenceInfoId,
long long organizerSipAddressId,
- const ParticipantInfo::participant_params_t params) {
- return insertOrUpdateConferenceInfoParticipant(conferenceInfoId, organizerSipAddressId, false, params, true);
+ const ParticipantInfo::participant_params_t params,
+ bool isParticipant) {
+ return insertOrUpdateConferenceInfoParticipant(conferenceInfoId, organizerSipAddressId, false, params, true,
+ isParticipant);
+}
+
+long long
+MainDbPrivate::insertOrUpdateConferenceInfoParticipant(long long conferenceInfoId,
+ const std::shared_ptr<ParticipantInfo> &participantInfo,
+ bool deleted,
+ bool isOrganizer,
+ bool isParticipant) {
+ return insertOrUpdateConferenceInfoParticipant(conferenceInfoId, insertSipAddress(participantInfo->getAddress()),
+ deleted, participantInfo->getAllParameters(), isOrganizer,
+ isParticipant);
}
long long MainDbPrivate::insertOrUpdateConferenceInfoParticipant(long long conferenceInfoId,
long long participantSipAddressId,
bool deleted,
const ParticipantInfo::participant_params_t params,
- bool isOrganizer) {
+ bool isOrganizer,
+ bool isParticipant) {
#ifdef HAVE_DB_STORAGE
long long conferenceInfoParticipantId =
- selectConferenceInfoParticipantId(conferenceInfoId, participantSipAddressId, isOrganizer);
+ selectConferenceInfoParticipantId(conferenceInfoId, participantSipAddressId);
auto paramsStr = ParticipantInfo::memberParametersToString(params);
int participantDeleted = deleted ? 1 : 0;
int isOrganizerInt = isOrganizer ? 1 : 0;
+ int isParticipantInt = isParticipant ? 1 : 0;
if (conferenceInfoParticipantId >= 0) {
- *dbSession.getBackendSession() << "UPDATE conference_info_participant SET deleted = :deleted WHERE id = :id",
- soci::use(participantDeleted), soci::use(conferenceInfoParticipantId);
+ *dbSession.getBackendSession() << "UPDATE conference_info_participant SET deleted = :deleted, is_organizer = "
+ ":isOrganizer, is_participant = :isParticipant WHERE id = :id",
+ soci::use(participantDeleted), soci::use(isOrganizerInt), soci::use(isParticipantInt),
+ soci::use(conferenceInfoParticipantId);
} else {
*dbSession.getBackendSession()
<< "INSERT INTO conference_info_participant (conference_info_id, participant_sip_address_id, deleted, "
- "is_organizer)"
- " VALUES (:conferenceInfoId, :participantSipAddressId, :deleted, :isOrganizer)",
+ "is_organizer, is_participant)"
+ " VALUES (:conferenceInfoId, :participantSipAddressId, :deleted, :isOrganizer, :isParticipant)",
soci::use(conferenceInfoId), soci::use(participantSipAddressId), soci::use(participantDeleted),
- soci::use(isOrganizerInt);
+ soci::use(isOrganizerInt), soci::use(isParticipantInt);
conferenceInfoParticipantId = dbSession.getLastInsertId();
}
@@ -935,15 +962,13 @@ long long MainDbPrivate::selectConferenceInfoId(long long uriSipAddressId) {
}
long long MainDbPrivate::selectConferenceInfoParticipantId(long long conferenceInfoId,
- long long participantSipAddressId,
- bool isOrganizer) const {
+ long long participantSipAddressId) const {
#ifdef HAVE_DB_STORAGE
long long conferenceInfoParticipantId;
- int isOrganizerInt = isOrganizer ? 1 : 0;
soci::session *session = dbSession.getBackendSession();
*session << Statements::get(Statements::SelectConferenceInfoParticipantId), soci::use(conferenceInfoId),
- soci::use(participantSipAddressId), soci::use(isOrganizerInt), soci::into(conferenceInfoParticipantId);
+ soci::use(participantSipAddressId), soci::into(conferenceInfoParticipantId);
return session->got_data() ? conferenceInfoParticipantId : -1;
#else
@@ -1852,7 +1877,8 @@ ParticipantInfo::participant_params_t MainDbPrivate::migrateConferenceInfoPartic
}
participantParams.insert(std::make_pair(name, actualValue));
- *session << "INSERT INTO conference_info_participant_params (conference_info_participant_id, name, value) "
+ *session << "INSERT OR REPLACE INTO conference_info_participant_params (conference_info_participant_id, name, "
+ "value) "
"VALUES ( :participantId, :name, :value )",
soci::use(participantId), soci::use(name), soci::use(actualValue);
}
@@ -1861,7 +1887,7 @@ ParticipantInfo::participant_params_t MainDbPrivate::migrateConferenceInfoPartic
}
#ifdef HAVE_DB_STORAGE
-shared_ptr<ConferenceInfo> MainDbPrivate::selectConferenceInfo(const soci::row &row) const {
+shared_ptr<ConferenceInfo> MainDbPrivate::selectConferenceInfo(const soci::row &row) {
const long long &dbConferenceInfoId = dbSession.resolveId(row, 0);
auto conferenceInfo = getConferenceInfoFromCache(dbConferenceInfoId);
@@ -1908,17 +1934,16 @@ shared_ptr<ConferenceInfo> MainDbPrivate::selectConferenceInfo(const soci::row &
organizerAddress = Address::create(organizerRow.get<string>(1));
const string organizerParamsStr = organizerRow.get<string>(2);
const long long &organizerId = dbSession.resolveId(organizerRow, 3);
- *session << "INSERT INTO conference_info_participant (conference_info_id, participant_sip_address_id, deleted, "
- "is_organizer) VALUES (:conferenceInfoId, :participantSipAddressId, :deleted, :isOrganizer)",
- soci::use(dbConferenceInfoId), soci::use(organizerSipAddressId), soci::use(0), soci::use(1);
- const long long organizerIdInParticipantTable = dbSession.getLastInsertId();
+ // The flag is_participant is set to true here as by default the organizer is also a participant
+ const long long organizerIdInParticipantTable =
+ insertOrUpdateConferenceInfoOrganizer(dbConferenceInfoId, organizerSipAddressId, organizerParams, true);
const auto unprocessedOrganizerParams = ParticipantInfo::stringToMemberParameters(organizerParamsStr);
organizerParams =
migrateConferenceInfoParticipantParams(unprocessedOrganizerParams, organizerIdInParticipantTable);
// Delete entry from conference info organizer
- *session << "DELETE FROM conference_info_organizer WHERE id = :organizerId", soci::use(organizerId);
+ *session << "DELETE FROM conference_info_organizer WHERE id = :organizerId", soci::use(organizerId);
} else {
static const string organizerInParticipantTableQuery =
"SELECT sip_address.value, conference_info_participant.id"
@@ -1951,7 +1976,7 @@ shared_ptr<ConferenceInfo> MainDbPrivate::selectConferenceInfo(const soci::row &
" WHERE conference_info.id = :conferenceInfoId"
" AND sip_address.id = conference_info_participant.participant_sip_address_id"
" AND conference_info_participant.conference_info_id = conference_info.id AND "
- "conference_info_participant.is_organizer = 0";
+ "conference_info_participant.is_participant = 1";
soci::rowset<soci::row> participantRows = (session->prepare << participantQuery, soci::use(dbConferenceInfoId));
for (const auto &participantRow : participantRows) {
@@ -2553,6 +2578,15 @@ void MainDbPrivate::updateSchema() {
// Sanity check
*session << "SELECT name FROM conference_info_participant_params";
}
+
+ if (version < makeVersion(1, 0, 27)) {
+ try {
+ *session << "ALTER TABLE conference_info ADD COLUMN security_level INT UNSIGNED DEFAULT 0";
+ } catch (const soci::soci_error &e) {
+ lDebug() << "Column 'security_level' already exists in table 'conference_info'";
+ }
+ *session << "ALTER TABLE conference_info_participant ADD COLUMN is_participant BOOLEAN NOT NULL DEFAULT 1";
+ }
// /!\ Warning : if varchar columns < 255 were to be indexed, their size must be set back to 191 = max indexable
// (KEY or UNIQUE) varchar size for mysql < 5.7 with charset utf8mb4 (both here and in column creation)
@@ -5524,7 +5558,7 @@ void MainDb::deleteChatRoomParticipantDevice(const shared_ptr<AbstractChatRoom>
// -----------------------------------------------------------------------------
-std::list<std::shared_ptr<ConferenceInfo>> MainDb::getConferenceInfos(time_t afterThisTime) const {
+std::list<std::shared_ptr<ConferenceInfo>> MainDb::getConferenceInfos(time_t afterThisTime) {
#ifdef HAVE_DB_STORAGE
string query = "SELECT conference_info.id, organizer_sip_address.value, uri_sip_address.value,"
" start_time, duration, subject, description, state, ics_sequence, ics_uid, security_level"
@@ -5571,7 +5605,7 @@ std::list<std::shared_ptr<ConferenceInfo>> MainDb::getConferenceInfos(time_t aft
}
std::list<std::shared_ptr<ConferenceInfo>>
-MainDb::getConferenceInfosForLocalAddress(const std::shared_ptr<Address> &localAddress) const {
+MainDb::getConferenceInfosForLocalAddress(const std::shared_ptr<Address> &localAddress) {
#ifdef HAVE_DB_STORAGE
string query = "SELECT conference_info.id, organizer_sip_address.value, uri_sip_address.value,"
" start_time, duration, subject, description, state, ics_sequence, ics_uid, security_level"
@@ -5611,7 +5645,7 @@ MainDb::getConferenceInfosForLocalAddress(const std::shared_ptr<Address> &localA
#endif
}
-std::shared_ptr<ConferenceInfo> MainDb::getConferenceInfo(long long conferenceInfoId) const {
+std::shared_ptr<ConferenceInfo> MainDb::getConferenceInfo(long long conferenceInfoId) {
#ifdef HAVE_DB_STORAGE
static const string query =
"SELECT conference_info.id, organizer_sip_address.value, uri_sip_address.value,"
@@ -5642,7 +5676,7 @@ std::shared_ptr<ConferenceInfo> MainDb::getConferenceInfo(long long conferenceIn
#endif
}
-std::shared_ptr<ConferenceInfo> MainDb::getConferenceInfoFromURI(const std::shared_ptr<Address> &uri) const {
+std::shared_ptr<ConferenceInfo> MainDb::getConferenceInfoFromURI(const std::shared_ptr<Address> &uri) {
#ifdef HAVE_DB_STORAGE
if (isInitialized() && uri) {
string query = "SELECT conference_info.id, organizer_sip_address.value, uri_sip_address.value,"
@@ -5675,7 +5709,9 @@ std::shared_ptr<ConferenceInfo> MainDb::getConferenceInfoFromURI(const std::shar
long long MainDb::insertConferenceInfo(const std::shared_ptr<ConferenceInfo> &conferenceInfo) {
#ifdef HAVE_DB_STORAGE
if (isInitialized()) {
- auto dbConfInfo = getConferenceInfoFromURI(conferenceInfo->getUri());
+ auto dbConfInfo = (conferenceInfo->getState() == ConferenceInfo::State::New)
+ ? nullptr
+ : getConferenceInfoFromURI(conferenceInfo->getUri());
return L_DB_TRANSACTION {
L_D();
auto id = d->insertConferenceInfo(conferenceInfo, dbConfInfo);
diff --git a/src/db/main-db.h b/src/db/main-db.h
index 4006a1acb6..e88fc8bebf 100644
--- a/src/db/main-db.h
+++ b/src/db/main-db.h
@@ -208,11 +208,11 @@ public:
// Conference Info.
// ---------------------------------------------------------------------------
- std::list<std::shared_ptr<ConferenceInfo>> getConferenceInfos(time_t afterThisTime = -1) const;
+ std::list<std::shared_ptr<ConferenceInfo>> getConferenceInfos(time_t afterThisTime = -1);
std::list<std::shared_ptr<ConferenceInfo>>
- getConferenceInfosForLocalAddress(const std::shared_ptr<Address> &localAddress) const;
- std::shared_ptr<ConferenceInfo> getConferenceInfo(long long conferenceInfoId) const;
- std::shared_ptr<ConferenceInfo> getConferenceInfoFromURI(const std::shared_ptr<Address> &uri) const;
+ getConferenceInfosForLocalAddress(const std::shared_ptr<Address> &localAddress);
+ std::shared_ptr<ConferenceInfo> getConferenceInfo(long long conferenceInfoId);
+ std::shared_ptr<ConferenceInfo> getConferenceInfoFromURI(const std::shared_ptr<Address> &uri);
long long insertConferenceInfo(const std::shared_ptr<ConferenceInfo> &conferenceInfo);
void deleteConferenceInfo(const std::shared_ptr<ConferenceInfo> &conferenceInfo);
diff --git a/tester/CMakeLists.txt b/tester/CMakeLists.txt
index 4b66c9e11c..4f999fbfa3 100644
--- a/tester/CMakeLists.txt
+++ b/tester/CMakeLists.txt
@@ -129,6 +129,7 @@ set(DB_FILES
db/linphone.db
db/messages.db
db/chatrooms.db
+ db/chatroom_conference.db
)
set(RC_FILES
diff --git a/tester/db/chatroom_conference.db b/tester/db/chatroom_conference.db
new file mode 100644
index 0000000000000000000000000000000000000000..81939c746585a6983f393238cfcce1fffead0938
GIT binary patch
literal 221184
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
O1Rwwb2teSN3;aLY6+Vst
literal 0
HcmV?d00001
diff --git a/tester/local_conference_tester_functions.cpp b/tester/local_conference_tester_functions.cpp
index c20a0da9ae..f640110a33 100644
--- a/tester/local_conference_tester_functions.cpp
+++ b/tester/local_conference_tester_functions.cpp
@@ -1690,7 +1690,6 @@ void compare_conference_infos(const LinphoneConferenceInfo *info1,
const int duration1_m = linphone_conference_info_get_duration(info1);
const int duration2_m = linphone_conference_info_get_duration(info2);
- // BC_ASSERT_EQUAL(duration_m, ((duration < 0) ? 0 : duration), int, "%d");
BC_ASSERT_EQUAL(duration1_m, duration2_m, int, "%d");
const char *subject1 = linphone_conference_info_get_subject(info1);
diff --git a/tester/main-db-tester.cpp b/tester/main-db-tester.cpp
index fd6c69d99f..2a253fac1f 100644
--- a/tester/main-db-tester.cpp
+++ b/tester/main-db-tester.cpp
@@ -274,7 +274,7 @@ static void get_chat_rooms() {
if (mainDb.isInitialized()) {
std::string utf8Txt = "Héllo world ! Welcome to ベルドンヌ通信.";
list<shared_ptr<AbstractChatRoom>> chatRooms = mainDb.getChatRooms();
- BC_ASSERT_EQUAL((int)chatRooms.size(), 86, int, "%d");
+ BC_ASSERT_EQUAL(chatRooms.size(), 86, size_t, "%zu");
list<shared_ptr<AbstractChatRoom>> emptyChatRooms;
shared_ptr<AbstractChatRoom> emptyMessageRoom = nullptr;
@@ -354,6 +354,7 @@ static void get_chat_rooms() {
BC_FAIL("Database not initialized");
}
}
+
static void load_a_lot_of_chatrooms(void) {
chrono::high_resolution_clock::time_point start = chrono::high_resolution_clock::now();
MainDbProvider provider("db/chatrooms.db");
@@ -366,6 +367,20 @@ static void load_a_lot_of_chatrooms(void) {
#endif
}
+static void load_chatroom_conference(void) {
+ MainDbProvider provider("db/chatroom_conference.db");
+ MainDb &mainDb = provider.getMainDb();
+ if (mainDb.isInitialized()) {
+ list<shared_ptr<AbstractChatRoom>> chatRooms = mainDb.getChatRooms();
+ BC_ASSERT_EQUAL(chatRooms.size(), 1, size_t, "%zu");
+
+ list<shared_ptr<ConferenceInfo>> conferenceInfos = mainDb.getConferenceInfos();
+ BC_ASSERT_EQUAL(conferenceInfos.size(), 1, size_t, "%zu");
+ } else {
+ BC_FAIL("Database not initialized");
+ }
+}
+
test_t main_db_tests[] = {TEST_NO_TAG("Get events count", get_events_count),
TEST_NO_TAG("Get messages count", get_messages_count),
TEST_NO_TAG("Get unread messages count", get_unread_messages_count),
@@ -373,7 +388,8 @@ test_t main_db_tests[] = {TEST_NO_TAG("Get events count", get_events_count),
TEST_NO_TAG("Get conference events", get_conference_notified_events),
TEST_NO_TAG("Get chat rooms", get_chat_rooms),
TEST_NO_TAG("Set/get conference info", set_get_conference_info),
- TEST_NO_TAG("Load a lot of chatrooms", load_a_lot_of_chatrooms)};
+ TEST_NO_TAG("Load a lot of chatrooms", load_a_lot_of_chatrooms),
+ TEST_NO_TAG("Load chatroom and conference", load_chatroom_conference)};
test_suite_t main_db_test_suite = {"MainDb",
NULL,
--
GitLab