7 files changed, 154 insertions, 0 deletions

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 934d328..676342d 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -61,6 +61,7 @@ set(command_SRCS
     configstore.cpp
     resultset.cpp
     domain/applicationdomaintype.cpp
+    domain/contact.cpp
     domain/event.cpp
     domain/mail.cpp
     domain/folder.cpp
@@ -97,6 +98,7 @@ generate_flatbuffers(
     commands/revisionreplayed
     commands/inspection
     commands/flush
+    domain/contact
     domain/event
     domain/mail
     domain/folder
diff --git a/common/domain/applicationdomaintype.cpp b/common/domain/applicationdomaintype.cpp
index 1647951..6d16a3c 100644
--- a/common/domain/applicationdomaintype.cpp
+++ b/common/domain/applicationdomaintype.cpp
@@ -206,6 +206,11 @@ Entity::~Entity()
 
 }
 
+Contact::~Contact()
+{
+
+}
+
 Event::~Event()
 {
 
@@ -325,6 +330,12 @@ SinkResource ImapResource::create(const QByteArray &account)
 }
 
 template<>
+QByteArray getTypeName<Contact>()
+{
+    return "contact";
+}
+
+template<>
 QByteArray getTypeName<Event>()
 {
     return "event";
@@ -377,6 +388,7 @@ QByteArrayList getTypeNames()
         types << ApplicationDomain::getTypeName<Folder>();
         types << ApplicationDomain::getTypeName<Event>();
         types << ApplicationDomain::getTypeName<Todo>();
+        types << ApplicationDomain::getTypeName<Contact>();
     }
     return types;
 }
diff --git a/common/domain/applicationdomaintype.h b/common/domain/applicationdomaintype.h
index db7fc8d..e4ed05b 100644
--- a/common/domain/applicationdomaintype.h
+++ b/common/domain/applicationdomaintype.h
@@ -328,6 +328,14 @@ struct SINK_EXPORT Entity : public ApplicationDomainType {
     virtual ~Entity();
 };
 
+struct SINK_EXPORT Contact : public Entity {
+    SINK_ENTITY(Contact);
+    SINK_EXTRACTED_PROPERTY(QString, Uid, uid);
+    SINK_PROPERTY(QString, Fn, fn);
+    SINK_PROPERTY(QByteArrayList, Emails, emails);
+    SINK_BLOB_PROPERTY(Vcard, vcard);
+};
+
 struct SINK_EXPORT Event : public Entity {
     SINK_ENTITY(Event);
     SINK_PROPERTY(QString, Uid, uid);
@@ -459,6 +467,9 @@ template<class DomainType>
 QByteArray SINK_EXPORT getTypeName();
 
 template<>
+QByteArray SINK_EXPORT getTypeName<Contact>();
+
+template<>
 QByteArray SINK_EXPORT getTypeName<Event>();
 
 template<>
@@ -507,6 +518,7 @@ class SINK_EXPORT TypeImplementation;
  * This macro can be used to instantiate templates for all domain types.
  */
 #define SINK_REGISTER_TYPES() \
+    REGISTER_TYPE(Sink::ApplicationDomain::Contact); \
     REGISTER_TYPE(Sink::ApplicationDomain::Event); \
     REGISTER_TYPE(Sink::ApplicationDomain::Mail); \
     REGISTER_TYPE(Sink::ApplicationDomain::Folder); \
@@ -521,6 +533,8 @@ Q_DECLARE_METATYPE(Sink::ApplicationDomain::ApplicationDomainType)
 Q_DECLARE_METATYPE(Sink::ApplicationDomain::ApplicationDomainType::Ptr)
 Q_DECLARE_METATYPE(Sink::ApplicationDomain::Entity)
 Q_DECLARE_METATYPE(Sink::ApplicationDomain::Entity::Ptr)
+Q_DECLARE_METATYPE(Sink::ApplicationDomain::Contact)
+Q_DECLARE_METATYPE(Sink::ApplicationDomain::Contact::Ptr)
 Q_DECLARE_METATYPE(Sink::ApplicationDomain::Event)
 Q_DECLARE_METATYPE(Sink::ApplicationDomain::Event::Ptr)
 Q_DECLARE_METATYPE(Sink::ApplicationDomain::Mail)
diff --git a/common/domain/contact.cpp b/common/domain/contact.cpp
new file mode 100644
index 0000000..ea7cac2
--- /dev/null
+++ b/common/domain/contact.cpp
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2017 Sandro Knauß <knauss@kolabsys.com>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the
+ *   Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
+ */
+#include "contact.h"
+
+#include <QVector>
+#include <QByteArray>
+#include <QString>
+
+#include "../propertymapper.h"
+#include "../typeindex.h"
+#include "entity_generated.h"
+
+#include "contact_generated.h"
+
+using namespace Sink::ApplicationDomain;
+
+void TypeImplementation<Contact>::configure(TypeIndex &index)
+{
+    index.addProperty<QByteArray>(Contact::Uid::name);
+}
+
+void TypeImplementation<Contact>::configure(ReadPropertyMapper<Buffer> &propertyMapper)
+{
+    propertyMapper.addMapping<Contact::Uid, Buffer>(&Buffer::uid);
+    propertyMapper.addMapping<Contact::Fn, Buffer>(&Buffer::fn);
+    propertyMapper.addMapping<Contact::Emails, Buffer>(&Buffer::emails);
+    propertyMapper.addMapping<Contact::Vcard, Buffer>(&Buffer::vcard);
+}
+
+void TypeImplementation<Contact>::configure(WritePropertyMapper<BufferBuilder> &propertyMapper)
+{
+    propertyMapper.addMapping<Contact::Uid>(&BufferBuilder::add_uid);
+    propertyMapper.addMapping<Contact::Fn>(&BufferBuilder::add_fn);
+    propertyMapper.addMapping<Contact::Emails>(&BufferBuilder::add_emails);
+    propertyMapper.addMapping<Contact::Vcard>(&BufferBuilder::add_vcard);
+}
+
+void TypeImplementation<Contact>::configure(IndexPropertyMapper &)
+{
+
+}
diff --git a/common/domain/contact.fbs b/common/domain/contact.fbs
new file mode 100644
index 0000000..34fb1d6
--- /dev/null
+++ b/common/domain/contact.fbs
@@ -0,0 +1,11 @@
+namespace Sink.ApplicationDomain.Buffer;
+
+table Contact {
+  uid:string;
+  fn:string;
+  emails: [string];
+  vcard: string;
+}
+
+root_type Contact;
+file_identifier "AKFB";
diff --git a/common/domain/contact.h b/common/domain/contact.h
new file mode 100644
index 0000000..c803a9f
--- /dev/null
+++ b/common/domain/contact.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2017 Sandro Knauß <knauss@kolabsys.com>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the
+ *   Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
+ */
+#pragma once
+
+#include "applicationdomaintype.h"
+
+class QByteArray;
+
+template<typename T>
+class ReadPropertyMapper;
+template<typename T>
+class WritePropertyMapper;
+class IndexPropertyMapper;
+
+class TypeIndex;
+
+namespace Sink {
+namespace ApplicationDomain {
+    namespace Buffer {
+        struct Contact;
+        struct ContactBuilder;
+    }
+
+/**
+ * Implements all type-specific code such as updating and querying indexes.
+ * 
+ * These are type specifiy default implementations. Theoretically a resource could implement it's own implementation.
+ */
+template<>
+class TypeImplementation<Sink::ApplicationDomain::Contact> {
+public:
+    typedef Sink::ApplicationDomain::Buffer::Contact Buffer;
+    typedef Sink::ApplicationDomain::Buffer::ContactBuilder BufferBuilder;
+    static void configure(TypeIndex &);
+    static void configure(ReadPropertyMapper<Buffer> &);
+    static void configure(WritePropertyMapper<BufferBuilder> &);
+    static void configure(IndexPropertyMapper &indexPropertyMapper);
+};
+
+}
+}
diff --git a/common/domain/domaintypes.h b/common/domain/domaintypes.h
index 84c5bd5..0abdee7 100644
--- a/common/domain/domaintypes.h
+++ b/common/domain/domaintypes.h
@@ -1,4 +1,5 @@
 
+#include "contact.h"
 #include "mail.h"
 #include "folder.h"
 #include "event.h"