From ae8e8abfd9e7e2995c8e1bbd2e10607ee2f73eeb Mon Sep 17 00:00:00 2001
From: Roland Osborne <rolandosborne@gmail.com>
Date: Sat, 15 Jan 2022 13:54:04 -0800
Subject: [PATCH] more code layout changes

---
 net/server/internal/model_dialogue.go         | 29 -------------------
 .../model_dialogue_id_subject_body.go         | 17 -----------
 .../internal/model_dialogue_insights.go       | 17 -----------
 net/server/internal/model_disconnect.go       | 19 ------------
 net/server/internal/models.go                 | 15 ++++++++++
 5 files changed, 15 insertions(+), 82 deletions(-)
 delete mode 100644 net/server/internal/model_dialogue.go
 delete mode 100644 net/server/internal/model_dialogue_id_subject_body.go
 delete mode 100644 net/server/internal/model_dialogue_insights.go
 delete mode 100644 net/server/internal/model_disconnect.go

diff --git a/net/server/internal/model_dialogue.go b/net/server/internal/model_dialogue.go
deleted file mode 100644
index 24bf9665..00000000
--- a/net/server/internal/model_dialogue.go
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * DataBag
- *
- * DataBag provides storage for decentralized identity based self-hosting apps. It is intended to support sharing of personal data and hosting group conversations. 
- *
- * API version: 0.0.1
- * Contact: roland.osborne@gmail.com
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
- */
-package databag
-
-type Dialogue struct {
-
-	DialogueId string `json:"dialogueId"`
-
-	DialogueRevison int64 `json:"dialogueRevison,omitempty"`
-
-	Type_ string `json:"type"`
-
-	Data string `json:"data"`
-
-	Created int32 `json:"created"`
-
-	Active bool `json:"active"`
-
-	InsightRevision int64 `json:"insightRevision,omitempty"`
-
-	Insights []DialogueInsights `json:"insights"`
-}
diff --git a/net/server/internal/model_dialogue_id_subject_body.go b/net/server/internal/model_dialogue_id_subject_body.go
deleted file mode 100644
index 9dac8ab5..00000000
--- a/net/server/internal/model_dialogue_id_subject_body.go
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * DataBag
- *
- * DataBag provides storage for decentralized identity based self-hosting apps. It is intended to support sharing of personal data and hosting group conversations. 
- *
- * API version: 0.0.1
- * Contact: roland.osborne@gmail.com
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
- */
-package databag
-
-type DialogueIdSubjectBody struct {
-
-	Type_ string `json:"type"`
-
-	Data string `json:"data"`
-}
diff --git a/net/server/internal/model_dialogue_insights.go b/net/server/internal/model_dialogue_insights.go
deleted file mode 100644
index 7bf626a6..00000000
--- a/net/server/internal/model_dialogue_insights.go
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * DataBag
- *
- * DataBag provides storage for decentralized identity based self-hosting apps. It is intended to support sharing of personal data and hosting group conversations. 
- *
- * API version: 0.0.1
- * Contact: roland.osborne@gmail.com
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
- */
-package databag
-
-type DialogueInsights struct {
-
-	CardId string `json:"cardId,omitempty"`
-
-	Status string `json:"status,omitempty"`
-}
diff --git a/net/server/internal/model_disconnect.go b/net/server/internal/model_disconnect.go
deleted file mode 100644
index c4276eec..00000000
--- a/net/server/internal/model_disconnect.go
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * DataBag
- *
- * DataBag provides storage for decentralized identity based self-hosting apps. It is intended to support sharing of personal data and hosting group conversations. 
- *
- * API version: 0.0.1
- * Contact: roland.osborne@gmail.com
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
- */
-package databag
-
-type Disconnect struct {
-
-	RequestorId string `json:"requestorId"`
-
-	RequestedId string `json:"requestedId"`
-
-	Timestamp int32 `json:"timestamp"`
-}
diff --git a/net/server/internal/models.go b/net/server/internal/models.go
index 08315809..ae8fdbb1 100644
--- a/net/server/internal/models.go
+++ b/net/server/internal/models.go
@@ -133,3 +133,18 @@ type DataMessage struct {
 	Signature string `json:"signature"`
 }
 
+type DialogueIdSubjectBody struct {
+	Type_ string `json:"type"`
+	Data string `json:"data"`
+}
+
+type DialogueInsights struct {
+	CardId string `json:"cardId,omitempty"`
+	Status string `json:"status,omitempty"`
+}
+
+type Disconnect struct {
+	RequestorId string `json:"requestorId"`
+	RequestedId string `json:"requestedId"`
+	Timestamp int32 `json:"timestamp"`
+}