From c8c5e2d92583cecb61ecd7ce52f2d32d4e07db4e Mon Sep 17 00:00:00 2001
From: argirok <argirokokogiannaki@gmail.com>
Date: Wed, 19 Jul 2023 12:57:28 +0300
Subject: [PATCH] use methods isPublic, isRestricted, isPrivate instead of
 using the previous checks and add validateStatus method

---
 connect/communities/communities.service.ts | 5 +----
 connect/community/community.service.ts     | 5 +----
 connect/community/communityInfo.ts         | 5 +++++
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/connect/communities/communities.service.ts b/connect/communities/communities.service.ts
index 299cfe32..c16b439a 100644
--- a/connect/communities/communities.service.ts
+++ b/connect/communities/communities.service.ts
@@ -58,10 +58,7 @@ export class CommunitiesService {
             result['status'] = 'all';
             if (resData.hasOwnProperty('status')) {
                 result['status'] = resData.status;
-                const status = ['all', 'hidden', 'manager'];
-                if (status.indexOf(result['status']) === -1) {
-                    result['status'] = 'hidden';
-                }
+                result.validateStatus();
             }
             if (resData.type != null) {
                 result['type'] = resData.type;
diff --git a/connect/community/community.service.ts b/connect/community/community.service.ts
index 03f5e327..e9e6ded0 100644
--- a/connect/community/community.service.ts
+++ b/connect/community/community.service.ts
@@ -103,10 +103,7 @@ export class CommunityService {
     community.otherZenodoCommunities = resData.otherZenodoCommunities;
     if (resData.hasOwnProperty('status')) {
       community.status = resData.status;
-      const status = ['all', 'hidden', 'manager'];
-      if(!( community.isPrivate() || community.isRestricted() || community.isPublic())) {
-        community.status = 'PRIVATE';
-      }
+      community.validateStatus();
     }
     if (resData.subjects != null) {
       community.subjects = Array.isArray(resData.subjects)?resData.subjects:[resData.subjects];
diff --git a/connect/community/communityInfo.ts b/connect/community/communityInfo.ts
index 75daa955..e92ad608 100644
--- a/connect/community/communityInfo.ts
+++ b/connect/community/communityInfo.ts
@@ -43,5 +43,10 @@ export class CommunityInfo {
   public isPrivate(){
     return this.status == "hidden" || this.status == "PRIVATE";
   }
+  public validateStatus(){
+    if(!(this.isPrivate() || this.isRestricted() || this.isPublic())){
+      this.status = "PRIVATE";
+    }
+  }
 }
 // export const prodReadyCommunities = ["dh-ch", "ee", "fam", "mes", "ni", "covid-19", "dariah", "epos", "egi"];