From b827e05b439c203fa294b5c4253094938a530644 Mon Sep 17 00:00:00 2001
From: Sandra Westerhoff
 <21272-sandra.westerhoff@users.noreply.git.rwth-aachen.de>
Date: Tue, 29 Jun 2021 12:48:28 +0000
Subject: [PATCH] Update: added archived flag in createReturnObject function
 (coscine/issues#1597)

---
 src/Database/Models/ResourceModel.cs         | 5 +++--
 src/Database/ReturnObjects/ResourceObject.cs | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Database/Models/ResourceModel.cs b/src/Database/Models/ResourceModel.cs
index 45a9588..b9a2af7 100644
--- a/src/Database/Models/ResourceModel.cs
+++ b/src/Database/Models/ResourceModel.cs
@@ -429,7 +429,7 @@ namespace Coscine.Database.Models
                 };
             }
 
-                return new ResourceObject(
+            return new ResourceObject(
                 resource.Id,
                 resource.DisplayName,
                 resource.ResourceName,
@@ -443,7 +443,8 @@ namespace Coscine.Database.Models
                 resourceTypeOptionObject == null ? new JObject() : JObject.FromObject(resourceTypeOptionObject),
                 resource.ApplicationProfile,
                 JToken.Parse(resource.FixedValues ?? "{}"),
-                (resource.Creator != null) ? resource.Creator : null
+                (resource.Creator != null) ? resource.Creator : null,
+                (resource.Archived == "1") ? true : false
             );
         }
 
diff --git a/src/Database/ReturnObjects/ResourceObject.cs b/src/Database/ReturnObjects/ResourceObject.cs
index 4792ecc..d7b4ec2 100644
--- a/src/Database/ReturnObjects/ResourceObject.cs
+++ b/src/Database/ReturnObjects/ResourceObject.cs
@@ -24,8 +24,9 @@ namespace Coscine.Database.ReturnObjects
         public string ApplicationProfile { get; set; }
         public JToken FixedValues { get; set; }
         public Guid? Creator { get; set; }
+        public bool Archived { get; set; }
 
-        public ResourceObject(Guid id,  string displayName, string resourceName, string description, string keywords, string usageRights, ResourceTypeObject type, IEnumerable<DisciplineObject> disciplines, VisibilityObject visibility, LicenseObject license, JObject resourceTypeOption, string applicationProfile, JToken fixedValues, Guid? creator = null)
+        public ResourceObject(Guid id,  string displayName, string resourceName, string description, string keywords, string usageRights, ResourceTypeObject type, IEnumerable<DisciplineObject> disciplines, VisibilityObject visibility, LicenseObject license, JObject resourceTypeOption, string applicationProfile, JToken fixedValues, Guid? creator = null, bool archived = false)
         {
             Id = id;
 
@@ -46,6 +47,7 @@ namespace Coscine.Database.ReturnObjects
             FixedValues = fixedValues;
 
             Creator = creator;
+            Archived = archived;
         }
     }
 }
-- 
GitLab