Merge pull request #44 from owncloud/improve-graph

Add memberOf field to /users endpoint

Author: dragonchaser

client/OAIGroup.cpp

@@ -91,11 +91,11 @@ class OAIGroupPrivate {
      bool created_on_behalf_of_isSet;
      bool created_on_behalf_of_isValid;
 
-     QList<OAIDirectoryObject> member_of;
+     QList<OAIGroup> member_of;
      bool member_of_isSet;
      bool member_of_isValid;
 
-     QList<OAIDirectoryObject> members;
+     QList<OAIUser> members;
      bool members_isSet;
      bool members_isValid;
 
@@ -895,14 +895,14 @@ bool OAIGroup::is_created_on_behalf_of_Valid() const{
     return d->created_on_behalf_of_isValid;
 }
 
-QList<OAIDirectoryObject> OAIGroup::getMemberOf() const {
+QList<OAIGroup> OAIGroup::getMemberOf() const {
     Q_D(const OAIGroup);
     if(!d){
         return {};
     }
     return d->member_of;
 }
-void OAIGroup::setMemberOf(const QList<OAIDirectoryObject> &member_of) {
+void OAIGroup::setMemberOf(const QList<OAIGroup> &member_of) {
     Q_D(OAIGroup);
     Q_ASSERT(d);
 
@@ -927,14 +927,14 @@ bool OAIGroup::is_member_of_Valid() const{
     return d->member_of_isValid;
 }
 
-QList<OAIDirectoryObject> OAIGroup::getMembers() const {
+QList<OAIUser> OAIGroup::getMembers() const {
     Q_D(const OAIGroup);
     if(!d){
         return {};
     }
     return d->members;
 }
-void OAIGroup::setMembers(const QList<OAIDirectoryObject> &members) {
+void OAIGroup::setMembers(const QList<OAIUser> &members) {
     Q_D(OAIGroup);
     Q_ASSERT(d);
 

client/OAIGroup.h

@@ -26,6 +26,7 @@
 
 #include "OAIDirectoryObject.h"
 #include "OAIDrive.h"
+#include "OAIUser.h"
 #include <QDateTime>
 #include <QList>
 #include <QSet>
@@ -36,6 +37,7 @@
 
 namespace OpenAPI {
 class OAIDirectoryObject;
+class OAIUser;
 class OAIDrive;
 
 
@@ -133,13 +135,13 @@ class OAIGroup : public OAIObject {
     bool is_created_on_behalf_of_Set() const;
     bool is_created_on_behalf_of_Valid() const;
 
-    QList<OAIDirectoryObject> getMemberOf() const;
-    void setMemberOf(const QList<OAIDirectoryObject> &member_of);
+    QList<OAIGroup> getMemberOf() const;
+    void setMemberOf(const QList<OAIGroup> &member_of);
     bool is_member_of_Set() const;
     bool is_member_of_Valid() const;
 
-    QList<OAIDirectoryObject> getMembers() const;
-    void setMembers(const QList<OAIDirectoryObject> &members);
+    QList<OAIUser> getMembers() const;
+    void setMembers(const QList<OAIUser> &members);
     bool is_members_Set() const;
     bool is_members_Valid() const;
 

client/OAIUser.cpp

@@ -95,6 +95,10 @@ class OAIUserPrivate {
      bool mobile_phone_isSet;
      bool mobile_phone_isValid;
 
+     QList<OAIGroup> member_of;
+     bool member_of_isSet;
+     bool member_of_isValid;
+
      QString on_premises_distinguished_name;
      bool on_premises_distinguished_name_isSet;
      bool on_premises_distinguished_name_isValid;
@@ -260,6 +264,9 @@ void OAIUser::initializeModel() {
         d->mobile_phone_isSet = false;
         d->mobile_phone_isValid = false;
 
+        d->member_of_isSet = false;
+        d->member_of_isValid = false;
+
         d->on_premises_distinguished_name_isSet = false;
         d->on_premises_distinguished_name_isValid = false;
 
@@ -391,6 +398,9 @@ void OAIUser::fromJsonObject(QJsonObject json) {
     d->mobile_phone_isValid = ::OpenAPI::fromJsonValue(d->mobile_phone, json[QString("mobilePhone")]);
     d->mobile_phone_isSet = !json[QString("mobilePhone")].isNull() && d->mobile_phone_isValid;
 
+    d->member_of_isValid = ::OpenAPI::fromJsonValue(d->member_of, json[QString("memberOf")]);
+    d->member_of_isSet = !json[QString("memberOf")].isNull() && d->member_of_isValid;
+
     d->on_premises_distinguished_name_isValid = ::OpenAPI::fromJsonValue(d->on_premises_distinguished_name, json[QString("onPremisesDistinguishedName")]);
     d->on_premises_distinguished_name_isSet = !json[QString("onPremisesDistinguishedName")].isNull() && d->on_premises_distinguished_name_isValid;
 
@@ -522,6 +532,9 @@ QJsonObject OAIUser::asJsonObject() const {
     if (d->mobile_phone_isSet) {
         obj.insert(QString("mobilePhone"), ::OpenAPI::toJsonValue(d->mobile_phone));
     }
+    if (d->member_of.size() > 0) {
+        obj.insert(QString("memberOf"), ::OpenAPI::toJsonValue(d->member_of));
+    }
     if (d->on_premises_distinguished_name_isSet) {
         obj.insert(QString("onPremisesDistinguishedName"), ::OpenAPI::toJsonValue(d->on_premises_distinguished_name));
     }
@@ -1135,6 +1148,38 @@ bool OAIUser::is_mobile_phone_Valid() const{
     return d->mobile_phone_isValid;
 }
 
+QList<OAIGroup> OAIUser::getMemberOf() const {
+    Q_D(const OAIUser);
+    if(!d){
+        return {};
+    }
+    return d->member_of;
+}
+void OAIUser::setMemberOf(const QList<OAIGroup> &member_of) {
+    Q_D(OAIUser);
+    Q_ASSERT(d);
+
+    d->member_of = member_of;
+    d->member_of_isSet = true;
+}
+
+bool OAIUser::is_member_of_Set() const{
+    Q_D(const OAIUser);
+    if(!d){
+        return false;
+    }
+
+    return d->member_of_isSet;
+}
+
+bool OAIUser::is_member_of_Valid() const{
+    Q_D(const OAIUser);
+    if(!d){
+        return false;
+    }
+    return d->member_of_isValid;
+}
+
 QString OAIUser::getOnPremisesDistinguishedName() const {
     Q_D(const OAIUser);
     if(!d){
@@ -1931,6 +1976,11 @@ bool OAIUser::isSet() const {
             break;
         }
 
+        if (d->member_of.size() > 0) {
+            isObjectUpdated = true;
+            break;
+        }
+
         if (d->on_premises_distinguished_name_isSet) {
             isObjectUpdated = true;
             break;

client/OAIUser.h

@@ -25,6 +25,7 @@
 #include <QJsonObject>
 
 #include "OAIDrive.h"
+#include "OAIGroup.h"
 #include "OAIPasswordProfile.h"
 #include <QDateTime>
 #include <QList>
@@ -34,6 +35,7 @@
 #include "OAIObject.h"
 
 namespace OpenAPI {
+class OAIGroup;
 class OAIPasswordProfile;
 class OAIDrive;
 
@@ -137,6 +139,11 @@ class OAIUser : public OAIObject {
     bool is_mobile_phone_Set() const;
     bool is_mobile_phone_Valid() const;
 
+    QList<OAIGroup> getMemberOf() const;
+    void setMemberOf(const QList<OAIGroup> &member_of);
+    bool is_member_of_Set() const;
+    bool is_member_of_Valid() const;
+
     QString getOnPremisesDistinguishedName() const;
     void setOnPremisesDistinguishedName(const QString &on_premises_distinguished_name);
     bool is_on_premises_distinguished_name_Set() const;