mirror of
https://github.com/lubosz/overte.git
synced 2025-08-07 16:41:02 +02:00
properly parse domain metadata hours
This commit is contained in:
parent
56038a97a6
commit
c406538301
1 changed files with 52 additions and 41 deletions
|
@ -60,6 +60,50 @@ const QString DomainMetadata::Descriptors::Hours::CLOSE = "close";
|
||||||
//
|
//
|
||||||
// it is meant to be sent to and consumed by an external API
|
// it is meant to be sent to and consumed by an external API
|
||||||
|
|
||||||
|
// merge delta into target
|
||||||
|
// target should be of the form [ OpenTime, CloseTime ],
|
||||||
|
// delta should be of the form [ { open: Time, close: Time } ]
|
||||||
|
void parseHours(QVariant delta, QVariant& target) {
|
||||||
|
using Hours = DomainMetadata::Descriptors::Hours;
|
||||||
|
|
||||||
|
assert(target.canConvert<QVariantList>());
|
||||||
|
auto& targetList = *static_cast<QVariantList*>(target.data());
|
||||||
|
|
||||||
|
// if/when multiple ranges are allowed, this list will need to be iterated
|
||||||
|
assert(targetList[0].canConvert<QVariantList>());
|
||||||
|
auto& hours = *static_cast<QVariantList*>(targetList[0].data());
|
||||||
|
|
||||||
|
if (!delta.canConvert<QVariantList>()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
auto& deltaList = *static_cast<QVariantList*>(delta.data());
|
||||||
|
if (deltaList.isEmpty()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
auto& deltaHours = *static_cast<QVariantMap*>(deltaList.first().data());
|
||||||
|
if (deltaHours.isEmpty()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// merge delta into base
|
||||||
|
static const int OPEN_INDEX = 0;
|
||||||
|
static const int CLOSE_INDEX = 1;
|
||||||
|
auto open = deltaHours.find(Hours::OPEN);
|
||||||
|
if (open != deltaHours.end()) {
|
||||||
|
hours[OPEN_INDEX] = open.value();
|
||||||
|
}
|
||||||
|
assert(hours[OPEN_INDEX].canConvert<QString>());
|
||||||
|
|
||||||
|
auto close = deltaHours.find(Hours::CLOSE);
|
||||||
|
if (close != deltaHours.end()) {
|
||||||
|
hours[CLOSE_INDEX] = close.value();
|
||||||
|
}
|
||||||
|
assert(hours[CLOSE_INDEX].canConvert<QString>());
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
DomainMetadata::DomainMetadata(QObject* domainServer) : QObject(domainServer) {
|
DomainMetadata::DomainMetadata(QObject* domainServer) : QObject(domainServer) {
|
||||||
// set up the structure necessary for casting during parsing (see parseHours, esp.)
|
// set up the structure necessary for casting during parsing (see parseHours, esp.)
|
||||||
_metadata[USERS] = QVariantMap {};
|
_metadata[USERS] = QVariantMap {};
|
||||||
|
@ -100,45 +144,12 @@ QJsonObject DomainMetadata::get(const QString& group) {
|
||||||
return QJsonObject::fromVariantMap(_metadata[group].toMap());
|
return QJsonObject::fromVariantMap(_metadata[group].toMap());
|
||||||
}
|
}
|
||||||
|
|
||||||
// merge delta into target
|
|
||||||
// target should be of the form [ OpenTime, CloseTime ],
|
|
||||||
// delta should be of the form [ { open: Time, close: Time } ]
|
|
||||||
void parseHours(QVariant delta, QVariant& target) {
|
|
||||||
using Hours = DomainMetadata::Descriptors::Hours;
|
|
||||||
|
|
||||||
assert(target.canConvert<QVariantList>());
|
|
||||||
auto& targetList = *static_cast<QVariantList*>(target.data());
|
|
||||||
|
|
||||||
// if/when multiple ranges are allowed, this list will need to be iterated
|
|
||||||
assert(targetList[0].canConvert<QVariantList>());
|
|
||||||
auto& hours = *static_cast<QVariantList*>(targetList[0].data());
|
|
||||||
|
|
||||||
auto deltaHours = delta.toList()[0].toMap();
|
|
||||||
if (deltaHours.isEmpty()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// merge delta into base
|
|
||||||
static const int OPEN_INDEX = 0;
|
|
||||||
static const int CLOSE_INDEX = 1;
|
|
||||||
auto open = deltaHours.find(Hours::OPEN);
|
|
||||||
if (open != deltaHours.end()) {
|
|
||||||
hours[OPEN_INDEX] = open.value();
|
|
||||||
}
|
|
||||||
assert(hours[OPEN_INDEX].canConvert<QString>());
|
|
||||||
auto close = deltaHours.find(Hours::CLOSE);
|
|
||||||
if (close != deltaHours.end()) {
|
|
||||||
hours[CLOSE_INDEX] = close.value();
|
|
||||||
}
|
|
||||||
assert(hours[CLOSE_INDEX].canConvert<QString>());
|
|
||||||
}
|
|
||||||
|
|
||||||
void DomainMetadata::descriptorsChanged() {
|
void DomainMetadata::descriptorsChanged() {
|
||||||
// get descriptors
|
// get descriptors
|
||||||
assert(_metadata[DESCRIPTORS].canConvert<QVariantMap>());
|
assert(_metadata[DESCRIPTORS].canConvert<QVariantMap>());
|
||||||
auto& state = *static_cast<QVariantMap*>(_metadata[DESCRIPTORS].data());
|
auto& state = *static_cast<QVariantMap*>(_metadata[DESCRIPTORS].data());
|
||||||
auto settings = static_cast<DomainServer*>(parent())->_settingsManager.getSettingsMap();
|
auto& settings = static_cast<DomainServer*>(parent())->_settingsManager.getSettingsMap();
|
||||||
auto descriptors = settings[DESCRIPTORS].toMap();
|
auto& descriptors = static_cast<DomainServer*>(parent())->_settingsManager.getDescriptorsMap();
|
||||||
|
|
||||||
// copy simple descriptors (description/maturity)
|
// copy simple descriptors (description/maturity)
|
||||||
state[Descriptors::DESCRIPTION] = descriptors[Descriptors::DESCRIPTION];
|
state[Descriptors::DESCRIPTION] = descriptors[Descriptors::DESCRIPTION];
|
||||||
|
@ -149,20 +160,20 @@ void DomainMetadata::descriptorsChanged() {
|
||||||
state[Descriptors::TAGS] = descriptors[Descriptors::TAGS].toList();
|
state[Descriptors::TAGS] = descriptors[Descriptors::TAGS].toList();
|
||||||
|
|
||||||
// parse capacity
|
// parse capacity
|
||||||
const QString CAPACITY = "security.maximum_user_capacity";
|
static const QString CAPACITY = "security.maximum_user_capacity";
|
||||||
const QVariant* capacityVariant = valueForKeyPath(settings, CAPACITY);
|
const QVariant* capacityVariant = valueForKeyPath(settings, CAPACITY);
|
||||||
unsigned int capacity = capacityVariant ? capacityVariant->toUInt() : 0;
|
unsigned int capacity = capacityVariant ? capacityVariant->toUInt() : 0;
|
||||||
state[Descriptors::CAPACITY] = capacity;
|
state[Descriptors::CAPACITY] = capacity;
|
||||||
|
|
||||||
// parse operating hours
|
// parse operating hours
|
||||||
const QString WEEKDAY_HOURS = "weekday_hours";
|
static const QString WEEKDAY_HOURS = "weekday_hours";
|
||||||
const QString WEEKEND_HOURS = "weekend_hours";
|
static const QString WEEKEND_HOURS = "weekend_hours";
|
||||||
const QString UTC_OFFSET = "utc_offset";
|
static const QString UTC_OFFSET = "utc_offset";
|
||||||
assert(state[Descriptors::HOURS].canConvert<QVariantMap>());
|
assert(state[Descriptors::HOURS].canConvert<QVariantMap>());
|
||||||
auto& hours = *static_cast<QVariantMap*>(state[Descriptors::HOURS].data());
|
auto& hours = *static_cast<QVariantMap*>(state[Descriptors::HOURS].data());
|
||||||
parseHours(descriptors.take(WEEKDAY_HOURS), hours[Descriptors::Hours::WEEKDAY]);
|
|
||||||
parseHours(descriptors.take(WEEKEND_HOURS), hours[Descriptors::Hours::WEEKEND]);
|
|
||||||
hours[Descriptors::Hours::UTC_OFFSET] = descriptors.take(UTC_OFFSET);
|
hours[Descriptors::Hours::UTC_OFFSET] = descriptors.take(UTC_OFFSET);
|
||||||
|
parseHours(descriptors[WEEKDAY_HOURS], hours[Descriptors::Hours::WEEKDAY]);
|
||||||
|
parseHours(descriptors[WEEKEND_HOURS], hours[Descriptors::Hours::WEEKEND]);
|
||||||
|
|
||||||
#if DEV_BUILD || PR_BUILD
|
#if DEV_BUILD || PR_BUILD
|
||||||
qDebug() << "Domain metadata descriptors set:" << QJsonObject::fromVariantMap(_metadata[DESCRIPTORS].toMap());
|
qDebug() << "Domain metadata descriptors set:" << QJsonObject::fromVariantMap(_metadata[DESCRIPTORS].toMap());
|
||||||
|
|
Loading…
Reference in a new issue