From bd85c84d929f616b69f4d65a63fc094e0e852a76 Mon Sep 17 00:00:00 2001
From: surajmn1 <suraj.natraj@factly.in>
Date: Thu, 4 Aug 2022 12:40:22 +0530
Subject: [PATCH 01/38] remove selected option from select dropdowns

---
 studio/src/components/Filter/index.js   | 31 +++++++++++++
 studio/src/components/Selector/index.js | 28 +++++++-----
 studio/src/pages/pages/index.js         | 60 ++++++++++++-------------
 3 files changed, 77 insertions(+), 42 deletions(-)
 create mode 100644 studio/src/components/Filter/index.js

diff --git a/studio/src/components/Filter/index.js b/studio/src/components/Filter/index.js
new file mode 100644
index 000000000..b8fe9b371
--- /dev/null
+++ b/studio/src/components/Filter/index.js
@@ -0,0 +1,31 @@
+import React, { useState } from 'react';
+import { Select, Form } from 'antd';
+const { Option } = Select;
+
+const Filter = ({ mode, defaultValue, optionsMap, placeholder, name, label, form }) => {
+  const [selectedItems, setSelectedItems] = useState(optionsMap[defaultValue]);
+  const filteredOptions = Object.keys(optionsMap).filter((o) => !selectedItems.includes(o));
+  const selectedOptions = optionsMap[selectedItems];
+
+  return (
+    <Form.Item label={label} name={name}>
+      <Select
+        placeholder={placeholder}
+        onChange={(value) => {
+          form.setFieldsValue({ [name]: optionsMap[value] });
+          setSelectedItems(value);
+        }}
+      >
+        {filteredOptions.map((item, index) => {
+          return (
+            <Select.Option key={item} value={item}>
+              {optionsMap[item]}
+            </Select.Option>
+          );
+        })}
+      </Select>
+    </Form.Item>
+  );
+};
+
+export default Filter;
diff --git a/studio/src/components/Selector/index.js b/studio/src/components/Selector/index.js
index d43e6d292..456f9a006 100644
--- a/studio/src/components/Selector/index.js
+++ b/studio/src/components/Selector/index.js
@@ -18,6 +18,7 @@ function Selector({
   const entity = action.toLowerCase();
   const selectorType = require(`../../actions/${entity}`);
   const [entityCreatedFlag, setEntityCreatedFlag] = React.useState(false);
+  const [selectedOptions, setSelectedOptions] = React.useState([]);
   const [query, setQuery] = React.useState({
     page: 1,
     limit: 5,
@@ -117,11 +118,14 @@ function Selector({
       searchValue={searchValue}
       value={value}
       placeholder={placeholder}
-      onChange={(values) => onChange(values)}
+      onChange={(values) => {
+        setSelectedOptions(values);
+        onChange(values);
+      }}
       onSearch={(value) => onSearch(value)}
-      filterOption={(input, option) =>
-        option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
-      }
+      filterOption={(input, option) => {
+        return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+      }}
       onPopupScroll={(e) => {
         if (
           e.target.scrollTop + e.target.offsetHeight === e.target.scrollHeight ||
@@ -163,12 +167,16 @@ function Selector({
       autoClearSearchValue={true}
     >
       {details
-        .filter((item) => !invalidOptions.includes(item.id))
-        .map((item) => (
-          <Select.Option value={item.id} key={entity + item.id}>
-            {item[display] ? item[display] : item['email'] ? item['email'] : null}
-          </Select.Option>
-        ))}
+        .filter((item) => {
+          return ![...invalidOptions].includes(item.id);
+        })
+        .map((item, _, array) => {
+          return (
+            <Select.Option value={item.id} key={entity + item.id}>
+              {item[display] ? item[display] : item['email'] ? item['email'] : null}
+            </Select.Option>
+          );
+        })}
     </Select>
   );
 }
diff --git a/studio/src/pages/pages/index.js b/studio/src/pages/pages/index.js
index 210c15302..9a1ae709b 100644
--- a/studio/src/pages/pages/index.js
+++ b/studio/src/pages/pages/index.js
@@ -1,5 +1,5 @@
 /* eslint-disable react-hooks/exhaustive-deps */
-import React, { useEffect } from 'react';
+import React, { useEffect, useState } from 'react';
 import { Space, Button, Select, Form, Col, Row, Input } from 'antd';
 import { Link, useLocation, useHistory } from 'react-router-dom';
 import PageList from './components/PageList';
@@ -14,6 +14,7 @@ import { UpOutlined, DownOutlined } from '@ant-design/icons';
 import Loader from '../../components/Loader';
 import { Helmet } from 'react-helmet';
 import Filters from '../../utils/filters';
+import Filter from '../../components/Filter';
 
 function Pages({ formats }) {
   const spaces = useSelector(({ spaces }) => spaces);
@@ -56,11 +57,11 @@ function Pages({ formats }) {
   const keys = ['page', 'limit', 'q', 'sort', 'tag', 'category', 'author', 'status'];
   const params = getUrlParams(query, keys);
 
-  useEffect(() => {
-    if (form) {
-      form.setFieldsValue(new Filters(params));
-    }
-  }, [search, formats.loading]);
+  // useEffect(() => {
+  //   if (form) {
+  //     form.setFieldsValue(new Filters(params));
+  //   }
+  // }, [search, formats.loading]);
 
   useEffect(() => {
     fetchPages();
@@ -150,34 +151,29 @@ function Pages({ formats }) {
             </Form.Item>
           </Col>
           <Col key={4}>
-            <Form.Item label="Status" name="status">
-              <Select placeholder="Status" defaultValue="all">
-                <Option value="all" key={'all'}>
-                  All
-                </Option>
-                <Option value="draft" key={'draft'}>
-                  Draft
-                </Option>
-                <Option value="publish" key={'publish'}>
-                  Publish
-                </Option>
-                <Option value="ready" key={'ready'}>
-                  Ready to Publish
-                </Option>
-              </Select>
-            </Form.Item>
+            <Filter
+              placeholder={'Status'}
+              defaultValue="all"
+              label={'Status'}
+              form={form}
+              name={'status'}
+              optionsMap={{
+                all: 'All',
+                draft: 'Draft',
+                publish: 'Publish',
+                ready: 'Ready to Publish',
+              }}
+            />
           </Col>
           <Col>
-            <Form.Item label="Sort By" name="sort">
-              <Select placeholder="Sort By" defaultValue="desc" style={{ width: '100%' }}>
-                <Option value="desc" key={'desc'}>
-                  Latest
-                </Option>
-                <Option value="asc" key={'asc'}>
-                  Old
-                </Option>
-              </Select>
-            </Form.Item>
+            <Filter
+              placeholder={'Sort by'}
+              defaultValue="desc"
+              label={'Sort By'}
+              name={'sort'}
+              form={form}
+              optionsMap={{ desc: 'Latest', asc: 'Old' }}
+            />
           </Col>
           <Button
             type="link"

From d100bf8a2a68724dcb0fbf7d074020b809b82cdf Mon Sep 17 00:00:00 2001
From: surajmn1 <suraj.natraj@factly.in>
Date: Thu, 11 Aug 2022 14:56:24 +0530
Subject: [PATCH 02/38] dega-kavach-latest integration

---
 docker-compose.yml                            |  40 +++-
 keto/keto.yml                                 |  10 +
 server/service/core/action/page/list.go       |   5 +
 server/service/core/action/policy/mapper.go   |  16 +-
 server/service/core/action/role/create.go     | 100 +++++++++
 server/service/core/action/role/details.go    |  54 +++++
 server/service/core/action/role/route.go      |  29 +++
 server/service/core/action/space/create.go    |  94 ++++-----
 server/service/core/action/space/delete.go    |  63 +++++-
 server/service/core/action/space/details.go   |  52 ++++-
 server/service/core/action/space/my.go        | 130 +++++++++---
 server/service/core/action/space/route.go     |   2 +
 server/service/core/action/space/update.go    | 190 +++++++++++-------
 server/service/core/action/user/permission.go |   9 +
 server/service/core/model/role.go             |  33 +++
 server/util/organisationID.go                 |  15 +-
 .../src/__tests__/actions/sachFactChecks.js   |  50 +++--
 studio/src/actions/roles.js                   | 163 +++++++++++++++
 studio/src/config/routesConfig.js             |  21 ++
 studio/src/constants/date.js                  |  15 +-
 studio/src/constants/roles.js                 |  10 +
 studio/src/layouts/basic.js                   |   6 +-
 .../fact-checks/components/FactCheckForm.js   |   8 +-
 studio/src/pages/members/index.js             |  18 +-
 studio/src/pages/posts/components/PostForm.js |   8 +-
 studio/src/pages/roles/CreateRole.js          |  29 +++
 studio/src/pages/roles/EditRole.js            |  53 +++++
 studio/src/pages/roles/components/RoleForm.js |  64 ++++++
 studio/src/pages/roles/components/RoleList.js | 150 ++++++++++++++
 studio/src/pages/roles/index.js               |  72 +++++++
 studio/src/reducers/index.js                  |   2 +
 studio/src/reducers/rolesReducer.js           |  61 ++++++
 studio/src/utils/date.js                      |   7 +-
 33 files changed, 1336 insertions(+), 243 deletions(-)
 create mode 100644 keto/keto.yml
 create mode 100644 server/service/core/action/role/create.go
 create mode 100644 server/service/core/action/role/details.go
 create mode 100644 server/service/core/action/role/route.go
 create mode 100644 server/service/core/model/role.go
 create mode 100644 studio/src/actions/roles.js
 create mode 100644 studio/src/constants/roles.js
 create mode 100644 studio/src/pages/roles/CreateRole.js
 create mode 100644 studio/src/pages/roles/EditRole.js
 create mode 100644 studio/src/pages/roles/components/RoleForm.js
 create mode 100644 studio/src/pages/roles/components/RoleList.js
 create mode 100644 studio/src/pages/roles/index.js
 create mode 100644 studio/src/reducers/rolesReducer.js

diff --git a/docker-compose.yml b/docker-compose.yml
index ff9efeb4b..7ea41b79e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -149,24 +149,37 @@ services:
       - dega
 
   keto-migrate:
-    image: oryd/keto:v0.5.7
+    image: oryd/keto:v0.9.0-alpha.0
     environment:
+      - DSN=postgres://postgres:postgres@postgres:5432/keto?sslmode=disable
       - LOG_LEVEL=debug
     depends_on:
       - postgres
-    command: migrate sql postgres://postgres:postgres@postgres:5432/keto?sslmode=disable
+    volumes:
+      - type: bind
+        source: ./keto
+        target: /etc/config/keto
+    # command: namespace migrate legacy -c "/etc/config/keto/keto.yml" --yes
+    command: migrate up -c "/etc/config/keto/keto.yml" --yes
     restart: on-failure
     networks:
       - dega
 
   keto:
-    image: oryd/keto:v0.5.7
-    ports:
-      - "4466:4466"
     depends_on:
       - keto-migrate
+    image: oryd/keto:v0.9.0-alpha.0
+    ports:
+      - "4466:4466" # read
+      - "4467:4467" # write 
+      - "4468:4468" # metric
     environment:
-      - DSN=postgres://postgres:postgres@postgres:5432/keto?sslmode=disable
+      - LOG_LEVEL=debug
+    volumes:
+      - type: bind
+        source: ./keto
+        target: /etc/config/keto
+    command: serve -c "/etc/config/keto/keto.yml" 
     networks:
       - dega
 
@@ -230,11 +243,14 @@ services:
       - kavach-migrate
     ports:
       - 5001:8000
-    image: factly/kavach-server:0.23.0
+    image: factly/kavach-server-v0.1
     volumes:
       - type: bind
         source: ./volumes/kavach-server/data
         target: /app/data
+      - type: bind
+        source: ./kavach-config.env
+        target: /app/config.env
     environment:
       - WAIT_HOSTS=postgres:5432, kratos:4434 , keto:4466
       - KAVACH_DATABASE_HOST=postgres
@@ -250,6 +266,7 @@ services:
       - KAVACH_DOMAIN_NAME=http://127.0.0.1:4455/.factly/kavach/web
       - KAVACH_SENDGRID_API_KEY=SENDGRID_API_KEY
       - KAVACH_ENABLE_MULTITENANCY=true
+      - DISABLE_REGISTRATION=false
     restart: unless-stopped
     networks:
       - dega
@@ -259,7 +276,7 @@ services:
       - postgres
       - keto
       - kratos
-    image: factly/kavach-server:0.23.0
+    image: factly/kavach-migrate-latest
     environment:
       - WAIT_HOSTS=postgres:5432, kratos:4434 , keto:4466
       - KAVACH_DATABASE_HOST=postgres
@@ -275,12 +292,15 @@ services:
       - KAVACH_DOMAIN_NAME=http://127.0.0.1:4455/.factly/kavach/web
       - KAVACH_SENDGRID_API_KEY=SENDGRID_API_KEY
       - KAVACH_ENABLE_MULTITENANCY=true
-    entrypoint: /app/kavach-server migrate
+    volumes:
+     - type: bind
+       source: ./kavach-config.env
+       target: /app/config.env
     networks:
       - dega
 
   kavach-web:
-    image: factly/kavach-web:0.23.0-dev
+    image: factly/kavach-web-latest 
     volumes:
       - type: bind
         source: ./volumes/kavach-web/config.js
diff --git a/keto/keto.yml b/keto/keto.yml
new file mode 100644
index 000000000..c5d657bad
--- /dev/null
+++ b/keto/keto.yml
@@ -0,0 +1,10 @@
+
+dsn: postgres://postgres:postgres@postgres:5432/keto?sslmode=disable
+version: v0.9.0-alpha.0
+namespaces:
+  - id: 0
+    name: organisations
+  - id: 1
+    name: applications
+  - id: 2
+    name: spaces
diff --git a/server/service/core/action/page/list.go b/server/service/core/action/page/list.go
index a3dfaf3f5..0fbfdf686 100644
--- a/server/service/core/action/page/list.go
+++ b/server/service/core/action/page/list.go
@@ -167,6 +167,11 @@ func list(w http.ResponseWriter, r *http.Request) {
 		result.Nodes = append(result.Nodes, *pageList)
 	}
 
+	// for _, node := range result.Nodes {
+	// 	println(node)
+
+	// }
+
 	renderx.JSON(w, http.StatusOK, result)
 }
 func generateFilters(tagIDs, categoryIDs, authorIDs, status []string) string {
diff --git a/server/service/core/action/policy/mapper.go b/server/service/core/action/policy/mapper.go
index d440efc22..40c50cc1f 100644
--- a/server/service/core/action/policy/mapper.go
+++ b/server/service/core/action/policy/mapper.go
@@ -1,11 +1,9 @@
 package policy
 
 import (
-	"encoding/json"
 	"strings"
 
 	"github.com/factly/dega-server/service/core/model"
-	"github.com/factly/dega-server/util"
 )
 
 // Mapper map policy
@@ -74,16 +72,6 @@ func GetPermissions(ketoPolicy model.KetoPolicy, userID uint) []model.Permission
 
 // GetAllPolicies gives list of all keto policies
 func GetAllPolicies() ([]model.KetoPolicy, error) {
-	resp, err := util.KetoGetRequest("/engines/acp/ory/regex/policies")
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-
-	var policyList []model.KetoPolicy
-	err = json.NewDecoder(resp.Body).Decode(&policyList)
-	if err != nil {
-		return nil, err
-	}
-	return policyList, nil
+	policyLists := []model.KetoPolicy{}
+	return policyLists, nil
 }
diff --git a/server/service/core/action/role/create.go b/server/service/core/action/role/create.go
new file mode 100644
index 000000000..17b44fc3f
--- /dev/null
+++ b/server/service/core/action/role/create.go
@@ -0,0 +1,100 @@
+package role
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+
+	//"context"
+	"encoding/json"
+
+	//	"fmt"
+	"net/http"
+	"strconv"
+
+	"github.com/spf13/viper"
+
+	//"github.com/factly/dega-server/config"
+	"github.com/factly/dega-server/service/core/model"
+	//"github.com/factly/dega-server/util"
+	"github.com/factly/x/errorx"
+	"github.com/factly/x/loggerx"
+
+	//"github.com/factly/x/meilisearchx"
+	"github.com/factly/x/middlewarex"
+	"github.com/factly/x/renderx"
+
+	//"github.com/factly/x/slugx"
+	"github.com/go-chi/chi"
+)
+
+func create(w http.ResponseWriter, r *http.Request) {
+	uID, err := middlewarex.GetUser(r.Context())
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
+		return
+	}
+	spaceID := chi.URLParam(r, "space_id")
+
+	reqBody := map[string]interface{}{}
+	err = json.NewDecoder(r.Body).Decode(&reqBody)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+		return
+	}
+	fmt.Println(reqBody, "reqBody")
+	orgID := uint(reqBody["organisation_id"].(float64))
+	// if !ok {
+	// 	loggerx.Error(errors.New("organisation id is not defined"))
+	// 	errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
+	// 	return
+	// }
+	role, ok := reqBody["role"].(map[string]interface{})
+	if !ok {
+		loggerx.Error(errors.New("request body is empty"))
+		errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+		return
+	}
+	buf := new(bytes.Buffer)
+	err = json.NewEncoder(buf).Encode(&role)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+		return
+	}
+	//**need to get util func from x-package for org id
+	requrl := viper.GetString("kavach_url") + "/organisations/" + fmt.Sprintf("%d", orgID) + "/applications/" + viper.GetString("dega_application_id") + "/spaces/" + spaceID + "/roles"
+	fmt.Println(requrl, "requrl")
+	req, err := http.NewRequest("POST", requrl, buf)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+	req.Header.Set("X-User", strconv.Itoa(uID))
+	req.Header.Set("Content-Type", "application/json")
+
+	client := &http.Client{}
+	resp, err := client.Do(req)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+	if resp.StatusCode != http.StatusOK {
+		loggerx.Error(errors.New("internal server error on kavach server"))
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+	result := &model.SpaceRole{}
+	err = json.NewDecoder(resp.Body).Decode(result)
+
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+	renderx.JSON(w, http.StatusCreated, result)
+}
diff --git a/server/service/core/action/role/details.go b/server/service/core/action/role/details.go
new file mode 100644
index 000000000..f8d44d6d8
--- /dev/null
+++ b/server/service/core/action/role/details.go
@@ -0,0 +1,54 @@
+package role
+
+import (
+	"encoding/json"
+	"net/http"
+	"strconv"
+
+	"github.com/factly/x/middlewarex"
+	"github.com/spf13/viper"
+
+	//	"github.com/factly/dega-server/config"
+	"github.com/factly/dega-server/service/core/model"
+	"github.com/factly/x/errorx"
+	"github.com/factly/x/loggerx"
+
+	"github.com/factly/x/renderx"
+	"github.com/go-chi/chi"
+)
+
+func details(w http.ResponseWriter, r *http.Request) {
+	uID, err := middlewarex.GetUser(r.Context())
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
+		return
+	}
+	orgID := r.URL.Query().Get("organisation_id")
+	spaceID := chi.URLParam(r, "space_id")
+	req, err := http.NewRequest("GET", viper.GetString("kavach_url")+"/organisations/"+orgID+"/applications/"+viper.GetString("dega_application_id")+"/spaces/"+spaceID+"/roles", nil)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+	req.Header.Set("X-User", strconv.Itoa(uID))
+	req.Header.Set("Content-Type", "application/json")
+
+	client := &http.Client{}
+	resp, err := client.Do(req)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+	result := []model.SpaceRole{}
+	err = json.NewDecoder(resp.Body).Decode(&result)
+	if err != nil {
+		loggerx.Error(err)
+		return
+	}
+
+	renderx.JSON(w, http.StatusOK, result)
+
+}
diff --git a/server/service/core/action/role/route.go b/server/service/core/action/role/route.go
new file mode 100644
index 000000000..f3f0684e2
--- /dev/null
+++ b/server/service/core/action/role/route.go
@@ -0,0 +1,29 @@
+package role
+
+import (
+	//"github.com/factly/dega-server/config"
+	"github.com/go-chi/chi"
+	//"github.com/jinzhu/gorm/dialects/postgres"
+)
+
+type spaceRole struct {
+	Name        string `gorm:"column:name" json:"name"`
+	Description string `gorm:"column:description" json:"description"`
+	Slug        string `gorm:"column:slug" json:"slug"`
+}
+
+func Router() chi.Router {
+	r := chi.NewRouter()
+
+	//r.Post("/", create)
+	//r.Get("/", my)
+	r.Get("/", details)
+	r.Post("/", create)
+	// r.Route("/{space_id}", func(r chi.Router) {
+
+	//r.Put("/", update)
+	//r.Delete("/", delete)
+	//})
+
+	return r
+}
diff --git a/server/service/core/action/space/create.go b/server/service/core/action/space/create.go
index 8b2a50a34..c12db8380 100644
--- a/server/service/core/action/space/create.go
+++ b/server/service/core/action/space/create.go
@@ -1,9 +1,11 @@
 package space
 
 import (
+	"bytes"
 	"context"
 	"encoding/json"
-	"errors"
+
+	"fmt"
 	"net/http"
 	"strconv"
 
@@ -17,8 +19,7 @@ import (
 	"github.com/factly/x/meilisearchx"
 	"github.com/factly/x/middlewarex"
 	"github.com/factly/x/renderx"
-	"github.com/factly/x/slugx"
-	"github.com/factly/x/validationx"
+	//"github.com/factly/x/slugx"
 )
 
 // create - Create space
@@ -40,7 +41,7 @@ func create(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	space := &space{}
+	space := map[string]interface{}{}
 
 	err = json.NewDecoder(r.Body).Decode(&space)
 
@@ -50,24 +51,55 @@ func create(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	validationError := validationx.Check(space)
+	// err = util.CheckSpaceKetoPermission("create", uint(space.OrganisationID), uint(uID))
+	// if err != nil {
+	// 	loggerx.Error(err)
+	// 	errorx.Render(w, errorx.Parser(errorx.GetMessage(err.Error(), http.StatusUnauthorized)))
+	// 	return
+	// }
+
+	// validationError := validationx.Check(space)
+
+	// if validationError != nil {
+	// 	loggerx.Error(errors.New("validation error"))
+	// 	errorx.Render(w, validationError)
+	// 	return
+	// }
+
+	spaceOrgID := int(space["organisation_id"].(float64))
+	if spaceOrgID == 0 {
+		return
+	}
 
-	if validationError != nil {
-		loggerx.Error(errors.New("validation error"))
-		errorx.Render(w, validationError)
+	buf := new(bytes.Buffer)
+	err = json.NewEncoder(buf).Encode(&space)
+	fmt.Println(space, "spacetestnew")
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
 		return
 	}
 
-	if space.OrganisationID == 0 {
+	req, err := http.NewRequest("POST", viper.GetString("kavach_url")+"/organisations/"+strconv.Itoa(spaceOrgID)+"/applications/"+viper.GetString("dega_application_id")+"/spaces", buf)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
 		return
 	}
 
-	err = util.CheckSpaceKetoPermission("create", uint(space.OrganisationID), uint(uID))
+	req.Header.Set("X-User", strconv.Itoa(uID))
+	req.Header.Set("Content-Type", "application/json")
+
+	client := &http.Client{}
+	resp, err := client.Do(req)
+	fmt.Println(resp.Status, "resp status")
+	result := &model.Space{}
+	err = json.NewDecoder(resp.Body).Decode(result)
 	if err != nil {
 		loggerx.Error(err)
-		errorx.Render(w, errorx.Parser(errorx.GetMessage(err.Error(), http.StatusUnauthorized)))
 		return
 	}
+	fmt.Println(resp)
 
 	var superOrgID int
 	if viper.GetBool("create_super_organisation") {
@@ -81,10 +113,10 @@ func create(w http.ResponseWriter, r *http.Request) {
 		// Fetch organisation permissions
 		permission := model.OrganisationPermission{}
 		err = config.DB.Model(&model.OrganisationPermission{}).Where(&model.OrganisationPermission{
-			OrganisationID: uint(space.OrganisationID),
+			OrganisationID: uint(spaceOrgID),
 		}).First(&permission).Error
 
-		if err != nil && space.OrganisationID != superOrgID {
+		if err != nil && spaceOrgID != superOrgID {
 			loggerx.Error(err)
 			errorx.Render(w, errorx.Parser(errorx.GetMessage("cannot create more spaces", http.StatusUnprocessableEntity)))
 			return
@@ -94,7 +126,7 @@ func create(w http.ResponseWriter, r *http.Request) {
 			// Fetch total number of spaces in organisation
 			var totSpaces int64
 			config.DB.Model(&model.Space{}).Where(&model.Space{
-				OrganisationID: space.OrganisationID,
+				OrganisationID: spaceOrgID,
 			}).Count(&totSpaces)
 
 			if totSpaces >= permission.Spaces && permission.Spaces > 0 {
@@ -104,44 +136,12 @@ func create(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	var spaceSlug string
-	if space.Slug != "" && slugx.Check(space.Slug) {
-		spaceSlug = space.Slug
-	} else {
-		spaceSlug = slugx.Make(space.Name)
-	}
-
-	result := model.Space{
-		Name:              space.Name,
-		SiteTitle:         space.SiteTitle,
-		Slug:              approveSpaceSlug(spaceSlug),
-		Description:       space.Description,
-		TagLine:           space.TagLine,
-		SiteAddress:       space.SiteAddress,
-		Analytics:         space.Analytics,
-		VerificationCodes: space.VerificationCodes,
-		SocialMediaURLs:   space.SocialMediaURLs,
-		OrganisationID:    space.OrganisationID,
-		ContactInfo:       space.ContactInfo,
-		HeaderCode:        space.HeaderCode,
-		FooterCode:        space.FooterCode,
-		MetaFields:        space.MetaFields,
-	}
-
 	tx := config.DB.WithContext(context.WithValue(r.Context(), userContext, uID)).Begin()
-	err = tx.Create(&result).Error
-
-	if err != nil {
-		tx.Rollback()
-		loggerx.Error(err)
-		errorx.Render(w, errorx.Parser(errorx.DBError()))
-		return
-	}
 
 	if viper.GetBool("create_super_organisation") {
 		// Create SpacePermission for super organisation
 		var spacePermission model.SpacePermission
-		if superOrgID == space.OrganisationID {
+		if superOrgID == spaceOrgID {
 			spacePermission = model.SpacePermission{
 				SpaceID:   result.ID,
 				Media:     -1,
diff --git a/server/service/core/action/space/delete.go b/server/service/core/action/space/delete.go
index 6ce76f2ef..e2c9d1c57 100644
--- a/server/service/core/action/space/delete.go
+++ b/server/service/core/action/space/delete.go
@@ -1,6 +1,7 @@
 package space
 
 import (
+	//	"encoding/json"
 	"net/http"
 	"strconv"
 
@@ -13,6 +14,7 @@ import (
 	"github.com/factly/x/middlewarex"
 	"github.com/factly/x/renderx"
 	"github.com/go-chi/chi"
+	"github.com/spf13/viper"
 )
 
 // delete - Delete space
@@ -22,6 +24,7 @@ import (
 // @ID delete-space
 // @Consume json
 // @Produce json
+// @Param org_id header string true "Organisation ID"
 // @Param X-User header string true "User ID"
 // @Param space_id path string true "Space ID"
 // @Success 200
@@ -33,6 +36,20 @@ func delete(w http.ResponseWriter, r *http.Request) {
 		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
 		return
 	}
+	// space := map[string]interface{}{}
+
+	// err = json.NewDecoder(r.Body).Decode(&space)
+
+	// if err != nil {
+	// 	loggerx.Error(err)
+	// 	errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+	// 	return
+	// }
+
+	// spaceOrgID := int(space["organisation_id"].(float64))
+	// if spaceOrgID == 0 {
+	// 	return
+	// }
 
 	spaceID := chi.URLParam(r, "space_id")
 	sID, err := strconv.Atoi(spaceID)
@@ -45,33 +62,57 @@ func delete(w http.ResponseWriter, r *http.Request) {
 	result := &model.Space{}
 	result.ID = uint(sID)
 
-	// check record exists or not
-	err = config.DB.First(&result).Error
+	req, err := http.NewRequest("DELETE", viper.GetString("kavach_url")+"/organisations/1/applications/"+viper.GetString("dega_application_id")+"/spaces/"+spaceID, nil)
 	if err != nil {
 		loggerx.Error(err)
-		errorx.Render(w, errorx.Parser(errorx.RecordNotFound()))
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
 		return
 	}
 
-	if result.OrganisationID == 0 {
-		return
-	}
+	req.Header.Set("X-User", strconv.Itoa(uID))
+	req.Header.Set("Content-Type", "application/json")
 
-	err = util.CheckSpaceKetoPermission("delete", uint(result.OrganisationID), uint(uID))
+	client := &http.Client{}
+	resp, err := client.Do(req)
 	if err != nil {
 		loggerx.Error(err)
-		errorx.Render(w, errorx.Parser(errorx.GetMessage(err.Error(), http.StatusUnauthorized)))
 		return
 	}
+	if resp.StatusCode != 200 {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+
+	//	fmt.Println(resp)
+
+	// check record exists or not
+	// err = config.DB.First(&result).Error
+	// if err != nil {
+	// 	loggerx.Error(err)
+	// 	errorx.Render(w, errorx.Parser(errorx.RecordNotFound()))
+	// 	return
+	// }
+
+	// if result.OrganisationID == 0 {
+	// 	return
+	// }
+
+	// err = util.CheckSpaceKetoPermission("delete", uint(result.OrganisationID), uint(uID))
+	// if err != nil {
+	// 	loggerx.Error(err)
+	// 	errorx.Render(w, errorx.Parser(errorx.GetMessage(err.Error(), http.StatusUnauthorized)))
+	// 	return
+	// }
 
-	tx := config.DB.Begin()
-	tx.Model(&model.Space{}).Delete(&result)
+	// tx := config.DB.Begin()
+	// tx.Model(&model.Space{}).Delete(&result)
 
 	if config.SearchEnabled() {
 		_ = meilisearchx.DeleteDocument("dega", result.ID, "space")
 	}
 
-	tx.Commit()
+	// tx.Commit()
 
 	if util.CheckNats() {
 		if err = util.NC.Publish("space.deleted", result); err != nil {
diff --git a/server/service/core/action/space/details.go b/server/service/core/action/space/details.go
index d4ef53161..db86bed8b 100644
--- a/server/service/core/action/space/details.go
+++ b/server/service/core/action/space/details.go
@@ -1,10 +1,14 @@
 package space
 
 import (
+	"encoding/json"
 	"net/http"
 	"strconv"
 
-	"github.com/factly/dega-server/config"
+	"github.com/factly/x/middlewarex"
+	"github.com/spf13/viper"
+
+	//	"github.com/factly/dega-server/config"
 	"github.com/factly/dega-server/service/core/model"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
@@ -24,27 +28,57 @@ import (
 // @Success 200 {object} model.Space
 // @Router /core/spaces/{space_id} [get]
 func details(w http.ResponseWriter, r *http.Request) {
+	uID, err := middlewarex.GetUser(r.Context())
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
+		return
+	}
 
 	spaceID := chi.URLParam(r, "space_id")
-	id, err := strconv.Atoi(spaceID)
+	//id, err := strconv.Atoi(spaceID)
 
+	// if err != nil {
+	// 	loggerx.Error(err)
+	// 	errorx.Render(w, errorx.Parser(errorx.InvalidID()))
+	// 	return
+	// }
+	//** HARDCODED organisation id need x-package util to get organisation id , given space id and uid
+	req, err := http.NewRequest("GET", viper.GetString("kavach_url")+"/organisations/1/applications/"+viper.GetString("dega_application_id")+"/spaces/"+spaceID, nil)
 	if err != nil {
 		loggerx.Error(err)
-		errorx.Render(w, errorx.Parser(errorx.InvalidID()))
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
 		return
 	}
 
-	result := &model.Space{}
-
-	result.ID = uint(id)
-
-	err = config.DB.Model(&model.Space{}).Preload("Logo").Preload("LogoMobile").Preload("FavIcon").Preload("MobileIcon").First(&result).Error
+	req.Header.Set("X-User", strconv.Itoa(uID))
+	req.Header.Set("Content-Type", "application/json")
 
+	client := &http.Client{}
+	resp, err := client.Do(req)
 	if err != nil {
 		loggerx.Error(err)
-		errorx.Render(w, errorx.Parser(errorx.RecordNotFound()))
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
 		return
 	}
+	result := &model.Space{}
+	err = json.NewDecoder(resp.Body).Decode(result)
+	if err != nil {
+		loggerx.Error(err)
+		return
+	}
+
+	//result := &model.Space{}
+
+	//result.ID = uint(id)
+
+	//err = config.DB.Model(&model.Space{}).Preload("Logo").Preload("LogoMobile").Preload("FavIcon").Preload("MobileIcon").First(&result).Error
+
+	// if err != nil {
+	// 	loggerx.Error(err)
+	// 	errorx.Render(w, errorx.Parser(errorx.RecordNotFound()))
+	// 	return
+	// }
 
 	renderx.JSON(w, http.StatusOK, result)
 }
diff --git a/server/service/core/action/space/my.go b/server/service/core/action/space/my.go
index 0014471e4..3f6fbc056 100644
--- a/server/service/core/action/space/my.go
+++ b/server/service/core/action/space/my.go
@@ -2,16 +2,18 @@ package space
 
 import (
 	"encoding/json"
+	"fmt"
 	"io/ioutil"
 	"net/http"
 	"strconv"
 
-	"github.com/factly/dega-server/service/core/action/user"
-	"github.com/factly/dega-server/util"
+	//"github.com/factly/dega-server/service/core/action/user"
+	//"github.com/factly/dega-server/util"
+	"github.com/jinzhu/gorm/dialects/postgres"
 	"github.com/spf13/viper"
 
 	"github.com/factly/dega-server/config"
-	"github.com/factly/dega-server/service/core/action/policy"
+	//"github.com/factly/dega-server/service/core/action/policy"
 	"github.com/factly/dega-server/service/core/model"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
@@ -23,6 +25,13 @@ type organisationUser struct {
 	config.Base
 	Role string `gorm:"column:role" json:"role"`
 }
+type policyReq struct {
+	Name        string         `json:"name"`
+	Description string         `json:"description"`
+	Slug        string         `json:"slug"`
+	Permissions postgres.Jsonb `json:"permissions"`
+	Roles       []uint         `json:"roles"`
+}
 
 type orgWithSpace struct {
 	config.Base
@@ -86,9 +95,14 @@ func my(w http.ResponseWriter, r *http.Request) {
 	}
 
 	defer resp.Body.Close()
-	body, _ := ioutil.ReadAll(resp.Body)
-
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+		return
+	}
 	allOrg := []orgWithSpace{}
+
 	err = json.Unmarshal(body, &allOrg)
 
 	if err != nil {
@@ -104,16 +118,71 @@ func my(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// Fetched all the spaces related to all the organisations
+
 	var allSpaces = make([]model.Space, 0)
 
-	config.DB.Model(model.Space{}).Where("organisation_id IN (?)", allOrgIDs).Preload("Logo").Preload("LogoMobile").Preload("FavIcon").Preload("MobileIcon").Find(&allSpaces)
+	//	config.DB.Model(model.Space{}).Where("organisation_id IN (?)", allOrgIDs).Preload("Logo").Preload("LogoMobile").Preload("FavIcon").Preload("MobileIcon").Find(&allSpaces)
 
-	// fetch all the keto policies
-	policyList, err := policy.GetAllPolicies()
-	if err != nil {
-		loggerx.Error(err)
-		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
-		return
+	for _, org_id := range allOrgIDs {
+		req, err := http.NewRequest("GET", viper.GetString("kavach_url")+"/organisations/"+strconv.Itoa(org_id)+"/applications/"+viper.GetString("dega_application_id")+"/spaces/", nil)
+		req.Header.Set("X-User", strconv.Itoa(uID))
+		if err != nil {
+			loggerx.Error(err)
+			errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+			return
+		}
+		client := &http.Client{}
+		resp, err := client.Do(req)
+		if err != nil {
+			loggerx.Error(err)
+			errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+			return
+		}
+		org_spaces := []model.Space{}
+		err = json.NewDecoder(resp.Body).Decode(&org_spaces)
+		if err != nil {
+			loggerx.Error(err)
+			errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+			return
+		}
+		fmt.Println(org_spaces, "org_spaces_test")
+
+		for _, space := range org_spaces {
+			allSpaces = append(allSpaces, space)
+		}
+
+	}
+	//fetch all the keto policies
+
+	policyList := make([]policyReq, 0)
+	fmt.Println(allSpaces, "allSpaces")
+	for _, space := range allSpaces {
+		fmt.Println("strconv.Itoa(space.OrganisationID)", strconv.Itoa(space.OrganisationID))
+		fmt.Println("+strconv.Itoa(int(space.ID))", strconv.Itoa(int(space.ID)))
+		req, err := http.NewRequest("GET", viper.GetString("kavach_url")+"/organisations/"+strconv.Itoa(space.OrganisationID)+"/applications/"+viper.GetString("dega_application_id")+"/spaces/"+strconv.Itoa(int(space.ID))+"/policy/", nil)
+		req.Header.Set("X-User", strconv.Itoa(uID))
+		if err != nil {
+			loggerx.Error(err)
+			errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+			return
+		}
+		client := &http.Client{}
+		resp, err := client.Do(req)
+		if err != nil {
+			loggerx.Error(err)
+			errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+			return
+		}
+		space_policies := []policyReq{}
+		err = json.NewDecoder(resp.Body).Decode(&space_policies)
+		if err != nil {
+			loggerx.Error(err)
+			errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+			return
+		}
+		for _, space_policy := range space_policies {
+			policyList = append(policyList, space_policy)
+		}
 	}
 
 	adminPerm := model.Permission{
@@ -127,29 +196,32 @@ func my(w http.ResponseWriter, r *http.Request) {
 		spaceWithPermArr := []spaceWithPermissions{}
 		for _, space := range allSpaces {
 			if space.OrganisationID == int(each.ID) {
-				var services []string
-				services, err = util.GetAllowedServices(space.ID)
+				//*need to figure out
+				//	var services []string
+				//	services, err = util.GetAllowedServices(space.ID)
 				if err != nil {
 					loggerx.Error(err)
 					errorx.Render(w, errorx.Parser(errorx.DBError()))
 					return
 				}
-				if each.Permission.Role != "owner" {
-					permissions := user.GetPermissions(int(each.ID), int(space.ID), uID, policyList)
-					spaceWithPerm := spaceWithPermissions{
-						Space:           space,
-						Permissions:     permissions,
-						AllowedServices: services,
-					}
-					spaceWithPermArr = append(spaceWithPermArr, spaceWithPerm)
-				} else {
-					adminSpaceWithPerm := spaceWithPermissions{
-						Space:       space,
-						Permissions: []model.Permission{adminPerm},
-						AllowedServices: services,
-					}
-					spaceWithPermArr = append(spaceWithPermArr, adminSpaceWithPerm)
+				//**need to figure out
+				// if each.Permission.Role != "owner" {
+				// 	permissions := user.GetPermissions(int(each.ID), int(space.ID), uID, policyList)
+				// 	spaceWithPerm := spaceWithPermissions{
+				// 		Space:           space,
+				// 		Permissions:     permissions,
+				// 		AllowedServices: services,
+				// 	}
+				// 	spaceWithPermArr = append(spaceWithPermArr, spaceWithPerm)
+				// }
+				//else {
+				adminSpaceWithPerm := spaceWithPermissions{
+					Space:           space,
+					Permissions:     []model.Permission{adminPerm},
+					AllowedServices: []string{"core", "fact-checks", "podcast"},
 				}
+				spaceWithPermArr = append(spaceWithPermArr, adminSpaceWithPerm)
+				//	}
 			}
 		}
 		each.Spaces = spaceWithPermArr
diff --git a/server/service/core/action/space/route.go b/server/service/core/action/space/route.go
index df0b08bc8..058141cda 100644
--- a/server/service/core/action/space/route.go
+++ b/server/service/core/action/space/route.go
@@ -2,6 +2,7 @@ package space
 
 import (
 	"github.com/factly/dega-server/config"
+	"github.com/factly/dega-server/service/core/action/role"
 	"github.com/go-chi/chi"
 	"github.com/jinzhu/gorm/dialects/postgres"
 )
@@ -39,6 +40,7 @@ func Router() chi.Router {
 	r.Route("/{space_id}", func(r chi.Router) {
 		r.Get("/", details)
 		r.Put("/", update)
+		r.Mount("/roles", role.Router())
 		r.Delete("/", delete)
 	})
 
diff --git a/server/service/core/action/space/update.go b/server/service/core/action/space/update.go
index 1b77c6946..4c424038e 100644
--- a/server/service/core/action/space/update.go
+++ b/server/service/core/action/space/update.go
@@ -1,12 +1,17 @@
 package space
 
 import (
-	"context"
+	//"context"
+	"bytes"
 	"encoding/json"
-	"errors"
+	"fmt"
+
+	//"errors"
 	"net/http"
 	"strconv"
 
+	"github.com/spf13/viper"
+
 	"github.com/factly/dega-server/config"
 	"github.com/factly/dega-server/service/core/model"
 	"github.com/factly/dega-server/util"
@@ -15,8 +20,9 @@ import (
 	"github.com/factly/x/meilisearchx"
 	"github.com/factly/x/middlewarex"
 	"github.com/factly/x/renderx"
-	"github.com/factly/x/slugx"
-	"github.com/factly/x/validationx"
+
+	//	"github.com/factly/x/slugx"
+	//"github.com/factly/x/validationx"
 	"github.com/go-chi/chi"
 )
 
@@ -41,15 +47,17 @@ func update(w http.ResponseWriter, r *http.Request) {
 	}
 
 	spaceID := chi.URLParam(r, "space_id")
-	id, err := strconv.Atoi(spaceID)
 
-	if err != nil {
-		loggerx.Error(err)
-		errorx.Render(w, errorx.Parser(errorx.InvalidID()))
-		return
-	}
+	// id, err := strconv.Atoi(spaceID)
+
+	// if err != nil {
+	// 	loggerx.Error(err)
+	// 	errorx.Render(w, errorx.Parser(errorx.InvalidID()))
+	// 	return
+	//}
 
-	space := &space{}
+	// space := &space{}
+	space := map[string]interface{}{}
 
 	err = json.NewDecoder(r.Body).Decode(&space)
 
@@ -59,91 +67,131 @@ func update(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	validationError := validationx.Check(space)
+	//	validationError := validationx.Check(space)
 
-	if validationError != nil {
-		loggerx.Error(errors.New("validation error"))
-		errorx.Render(w, validationError)
+	// if validationError != nil {
+	// 	loggerx.Error(errors.New("validation error"))
+	// 	errorx.Render(w, validationError)
+	// 	return
+	// }
+
+	spaceOrgID := int(space["organisation_id"].(float64))
+	if spaceOrgID == 0 {
 		return
 	}
 
-	if space.OrganisationID == 0 {
+	buf := new(bytes.Buffer)
+	err = json.NewEncoder(buf).Encode(&space)
+	fmt.Println(space, "spacetestnew")
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
 		return
 	}
 
-	err = util.CheckSpaceKetoPermission("update", uint(space.OrganisationID), uint(uID))
+	req, err := http.NewRequest("PUT", viper.GetString("kavach_url")+"/organisations/"+strconv.Itoa(spaceOrgID)+"/applications/"+viper.GetString("dega_application_id")+"/spaces/"+spaceID, buf)
 	if err != nil {
 		loggerx.Error(err)
-		errorx.Render(w, errorx.Parser(errorx.GetMessage(err.Error(), http.StatusUnauthorized)))
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
 		return
 	}
 
-	result := model.Space{}
-	result.ID = uint(id)
-
-	// check record exists or not
-	err = config.DB.First(&result).Error
+	req.Header.Set("X-User", strconv.Itoa(uID))
+	req.Header.Set("Content-Type", "application/json")
 
+	client := &http.Client{}
+	resp, err := client.Do(req)
 	if err != nil {
 		loggerx.Error(err)
-		errorx.Render(w, errorx.Parser(errorx.RecordNotFound()))
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
 		return
 	}
-
-	tx := config.DB.WithContext(context.WithValue(r.Context(), userContext, uID)).Begin()
-	var spaceSlug string
-	if result.Slug == space.Slug {
-		spaceSlug = result.Slug
-	} else if space.Slug != "" && slugx.Check(space.Slug) {
-		spaceSlug = approveSpaceSlug(space.Slug)
-	} else {
-		spaceSlug = approveSpaceSlug(slugx.Make(space.Name))
+	if resp.StatusCode != 200 {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
 	}
-	updateMap := map[string]interface{}{
-		"name":               space.Name,
-		"slug":               spaceSlug,
-		"site_title":         space.SiteTitle,
-		"tag_line":           space.TagLine,
-		"site_address":       space.SiteAddress,
-		"description":        space.Description,
-		"logo_id":            space.LogoID,
-		"logo_mobile_id":     space.LogoMobileID,
-		"fav_icon_id":        space.FavIconID,
-		"mobile_icon_id":     space.MobileIconID,
-		"header_code":        space.HeaderCode,
-		"footer_code":        space.FooterCode,
-		"meta_fields":        space.MetaFields,
-		"verification_codes": space.VerificationCodes,
-		"social_media_urls":  space.SocialMediaURLs,
-		"contact_info":       space.ContactInfo,
-		"analytics":          space.Analytics,
+	fmt.Println(resp.Status, "resp status")
+	result := &model.Space{}
+	err = json.NewDecoder(resp.Body).Decode(result)
+	if err != nil {
+		loggerx.Error(err)
+		return
 	}
 
+	// err = util.CheckSpaceKetoPermission("update", uint(space.OrganisationID), uint(uID))
+	// if err != nil {
+	// 	loggerx.Error(err)
+	// 	errorx.Render(w, errorx.Parser(errorx.GetMessage(err.Error(), http.StatusUnauthorized)))
+	// 	return
+	// }
+
+	// result := model.Space{}
+	// result.ID = uint(id)
+
+	// check record exists or not
+	//	err = config.DB.First(&result).Error
+
+	// if err != nil {
+	// 	loggerx.Error(err)
+	// 	errorx.Render(w, errorx.Parser(errorx.RecordNotFound()))
+	// 	return
+	// }
+
+	//	tx := config.DB.WithContext(context.WithValue(r.Context(), userContext, uID)).Begin()
+	// var spaceSlug string
+	// if result.Slug == space.Slug {
+	// 	spaceSlug = result.Slug
+	// } else if space.Slug != "" && slugx.Check(space.Slug) {
+	// 	spaceSlug = approveSpaceSlug(space.Slug)
+	// } else {
+	// 	spaceSlug = approveSpaceSlug(slugx.Make(space.Name))
+	// }
+	// updateMap := map[string]interface{}{
+	// 	"name":               space.Name,
+	// 	"slug":               spaceSlug,
+	// 	"site_title":         space.SiteTitle,
+	// 	"tag_line":           space.TagLine,
+	// 	"site_address":       space.SiteAddress,
+	// 	"description":        space.Description,
+	// 	"logo_id":            space.LogoID,
+	// 	"logo_mobile_id":     space.LogoMobileID,
+	// 	"fav_icon_id":        space.FavIconID,
+	// 	"mobile_icon_id":     space.MobileIconID,
+	// 	"header_code":        space.HeaderCode,
+	// 	"footer_code":        space.FooterCode,
+	// 	"meta_fields":        space.MetaFields,
+	// 	"verification_codes": space.VerificationCodes,
+	// 	"social_media_urls":  space.SocialMediaURLs,
+	// 	"contact_info":       space.ContactInfo,
+	// 	"analytics":          space.Analytics,
+	// }
+
 	// check if the id for all the mediums in space is 0 or not if it is zero then make it null
-	if space.LogoID == 0 {
-		updateMap["logo_id"] = nil
-	}
+	// if space.LogoID == 0 {
+	// 	updateMap["logo_id"] = nil
+	// }
 
-	if space.LogoMobileID == 0 {
-		updateMap["logo_mobile_id"] = nil
-	}
+	// if space.LogoMobileID == 0 {
+	// 	updateMap["logo_mobile_id"] = nil
+	// }
 
-	if space.FavIconID == 0 {
-		updateMap["fav_icon_id"] = nil
-	}
+	// if space.FavIconID == 0 {
+	// 	updateMap["fav_icon_id"] = nil
+	// }
 
-	if space.MobileIconID == 0 {
-		updateMap["mobile_icon_id"] = nil
-	}
+	// if space.MobileIconID == 0 {
+	// 	updateMap["mobile_icon_id"] = nil
+	// }
 
-	err = tx.Model(&result).Updates(&updateMap).Preload("Logo").Preload("LogoMobile").Preload("FavIcon").Preload("MobileIcon").First(&result).Error
+	// err = tx.Model(&result).Updates(&updateMap).Preload("Logo").Preload("LogoMobile").Preload("FavIcon").Preload("MobileIcon").First(&result).Error
 
-	if err != nil {
-		tx.Rollback()
-		loggerx.Error(err)
-		errorx.Render(w, errorx.Parser(errorx.DBError()))
-		return
-	}
+	// if err != nil {
+	// 	tx.Rollback()
+	// 	loggerx.Error(err)
+	// 	errorx.Render(w, errorx.Parser(errorx.DBError()))
+	// 	return
+	// }
 
 	// Update into meili index
 	meiliObj := map[string]interface{}{
@@ -163,7 +211,7 @@ func update(w http.ResponseWriter, r *http.Request) {
 		_ = meilisearchx.UpdateDocument("dega", meiliObj)
 	}
 
-	tx.Commit()
+	//tx.Commit()
 
 	if util.CheckNats() {
 		if err = util.NC.Publish("space.updated", result); err != nil {
diff --git a/server/service/core/action/user/permission.go b/server/service/core/action/user/permission.go
index e78b4ad99..a9abc975c 100644
--- a/server/service/core/action/user/permission.go
+++ b/server/service/core/action/user/permission.go
@@ -7,6 +7,7 @@ import (
 	"strings"
 
 	"github.com/factly/dega-server/util/arrays"
+	"github.com/jinzhu/gorm/dialects/postgres"
 
 	"github.com/factly/x/renderx"
 	"github.com/go-chi/chi"
@@ -32,6 +33,14 @@ import (
 // @Param user_id path string true "User ID"
 // @Success 200 {object} []model.Permission
 // @Router /core/users/{user_id}/permissions [get]
+type policyReq struct {
+	Name        string         `json:"name"`
+	Description string         `json:"description"`
+	Slug        string         `json:"slug"`
+	Permissions postgres.Jsonb `json:"permissions"`
+	Roles       []uint         `json:"roles"`
+}
+
 func userpermissions(w http.ResponseWriter, r *http.Request) {
 	uID, err := middlewarex.GetUser(r.Context())
 	if err != nil {
diff --git a/server/service/core/model/role.go b/server/service/core/model/role.go
new file mode 100644
index 000000000..e6fdda76a
--- /dev/null
+++ b/server/service/core/model/role.go
@@ -0,0 +1,33 @@
+package model
+
+import (
+	"github.com/factly/dega-server/config"
+	"github.com/jinzhu/gorm/dialects/postgres"
+)
+
+type SpaceRole struct {
+	config.Base
+	Name        string `gorm:"column:name" json:"name"`
+	Description string `gorm:"column:description" json:"description"`
+	Slug        string `gorm:"column:slug" json:"slug"`
+	SpaceID     uint   `gorm:"column:space_id" json:"space_id"`
+	Space       *Space `gorm:"foreignKey:space_id" json:"space,omitempty"`
+	Users       []User `gorm:"many2many:space_roles_users;" json:"users"`
+}
+
+type User struct {
+	config.Base
+	Email            string         `gorm:"column:email;uniqueIndex" json:"email"`
+	KID              string         `gorm:"column:kid;" json:"kid"`
+	FirstName        string         `gorm:"column:first_name" json:"first_name"`
+	LastName         string         `gorm:"column:last_name" json:"last_name"`
+	Slug             string         `gorm:"column:slug" json:"slug"`
+	DisplayName      string         `gorm:"column:display_name" json:"display_name"`
+	Gender           string         `gorm:"column:gender" json:"gender"`
+	FeaturedMediumID *uint          `gorm:"column:featured_medium_id;default:NULL" json:"featured_medium_id"`
+	Medium           *Medium        `gorm:"foreignKey:featured_medium_id" json:"medium"`
+	SocialMediaURLs  postgres.Jsonb `gorm:"column:social_media_urls" json:"social_media_urls" swaggertype:"primitive,string"`
+	Description      string         `gorm:"column:description" json:"description"`
+	Meta             postgres.Jsonb `gorm:"column:meta" json:"meta" swaggertype:"primitive,string"`
+	Organisations    []Organisation `gorm:"many2many:organisation_users;" json:"organisations"`
+}
diff --git a/server/util/organisationID.go b/server/util/organisationID.go
index a2b501bab..a1cca5b2a 100644
--- a/server/util/organisationID.go
+++ b/server/util/organisationID.go
@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/factly/dega-server/config"
+	//	"github.com/factly/dega-server/config"
 	"github.com/factly/dega-server/service/core/model"
 	"github.com/factly/x/middlewarex"
 )
@@ -28,16 +28,11 @@ func GenerateOrganisation(h http.Handler) http.Handler {
 				w.WriteHeader(http.StatusUnauthorized)
 				return
 			}
-
-			space := &model.Space{}
-			space.ID = uint(sID)
-
-			err = config.DB.First(&space).Error
-
-			if err != nil {
-				w.WriteHeader(http.StatusUnauthorized)
-				return
+			//** need to make change in x-package if space id is given organisation should be returned
+			space := &model.Space{
+				OrganisationID: 1,
 			}
+			space.ID = uint(sID)
 
 			ctx = context.WithValue(ctx, OrganisationIDKey, space.OrganisationID)
 			h.ServeHTTP(w, r.WithContext(ctx))
diff --git a/studio/src/__tests__/actions/sachFactChecks.js b/studio/src/__tests__/actions/sachFactChecks.js
index fdae4142e..5025f8760 100644
--- a/studio/src/__tests__/actions/sachFactChecks.js
+++ b/studio/src/__tests__/actions/sachFactChecks.js
@@ -73,32 +73,30 @@ const factcheck = {
 };
 
 describe('sach fact-checks action', () => {
+  // testing the loadingSachFactChecks action
+  it('should create an action to set loading to true', () => {
+    const startLoadingAction = {
+      type: types.SET_SACH_FACT_CHECKS_LOADING,
+      payload: true,
+    };
+    expect(actions.loadingSachFactChecks()).toEqual(startLoadingAction);
+  });
 
-	// testing the loadingSachFactChecks action
-	it('should create an action to set loading to true', () => {
-		const startLoadingAction = {
-			type: types.SET_SACH_FACT_CHECKS_LOADING,
-			payload: true,
-		}
-		expect(actions.loadingSachFactChecks()).toEqual(startLoadingAction)
-	});
+  // testing the stopLoading fact check action
+  it('should create an action to stop loading', () => {
+    const stopLoadingAction = {
+      type: types.SET_SACH_FACT_CHECKS_LOADING,
+      payload: false,
+    };
+    expect(actions.stopLoading()).toEqual(stopLoadingAction);
+  });
 
-	// testing the stopLoading fact check action
-	it('should create an action to stop loading', () => {
-		const stopLoadingAction = {
-			type: types.SET_SACH_FACT_CHECKS_LOADING,
-			payload: false
-		}
-		expect(actions.stopLoading()).toEqual(stopLoadingAction);
-	})
-
-	//testing it addFactChecks action
-	it('should create an action to add fact checks', () => {
-		const addFactChecksAction  = {
-			type: types.ADD_SACH_FACT_CHECKS,
-			payload: [factcheck]
-		};
-		expect(actions.addFactChecks([factcheck])).toEqual(addFactChecksAction);
-	})
+  //testing it addFactChecks action
+  it('should create an action to add fact checks', () => {
+    const addFactChecksAction = {
+      type: types.ADD_SACH_FACT_CHECKS,
+      payload: [factcheck],
+    };
+    expect(actions.addFactChecks([factcheck])).toEqual(addFactChecksAction);
+  });
 });
- 
\ No newline at end of file
diff --git a/studio/src/actions/roles.js b/studio/src/actions/roles.js
new file mode 100644
index 000000000..380efd0aa
--- /dev/null
+++ b/studio/src/actions/roles.js
@@ -0,0 +1,163 @@
+import axios from 'axios';
+import {
+  ADD_ROLES,
+  ADD_ROLES_REQUEST,
+  SET_ROLES_LOADING,
+  RESET_ROLES,
+  ROLES_API,
+  UPDATE_ROLE,
+  GET_ROLE,
+} from '../constants/roles';
+import { addErrorNotification, addSuccessNotification } from './notifications';
+import getError from '../utils/getError';
+
+// action to fetch all roles
+// export const addDefaultRoles = (query) => {
+//   return (dispatch) => {
+//     dispatch(loadingRoles());
+//     return axios
+//       .post(ROLES_API + '/default')
+//       .then((response) => {
+//         dispatch(addRoles(response.data.nodes));
+//         dispatch(
+//           addRolesRequest({
+//             data: response.data.nodes.map((item) => item.id),
+//             query: query,
+//             total: response.data.total,
+//           }),
+//         );
+//       })
+//       .catch((error) => {
+//         dispatch(addErrorNotification(getError(error)));
+//       })
+//       .finally(() => dispatch(stopRolesLoading()));
+//   };
+// };
+
+// action to fetch all roles
+export const getRoles = (query) => {
+  return (dispatch, getState) => {
+    const currentSpaceID = getState().spaces?.selected;
+    const currentOrgID = getState().spaces?.details[currentSpaceID].organisation_id;
+    const params = new URLSearchParams();
+    params.append('organisation_id', currentOrgID);
+    dispatch(loadingRoles());
+    return axios
+      .get(ROLES_API(currentSpaceID), {
+        params: params,
+      })
+      .then((response) => {
+        dispatch(addRoles(response.data.nodes));
+        dispatch(
+          addRolesRequest({
+            data: response.data.nodes.map((item) => item.id),
+            query: query,
+            total: response.data.total,
+          }),
+        );
+      })
+      .catch((error) => {
+        dispatch(addErrorNotification(getError(error)));
+      })
+      .finally(() => dispatch(stopRolesLoading()));
+  };
+};
+
+// action to fetch role by id
+export const getRole = (id) => {
+  return (dispatch, getState) => {
+    const currentSpaceID = getState().spaces?.selected;
+    dispatch(loadingRoles());
+    return axios
+      .get(ROLES_API(currentSpaceID) + '/' + id)
+      .then((response) => {
+        dispatch(addRole(GET_ROLE, response.data));
+      })
+      .catch((error) => {
+        dispatch(addErrorNotification(getError(error)));
+      })
+      .finally(() => dispatch(stopRolesLoading()));
+  };
+};
+
+// action to create role
+export const createRole = (data) => {
+  return (dispatch, getState) => {
+    const currentSpaceID = getState().spaces?.selected;
+    const currentOrgID = getState().spaces?.details[currentSpaceID].organisation_id;
+    dispatch(loadingRoles());
+    return axios
+      .post(ROLES_API(currentSpaceID), { role: data, organisation_id: currentOrgID })
+      .then(() => {
+        dispatch(resetRoles());
+        dispatch(addSuccessNotification('Roles created'));
+      })
+      .catch((error) => {
+        dispatch(addErrorNotification(getError(error)));
+      });
+  };
+};
+
+// action to update role by id
+export const updateRole = (data) => {
+  return (dispatch, getState) => {
+    const currentSpaceID = getState().spaces?.selected;
+    const currentOrgID = getState().spaces?.details[currentSpaceID].organisation_id;
+    dispatch(loadingRoles());
+    return axios
+      .put(ROLES_API(currentSpaceID) + '/' + data.id, { role: data, organisation_id: currentOrgID })
+      .then((response) => {
+        dispatch(addRole(UPDATE_ROLE, response.data));
+        dispatch(addSuccessNotification('Roles updated'));
+      })
+      .catch((error) => {
+        dispatch(addErrorNotification(getError(error)));
+      })
+      .finally(() => dispatch(stopRolesLoading()));
+  };
+};
+
+// action to delete role by id
+export const deleteRole = (id) => {
+  return (dispatch) => {
+    dispatch(loadingRoles());
+    return axios
+      .delete(ROLES_API + '/' + id)
+      .then(() => {
+        dispatch(resetRoles());
+        dispatch(addSuccessNotification('Roles deleted'));
+      })
+      .catch((error) => {
+        dispatch(addErrorNotification(getError(error)));
+      });
+  };
+};
+
+export const loadingRoles = () => ({
+  type: SET_ROLES_LOADING,
+  payload: true,
+});
+
+export const stopRolesLoading = () => ({
+  type: SET_ROLES_LOADING,
+  payload: false,
+});
+
+export const addRole = (type, payload) => ({
+  type,
+  payload,
+});
+
+export const addRoles = (payload) => ({
+  type: ADD_ROLES,
+  payload,
+});
+
+export const addRolesRequest = (payload) => ({
+  type: ADD_ROLES_REQUEST,
+  payload,
+});
+
+export const resetRoles = () => ({
+  type: RESET_ROLES,
+});
diff --git a/studio/src/config/routesConfig.js b/studio/src/config/routesConfig.js
index b7cdcbc7a..9c85ea584 100644
--- a/studio/src/config/routesConfig.js
+++ b/studio/src/config/routesConfig.js
@@ -71,6 +71,10 @@ import Policies from '../pages/policies';
 import CreatePolicy from '../pages/policies/CreatePolicy';
 import EditPolicy from '../pages/policies/EditPolicy';
 
+//Roles
+import Roles from '../pages/roles';
+import CreateRole from '../pages/roles/CreateRole';
+
 //Fact Checks
 import GoogleFactCheck from '../pages/fact-checks/GoogleFactCheck';
 import Factly from '../pages/fact-checks/Factly';
@@ -140,6 +144,7 @@ import Permissions from '../pages/permissions';
 
 //Reindex
 import Reindex from '../pages/spaces/Reindex';
+import { Component } from 'react';
 
 const routes = {
   dashboard: {
@@ -405,6 +410,12 @@ const routes = {
     Component: Policies,
     title: 'Policies',
   },
+  roles: {
+    path: '/members/roles',
+    menuKey: '/members',
+    Component: Roles,
+    title: 'Roles',
+  },
   createPolicy: {
     path: '/members/policies/create',
     menuKey: '/members',
@@ -415,6 +426,16 @@ const routes = {
       action: 'create',
     },
   },
+  createRole: {
+    path: '/members/roles/create',
+    menuKey: '/members',
+    Component: CreateRole,
+    title: 'New Role',
+    // permission: {
+    //   resource: 'policies',
+    //   action: 'create',
+    // },
+  },
   editPolicy: {
     path: '/members/policies/:id/edit',
     menuKey: '/members',
diff --git a/studio/src/constants/date.js b/studio/src/constants/date.js
index 6900dd55d..d2c7a7a71 100644
--- a/studio/src/constants/date.js
+++ b/studio/src/constants/date.js
@@ -1 +1,14 @@
-export const listOfMonths = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"]
\ No newline at end of file
+export const listOfMonths = [
+  'January',
+  'February',
+  'March',
+  'April',
+  'May',
+  'June',
+  'July',
+  'August',
+  'September',
+  'October',
+  'November',
+  'December',
+];
diff --git a/studio/src/constants/roles.js b/studio/src/constants/roles.js
new file mode 100644
index 000000000..b8871db34
--- /dev/null
+++ b/studio/src/constants/roles.js
@@ -0,0 +1,10 @@
+//Actions
+export const GET_ROLE = 'GET_ROLE';
+export const UPDATE_ROLE = 'UPDATE_ROLE';
+export const ADD_ROLES = 'ADD_ROLES';
+export const ADD_ROLES_REQUEST = 'ADD_ROLES_REQUEST';
+export const RESET_ROLES = 'RESET_ROLES';
+export const SET_ROLES_LOADING = 'SET_ROLES_LOADING';
+
+//API
+export const ROLES_API = (selectedSpace) => `core/spaces/${selectedSpace}/roles`;
diff --git a/studio/src/layouts/basic.js b/studio/src/layouts/basic.js
index 67a33cb4f..be9a6e466 100644
--- a/studio/src/layouts/basic.js
+++ b/studio/src/layouts/basic.js
@@ -94,9 +94,9 @@ function BasicLayout(props) {
   }, [time, description]);
 
   React.useEffect(() => {
-    if (redirect?.code === 307) {
-      window.location.href = window.REACT_APP_KAVACH_PUBLIC_URL;
-    }
+    // if (redirect?.code === 307) {
+    //   window.location.href = window.REACT_APP_KAVACH_PUBLIC_URL;
+    // }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [redirect]);
 
diff --git a/studio/src/pages/fact-checks/components/FactCheckForm.js b/studio/src/pages/fact-checks/components/FactCheckForm.js
index 3d5f4082f..5538e70b0 100644
--- a/studio/src/pages/fact-checks/components/FactCheckForm.js
+++ b/studio/src/pages/fact-checks/components/FactCheckForm.js
@@ -296,9 +296,11 @@ function FactCheckForm({ onCreate, data = {}, actions = {}, format }) {
                   style={{ fontSize: '2.5rem', fontWeight: 'bold', textAlign: 'center' }}
                 />
               </Form.Item>
-              {
-                (data?.updated_at) ? <p style={{fontSize: '18px', color:'#595E60'}}>Last updated on : {getDatefromStringWithoutDay(data.updated_at)}</p> : null
-              }
+              {data?.updated_at ? (
+                <p style={{ fontSize: '18px', color: '#595E60' }}>
+                  Last updated on : {getDatefromStringWithoutDay(data.updated_at)}
+                </p>
+              ) : null}
               {form.getFieldValue('claims') &&
               form.getFieldValue('claims').length > 0 &&
               !loading ? (
diff --git a/studio/src/pages/members/index.js b/studio/src/pages/members/index.js
index a136c1a6b..781f7d0f8 100644
--- a/studio/src/pages/members/index.js
+++ b/studio/src/pages/members/index.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Card, Avatar, Row, Col } from 'antd';
-import { UserOutlined, EyeTwoTone } from '@ant-design/icons';
+import { UserOutlined, EyeTwoTone, UsergroupAddOutlined } from '@ant-design/icons';
 import { Link } from 'react-router-dom';
 import { Helmet } from 'react-helmet';
 const Members = () => {
@@ -44,6 +44,22 @@ const Members = () => {
             </Card>
           </Link>
         </Col>
+        <Col span={12}>
+          <Link to="/members/roles">
+            <Card style={gridStyle} hoverable>
+              <Meta
+                avatar={
+                  <Avatar
+                    icon={<UsergroupAddOutlined twoToneColor="#ffb41f" />}
+                    style={{ backgroundColor: 'transparent', color: '#ffb41f' }}
+                  />
+                }
+                title="Roles"
+                description="Role settings"
+              />
+            </Card>
+          </Link>
+        </Col>
       </Row>
     </div>
   );
diff --git a/studio/src/pages/posts/components/PostForm.js b/studio/src/pages/posts/components/PostForm.js
index 42fe42704..3b55948d2 100644
--- a/studio/src/pages/posts/components/PostForm.js
+++ b/studio/src/pages/posts/components/PostForm.js
@@ -236,9 +236,11 @@ function PostForm({ onCreate, data = {}, actions = {}, format, page = false }) {
                   autoSize={{ minRows: 2, maxRows: 6 }}
                 />
               </Form.Item>
-              {
-                (data?.updated_at) ? <p style={{fontSize: '18px', color:'#595E60'}}>Last updated on : {getDatefromStringWithoutDay(data.updated_at)}</p> : null
-              }
+              {data?.updated_at ? (
+                <p style={{ fontSize: '18px', color: '#595E60' }}>
+                  Last updated on : {getDatefromStringWithoutDay(data.updated_at)}
+                </p>
+              ) : null}
               <DescriptionInput
                 type="editor"
                 formItemProps={{ className: 'post-description' }}
diff --git a/studio/src/pages/roles/CreateRole.js b/studio/src/pages/roles/CreateRole.js
new file mode 100644
index 000000000..1dc13fdcd
--- /dev/null
+++ b/studio/src/pages/roles/CreateRole.js
@@ -0,0 +1,29 @@
+import React from 'react';
+import { createRole } from '../../actions/roles';
+import { useDispatch } from 'react-redux';
+import { useHistory } from 'react-router-dom';
+import { Helmet } from 'react-helmet';
+import RoleCreateForm from './components/RoleForm';
+
+function CreateRole() {
+  const history = useHistory();
+
+  const dispatch = useDispatch();
+  const onCreate = (values) => {
+    console.log(values, 'onCreate');
+    // values.users = values.users.map((item) => item.toString());
+    // values.permissions = values.permissions.filter(
+    //   (item) => item && item.resource && item.actions.length > 0,
+    // );
+    dispatch(createRole(values)).then(() => history.push('/members/roles'));
+  };
+
+  return (
+    <>
+      <Helmet title={'Create Role'} />
+      <RoleCreateForm onCreate={onCreate} />
+    </>
+  );
+}
+
+export default CreateRole;
diff --git a/studio/src/pages/roles/EditRole.js b/studio/src/pages/roles/EditRole.js
new file mode 100644
index 000000000..b8c635795
--- /dev/null
+++ b/studio/src/pages/roles/EditRole.js
@@ -0,0 +1,53 @@
+import React from 'react';
+import { getRole, updateRole } from '../../actions/roles';
+import { useDispatch } from 'react-redux';
+import { useHistory } from 'react-router-dom';
+import { Helmet } from 'react-helmet';
+import RoleEditForm from './components/RoleForm';
+
+function EditRole() {
+  const history = useHistory();
+  const { id } = useParams();
+  const dispatch = useDispatch();
+  const { role, loading } = useSelector((state) => {
+    // if (!state.policies.details[id])
+    //   return {
+    //     policy: null,
+    //     loading: state.policies.loading,
+    //   };
+
+    return {
+      policy: {
+        ...state.roles.details[id],
+        // permissions: state.policies.details[id].permissions.reduce(
+        //   (obj, item) => Object.assign(obj, { [item.resource]: item.actions }),
+        //   {},
+        // ),
+        // users: state.policies.details[id].users
+        //   ? state.policies.details[id].users.map((item) => parseInt(item.id))
+        //   : [],
+      },
+      loading: state.policies.loading,
+    };
+  });
+  React.useEffect(() => {
+    dispatch(getRole(id));
+  }, [dispatch, id]);
+  const onCreate = (values) => {
+    console.log('this has beeen called');
+    // values.users = values.users.map((item) => item.toString());
+    // values.permissions = values.permissions.filter(
+    //   (item) => item && item.resource && item.actions.length > 0,
+    // );
+    dispatch(updateRole({ ...role, ...values })).then(() => history.push('/members/roles'));
+  };
+
+  return (
+    <>
+      <Helmet title={'Create Role'} />
+      <RoleEditForm onCreate={onCreate} data={role} />
+    </>
+  );
+}
+
+export default EditRole;
diff --git a/studio/src/pages/roles/components/RoleForm.js b/studio/src/pages/roles/components/RoleForm.js
new file mode 100644
index 000000000..db28f07e8
--- /dev/null
+++ b/studio/src/pages/roles/components/RoleForm.js
@@ -0,0 +1,64 @@
+import React from 'react';
+import { Button, Card, Form, Input, Skeleton } from 'antd';
+import { SlugInput } from '../../../components/FormItems';
+import { maker } from '../../../utils/sluger';
+
+function RoleForm({ data = {}, onCreate }) {
+  const [form] = Form.useForm();
+
+  const { TextArea } = Input;
+  const onTitleChange = (string) => {
+    form.setFieldsValue({
+      slug: maker(string),
+    });
+  };
+  return (
+    <Card style={{ width: '50%' }}>
+      <Form
+        form={form}
+        layout="vertical"
+        name="update-space-role"
+        onFinish={(values) => {
+          console.log(values);
+          onCreate(values);
+          //  console.log(onCreate,"onCreate")
+          //  console.log(onCreate,"function")
+          // console.log(something,"something")
+          // console.log("hello" )
+
+          // onReset();
+        }}
+        //  initialValues={{
+        //    name: role.name,
+        //    slug: role.slug,
+        //    description: role.description,
+        //  }}
+      >
+        {/* <h3> Space : {space?.name}</h3> */}
+        <Form.Item
+          name="name"
+          label="Name"
+          rules={[
+            {
+              required: true,
+              message: 'Please input role name!',
+            },
+          ]}
+        >
+          <Input onChange={(e) => onTitleChange(e.target.value)} placeholder="enter the name" />
+        </Form.Item>
+        <SlugInput />
+        <Form.Item name="description" label="Description">
+          <TextArea rows={4} />
+        </Form.Item>
+        <Form.Item>
+          <Button type="primary" htmlType="submit" block form="update-space-role">
+            {data && data.id ? 'Update' : 'Submit'}
+          </Button>
+        </Form.Item>
+      </Form>
+    </Card>
+  );
+}
+
+export default RoleForm;
diff --git a/studio/src/pages/roles/components/RoleList.js b/studio/src/pages/roles/components/RoleList.js
new file mode 100644
index 000000000..ac1d808c5
--- /dev/null
+++ b/studio/src/pages/roles/components/RoleList.js
@@ -0,0 +1,150 @@
+import React from 'react';
+import { Popconfirm, Button, Table, Avatar, Tooltip, Space } from 'antd';
+import { useSelector, useDispatch } from 'react-redux';
+//import { deleteSpaceRole, getSpaceRoles } from '../../../../../../../actions/roles';
+import { Link } from 'react-router-dom';
+import { UserAddOutlined, DeleteOutlined } from '@ant-design/icons';
+
+function RoleList({ roles, total, loading }) {
+  //   const dispatch = useDispatch();
+  //   const { roles, loading } = useSelector((state) => {
+  //     var roleIDs = [];
+  //     roleIDs = state.spaces.details[spaceID]?.roleIDs || [];
+  //     return {
+  //       roles: roleIDs.map((id) => ({
+  //         ...state.roles.space[spaceID][id],
+  //         users:
+  //           state.roles.space[spaceID][id]?.users.map((userID) => state.users.details[userID]) || [],
+  //       })),
+  //       loading: state.roles.loading,
+  //     };
+  //   });
+
+  const columns = [
+    {
+      title: 'Name',
+      dataIndex: 'name',
+      key: 'name',
+      width: '15%',
+      render: (_, record) => {
+        return (
+          <div key={record.id}>
+            {/* {role === 'owner' ? ( */}
+            <Link
+              key={record.id}
+              style={{
+                marginRight: 8,
+              }}
+              to={{
+                pathname: ``,
+              }}
+            >
+              {record?.name}
+            </Link>
+            {/* ) : (
+              <h4 key={record.id}>{record?.name}</h4>
+            ) */}
+          </div>
+        );
+      },
+    },
+    {
+      title: 'Description',
+      dataIndex: 'description',
+      key: 'description',
+      width: '15%',
+    },
+    {
+      title: 'Users',
+      dataIndex: 'users',
+      key: 'users',
+      width: '15%',
+      render: (_, record) => {
+        return (
+          <Avatar.Group
+            maxCount={3}
+            maxStyle={{ color: '#f56a00', backgroundColor: '#fde3cf' }}
+            key={record.id}
+          >
+            {record?.users?.map((user) => {
+              return (
+                <Tooltip title={user?.email} placement="top" key={'role-' + user?.id}>
+                  <Avatar
+                    key={user?.id}
+                    style={{
+                      backgroundColor:
+                        '#' + ((Math.random() * 0xffffff) << 0).toString(16).padStart(6, '0'),
+                    }}
+                  >
+                    {user?.email?.charAt(0)}
+                  </Avatar>
+                </Tooltip>
+              );
+            })}
+          </Avatar.Group>
+        );
+      },
+    },
+    {
+      title: 'Action',
+      dataIndex: 'operation',
+      width: '20%',
+      render: (_, record) => {
+        return (
+          <span>
+            {/* {role === 'owner' ? ( */}
+              <Space>
+                <Link
+                  to={{
+                    pathname: ``,
+                  }}
+                >
+                  <Button icon={<UserAddOutlined />} primary="true">
+                    Add users
+                  </Button>
+                </Link>
+                <Popconfirm title="Sure to Revoke?" onConfirm={() => onDelete(record.id)}>
+                  <Button type="danger" icon={<DeleteOutlined />}>
+                    {' '}
+                    Delete{' '}
+                  </Button>
+                </Popconfirm>
+              </Space>
+            {/* ) */}
+            {/* // : null} */}
+          </span>
+        );
+      },
+    },
+  ];
+
+  //   const fetchRoles = () => {
+  //     dispatch(getSpaceRoles(appID, spaceID));
+  //   };
+
+  //   const onDelete = (id) => {
+  //     dispatch(deleteSpaceRole(appID, spaceID, id)).then(() =>
+  //       dispatch(getSpaceRoles(appID, spaceID)),
+  //     );
+  //   };
+
+  //   React.useEffect(() => {
+  //     fetchRoles();
+  //     // eslint-disable-next-line
+  //   }, [dispatch, appID, spaceID]);
+
+  return (
+    <div>
+      <Table
+        bordered
+        columns={columns}
+        dataSource={roles}
+        rowKey={'id'}
+        loading={loading}
+        //  style={{ width: '78vw' }}
+      />
+    </div>
+  );
+}
+
+export default RoleList;
diff --git a/studio/src/pages/roles/index.js b/studio/src/pages/roles/index.js
new file mode 100644
index 000000000..931031c9a
--- /dev/null
+++ b/studio/src/pages/roles/index.js
@@ -0,0 +1,72 @@
+import React from 'react';
+import { Space, Button, Row } from 'antd';
+import { Link, useLocation } from 'react-router-dom';
+//import PolicyList from './components/PolicyList';
+import getUserPermission from '../../utils/getUserPermission';
+import { useDispatch, useSelector } from 'react-redux';
+import { getRoles } from '../../actions/roles';
+import deepEqual from 'deep-equal';
+import Loader from '../../components/Loader';
+import { Helmet } from 'react-helmet';
+import RoleList from './components/RoleList';
+
+function Roles() {
+  const spaces = useSelector(({ spaces }) => spaces);
+  const actions = getUserPermission({ resource: 'roles', action: 'get', spaces });
+  const dispatch = useDispatch();
+  const query = new URLSearchParams(useLocation().search);
+  const [filters, setFilters] = React.useState({
+    page: 1,
+    limit: 20,
+  });
+  query.set('page', filters.page);
+  window.history.replaceState({}, '', `${window.PUBLIC_URL}${useLocation().pathname}?${query}`);
+
+  const { roles, total, loading } = useSelector((state) => {
+    const node = state.roles.req.find((item) => {
+      return deepEqual(item.query, filters);
+    });
+
+    if (node)
+      return {
+        roles: node.data.map((element) => state.roles.details[element]),
+        total: node.total,
+        loading: state.roles.loading,
+      };
+    return { roles: [], total: 0, loading: state.roles.loading };
+  });
+  React.useEffect(() => {
+    fetchRoles();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [filters]);
+
+  const fetchRoles = () => {
+    dispatch(getRoles(filters));
+  };
+  return loading ? (
+    <Loader />
+  ) : (
+    <Space direction="vertical">
+      <Helmet title={'Roles'} />
+      <Row gutter={16} justify="end">
+        <Link to="/members/roles/create">
+          <Button
+            //  disabled={!(actions.includes('admin') || actions.includes('create'))}
+            type="primary"
+          >
+            New Role
+          </Button>
+        </Link>
+      </Row>
+      <RoleList
+        // actions={actions}
+        data={{ roles, total, loading }}
+        // filters={filters}
+        // setFilters={setFilters}
+        // fetchPolicies={fetchPolicies}
+      />
+    </Space>
+  );
+}
+
+export default Roles;
diff --git a/studio/src/reducers/index.js b/studio/src/reducers/index.js
index 3341e8be2..2bf0e435a 100644
--- a/studio/src/reducers/index.js
+++ b/studio/src/reducers/index.js
@@ -33,6 +33,7 @@ import webhooks from './webhooksReducer';
 import profile from './profileReducer';
 import search from './searchReducer';
 import sachFactChecks from './sachFactChecksReducer';
+import roles from './rolesReducer';
 
 const appReducer = combineReducers({
   admin,
@@ -68,6 +69,7 @@ const appReducer = combineReducers({
   profile,
   search,
   sachFactChecks,
+  roles,
 });
 
 const rootReducer = (state, action) => {
diff --git a/studio/src/reducers/rolesReducer.js b/studio/src/reducers/rolesReducer.js
new file mode 100644
index 000000000..239306ce2
--- /dev/null
+++ b/studio/src/reducers/rolesReducer.js
@@ -0,0 +1,61 @@
+import {
+  ADD_ROLES,
+  ADD_ROLES_REQUEST,
+  SET_ROLES_LOADING,
+  RESET_ROLES,
+  GET_ROLE,
+  UPDATE_ROLE,
+} from '../constants/roles';
+import deepEqual from 'deep-equal';
+
+const initialState = {
+  req: [],
+  details: {},
+  loading: true,
+};
+
+export default function rolesReducer(state = initialState, action = {}) {
+  switch (action.type) {
+    case RESET_ROLES:
+      return {
+        ...state,
+        req: [],
+        details: {},
+        loading: true,
+      };
+    case SET_ROLES_LOADING:
+      return {
+        ...state,
+        loading: action.payload,
+      };
+    case ADD_ROLES_REQUEST:
+      return {
+        ...state,
+        req: state.req
+          .filter((value) => !deepEqual(value.query, action.payload.query))
+          .concat(action.payload),
+      };
+    case ADD_ROLES:
+      if (action.payload.length === 0) {
+        return state;
+      }
+      return {
+        ...state,
+        details: {
+          ...state.details,
+          ...action.payload.reduce((obj, item) => Object.assign(obj, { [item.id]: item }), {}),
+        },
+      };
+    case GET_ROLE:
+    case UPDATE_ROLE:
+      return {
+        ...state,
+        details: {
+          ...state.details,
+          [action.payload.id]: action.payload,
+        },
+      };
+    default:
+      return state;
+  }
+}
diff --git a/studio/src/utils/date.js b/studio/src/utils/date.js
index 21721cdba..71ea06c52 100644
--- a/studio/src/utils/date.js
+++ b/studio/src/utils/date.js
@@ -1,14 +1,11 @@
-import { listOfMonths } from "../constants/date";
-
+import { listOfMonths } from '../constants/date';
 
 export const getDatefromString = (dateString) => {
   const dateObj = new Date(Date.parse(dateString));
   return dateObj.toDateString();
 };
 
-
 export const getDatefromStringWithoutDay = (dateString) => {
   const dateObj = new Date(Date.parse(dateString));
-  return `${listOfMonths[dateObj.getMonth()]} ${dateObj.getDate()} ${dateObj.getFullYear()}`
+  return `${listOfMonths[dateObj.getMonth()]} ${dateObj.getDate()} ${dateObj.getFullYear()}`;
 };
-

From 37c462d02fe8ad17edd97fc7d1c7912a0daffb2b Mon Sep 17 00:00:00 2001
From: vsumit89 <sumit.vishwakarma@factly.in>
Date: Wed, 17 Aug 2022 13:14:09 +0530
Subject: [PATCH 03/38] initial commit

---
 docker-compose.yml                            |  14 +-
 keto/keto.yml                                 |   2 +
 studio/src/pages/roles/components/RoleList.js |  34 +--
 templates/go.sum                              | 221 ++++++++++++++++++
 4 files changed, 248 insertions(+), 23 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 7ea41b79e..0f372c957 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,9 +18,11 @@ services:
     networks:
       - dega
 
-  ###########################################################################
-  #######                        MINIO                                #######
-  ###########################################################################
+# networks:
+#   dega:
+  ##########################################################################
+  ######                        MINIO                                #######
+  ##########################################################################
   minio:
     image: minio/minio
     ports:
@@ -243,7 +245,7 @@ services:
       - kavach-migrate
     ports:
       - 5001:8000
-    image: factly/kavach-server-v0.1
+    image: factly/kavach-server
     volumes:
       - type: bind
         source: ./volumes/kavach-server/data
@@ -276,7 +278,7 @@ services:
       - postgres
       - keto
       - kratos
-    image: factly/kavach-migrate-latest
+    image: factly/kavach-migrate
     environment:
       - WAIT_HOSTS=postgres:5432, kratos:4434 , keto:4466
       - KAVACH_DATABASE_HOST=postgres
@@ -300,7 +302,7 @@ services:
       - dega
 
   kavach-web:
-    image: factly/kavach-web-latest 
+    image: factly/kavach-web 
     volumes:
       - type: bind
         source: ./volumes/kavach-web/config.js
diff --git a/keto/keto.yml b/keto/keto.yml
index c5d657bad..1fc672fa5 100644
--- a/keto/keto.yml
+++ b/keto/keto.yml
@@ -8,3 +8,5 @@ namespaces:
     name: applications
   - id: 2
     name: spaces
+  - id: 3
+    name: superorganisation
diff --git a/studio/src/pages/roles/components/RoleList.js b/studio/src/pages/roles/components/RoleList.js
index ac1d808c5..2896b0155 100644
--- a/studio/src/pages/roles/components/RoleList.js
+++ b/studio/src/pages/roles/components/RoleList.js
@@ -93,23 +93,23 @@ function RoleList({ roles, total, loading }) {
         return (
           <span>
             {/* {role === 'owner' ? ( */}
-              <Space>
-                <Link
-                  to={{
-                    pathname: ``,
-                  }}
-                >
-                  <Button icon={<UserAddOutlined />} primary="true">
-                    Add users
-                  </Button>
-                </Link>
-                <Popconfirm title="Sure to Revoke?" onConfirm={() => onDelete(record.id)}>
-                  <Button type="danger" icon={<DeleteOutlined />}>
-                    {' '}
-                    Delete{' '}
-                  </Button>
-                </Popconfirm>
-              </Space>
+            <Space>
+              <Link
+                to={{
+                  pathname: ``,
+                }}
+              >
+                <Button icon={<UserAddOutlined />} primary="true">
+                  Add users
+                </Button>
+              </Link>
+              <Popconfirm title="Sure to Revoke?">
+                <Button type="danger" icon={<DeleteOutlined />}>
+                  {' '}
+                  Delete{' '}
+                </Button>
+              </Popconfirm>
+            </Space>
             {/* ) */}
             {/* // : null} */}
           </span>
diff --git a/templates/go.sum b/templates/go.sum
index ac9b39529..dbb79fec3 100644
--- a/templates/go.sum
+++ b/templates/go.sum
@@ -39,19 +39,28 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
 github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
+github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
 github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc=
 github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
+github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
+github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
+github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
+github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
 github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
 github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
 github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=
+github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
+github.com/andybalholm/brotli v1.0.0/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
+github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
 github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
@@ -68,10 +77,13 @@ github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+Ce
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
+github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84=
 github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM=
 github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
 github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
+github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
@@ -86,6 +98,8 @@ github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
 github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
 github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
+github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
+github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
@@ -93,13 +107,17 @@ github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7
 github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
+github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
+github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
 github.com/dlmiddlecote/sqlstats v1.0.2 h1:gSU11YN23D/iY50A2zVYwgXgy072khatTsIW6UPjUtI=
 github.com/dlmiddlecote/sqlstats v1.0.2/go.mod h1:0CWaIh/Th+z2aI6Q9Jpfg/o21zmGxWhbByHgQSCUQvY=
 github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
@@ -107,6 +125,7 @@ github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5m
 github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
 github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
 github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
+github.com/eduncan911/podcast v1.4.2/go.mod h1:mSxiK1z5KeNO0YFaQ3ElJlUZbbDV9dA7R9c1coeeXkc=
 github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -116,15 +135,32 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m
 github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0=
+github.com/factly/dega-server v0.0.0-20210629085956-9acf3184fde4/go.mod h1:gDnZ9IwWKI5Zfo2hi6debHZ7QDuZH7ghqucfF+gdze8=
+github.com/factly/hukz v0.0.0-20210513184540-cb49caf5c3d1/go.mod h1:JnwNJ/nQ4Y+qpW44k2Ap/vL0mZHQFstZlrIGPbd77nQ=
+github.com/factly/x v0.0.23/go.mod h1:hYG+r3T4aSb4LTFnMGgf5dlLuN9cpHRaG90psbsTFrY=
+github.com/factly/x v0.0.46/go.mod h1:hYG+r3T4aSb4LTFnMGgf5dlLuN9cpHRaG90psbsTFrY=
 github.com/factly/x v0.0.77 h1:HQXTOLTpPWZhNhCC3TwLQk9nfKlJqzSYjjrCQ20p57o=
 github.com/factly/x v0.0.77/go.mod h1:ZB3evopCd4ev4uZNCxldkh0AgYsxvEabiefrM8RJHBc=
+github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8=
+github.com/fasthttp/websocket v1.4.2/go.mod h1:smsv/h4PBEBaU0XDTY5UwJTpZv69fQ0FfcLJr21mA6Y=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
+github.com/fatih/structs v1.0.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
+github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
 github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4=
 github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
+github.com/gavv/httpexpect v2.0.0+incompatible/go.mod h1:x+9tiU1YnrOvnB725RkpoLv1M62hOWzwo5OXotisrKc=
+github.com/gavv/httpexpect/v2 v2.1.0/go.mod h1:lnd0TqJLrP+wkJk3SFwtrpSlOAZQ7HaaIFuOYbgqgUM=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/gin-contrib/gzip v0.0.1/go.mod h1:fGBJBCdt6qCZuCAOwWuFhBB4OOq9EFqlo5dEaFhhu5w=
+github.com/gin-contrib/sse v0.0.0-20170109093832-22d885f9ecc7/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s=
+github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s=
+github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
+github.com/gin-gonic/gin v1.3.0/go.mod h1:7cKuhb5qV2ggCFctp2fJQ+ErvciLZrIeoOSOm6mUr7Y=
+github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/3rZdM=
+github.com/go-chi/chi v4.0.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ=
 github.com/go-chi/chi v4.1.2+incompatible h1:fGFk2Gmi/YKXk0OmGfBh0WgmN3XB8lVnEyNz34tQRec=
 github.com/go-chi/chi v4.1.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
@@ -137,10 +173,36 @@ github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vb
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
+github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
+github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
+github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
+github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
+github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
+github.com/go-openapi/jsonreference v0.19.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
+github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc=
+github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8=
+github.com/go-openapi/jsonreference v0.19.4/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg=
+github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg=
+github.com/go-openapi/spec v0.19.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
+github.com/go-openapi/spec v0.19.4/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo=
+github.com/go-openapi/spec v0.19.9/go.mod h1:vqK/dIdLGCosfvYsQV3WfC7N3TiZSnGY2RZKoFK7X28=
+github.com/go-openapi/spec v0.19.14/go.mod h1:gwrgJS15eCUgjLpMjBJmbZezCsw88LmgeEip0M63doA=
+github.com/go-openapi/spec v0.20.0/go.mod h1:+81FIL1JwC5P3/Iuuozq3pPE9dXdIEGxFutcFKaVbmU=
+github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
+github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
+github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
+github.com/go-openapi/swag v0.19.11/go.mod h1:Uc0gKkdR+ojzsEpjh39QChyu92vPgIr72POcgHMAgSY=
+github.com/go-openapi/swag v0.19.12/go.mod h1:eFdyEBkTdoAf/9RXBvj4cr1nH7GD8Kzo5HTt47gr72M=
+github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
+github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
+github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
+github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
+github.com/go-playground/validator/v10 v10.6.1/go.mod h1:xm76BBt941f7yWdGnI2DVPFFg1UK3YY04qifoXU3lOk=
 github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
 github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s=
@@ -148,9 +210,11 @@ github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7a
 github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
+github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -195,6 +259,7 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
@@ -218,13 +283,19 @@ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5m
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
+github.com/gorilla/feeds v1.1.1/go.mod h1:Nk0jZrvPFZX1OBe5NPiddPw7CfwF6Q9eqzaBbaightA=
 github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
+github.com/gorilla/websocket v1.0.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
+github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
+github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
+github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplbc8s8sSb3V2oUCygFHVp8gC3Dn6U4MNI=
 github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=
 github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE=
 github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
@@ -253,8 +324,11 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO
 github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/imkira/go-interpol v1.0.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA=
+github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
+github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0=
 github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
 github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
 github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8=
@@ -262,6 +336,10 @@ github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgO
 github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA=
 github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE=
 github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s=
+github.com/jackc/pgconn v1.4.0/go.mod h1:Y2O3ZDF0q4mMacyWV3AstPJpeHXWGEetiFttmq5lahk=
+github.com/jackc/pgconn v1.5.0/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI=
+github.com/jackc/pgconn v1.5.1-0.20200601181101-fa742c524853/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI=
+github.com/jackc/pgconn v1.7.0/go.mod h1:sF/lPpNEMEOp+IYhyQGdAvrG20gWf6A1tKlr0v7JMeA=
 github.com/jackc/pgconn v1.8.0/go.mod h1:1C2Pb36bGIP9QHGBYCjnyhqu7Rv3sGshaQUvmfGIB/o=
 github.com/jackc/pgconn v1.9.0/go.mod h1:YctiPyvzfU11JFxoXokUOOKQXQmDMoJL9vJzHH8/2JY=
 github.com/jackc/pgconn v1.9.1-0.20210724152538-d89c8390a530/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI=
@@ -275,31 +353,48 @@ github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65 h1:DadwsjnMwFjfWc9y5W
 github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65/go.mod h1:5R2h2EEX+qri8jOWMbJCtaPWkrrNc7OHwsp2TCqp7ak=
 github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
 github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
+github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A=
 github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78=
 github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA=
 github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg=
 github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=
 github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=
+github.com/jackc/pgproto3/v2 v2.0.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
+github.com/jackc/pgproto3/v2 v2.0.5/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
 github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
 github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
 github.com/jackc/pgproto3/v2 v2.3.0 h1:brH0pCGBDkBW07HWlN/oSBXrmo3WB0UvZd1pIuDcL8Y=
 github.com/jackc/pgproto3/v2 v2.3.0/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
+github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E=
 github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg=
 github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E=
 github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg=
 github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc=
 github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw=
+github.com/jackc/pgtype v1.2.0/go.mod h1:5m2OfMh1wTK7x+Fk952IDmI4nw3nPrvtQdM0ZT4WpC0=
+github.com/jackc/pgtype v1.3.1-0.20200510190516-8cd94a14c75a/go.mod h1:vaogEUkALtxZMCH411K+tKzNpwzCKU+AnPzBKZ+I+Po=
+github.com/jackc/pgtype v1.3.1-0.20200606141011-f6355165a91c/go.mod h1:cvk9Bgu/VzJ9/lxTO5R5sf80p0DiucVtN7ZxvaC4GmQ=
+github.com/jackc/pgtype v1.5.0/go.mod h1:JCULISAZBFGrHaOXIIFiyfzW5VY0GRitRr8NeJsrdig=
+github.com/jackc/pgtype v1.6.2/go.mod h1:JCULISAZBFGrHaOXIIFiyfzW5VY0GRitRr8NeJsrdig=
 github.com/jackc/pgtype v1.8.1-0.20210724151600-32e20a603178/go.mod h1:C516IlIV9NKqfsMCXTdChteoXmwgUceqaLfjg2e3NlM=
 github.com/jackc/pgtype v1.11.0 h1:u4uiGPz/1hryuXzyaBhSk6dnIyyG2683olG2OV+UUgs=
 github.com/jackc/pgtype v1.11.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4=
 github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y=
 github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM=
 github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc=
+github.com/jackc/pgx/v4 v4.5.0/go.mod h1:EpAKPLdnTorwmPUUsqrPxy5fphV18j9q3wrfRXgo+kA=
+github.com/jackc/pgx/v4 v4.6.1-0.20200510190926-94ba730bb1e9/go.mod h1:t3/cdRQl6fOLDxqtlyhe9UWgfIi9R8+8v8GKV5TRA/o=
+github.com/jackc/pgx/v4 v4.6.1-0.20200606145419-4e5062306904/go.mod h1:ZDaNWkt9sW1JMiNn0kdYBaLelIhw7Pg4qd+Vk6tw7Hg=
+github.com/jackc/pgx/v4 v4.9.0/go.mod h1:MNGWmViCgqbZck9ujOOBN63gK9XVGILXWCvKLGKmnms=
+github.com/jackc/pgx/v4 v4.10.1/go.mod h1:QlrWebbs3kqEZPHCTGyxecvzG6tvIsYu+A5b1raylkA=
 github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs=
 github.com/jackc/pgx/v4 v4.16.1 h1:JzTglcal01DrghUqt+PmzWsZx/Yh7SC/CTQmSBMTd0Y=
 github.com/jackc/pgx/v4 v4.16.1/go.mod h1:SIhx0D5hoADaiXZVyv+3gSm3LCIIINTVO0PficsvWGQ=
 github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
+github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
+github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
+github.com/jackc/puddle v1.1.2/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.2.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jinzhu/gorm v1.9.16 h1:+IyIjPEABKRpsu/F8OvDPy9fyQlgsg2luMV2ZIH5i5o=
@@ -308,11 +403,14 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
+github.com/jinzhu/now v1.1.2/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/jinzhu/now v1.1.4 h1:tHnRBy1i5F2Dh8BAFxqFzxKqqvezXrL2OW1TnX+Mlas=
 github.com/jinzhu/now v1.1.4/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
+github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
+github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
@@ -324,9 +422,16 @@ github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
+github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=
+github.com/k3a/html2text v1.0.8/go.mod h1:ieEXykM67iT8lTvEWBh6fhpH4B23kB9OMKPdIBmgUqA=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
+github.com/klauspost/compress v1.10.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
+github.com/klauspost/compress v1.15.0/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
+github.com/klauspost/compress v1.15.6/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU=
+github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -335,27 +440,40 @@ github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFB
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
 github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.10.2 h1:AqzbZs4ZoCBp+GtejcpCpcxM3zlSMx29dXbUSeVtJb8=
 github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM=
 github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4=
 github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ=
+github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls=
 github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
+github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
+github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
+github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus=
@@ -364,9 +482,12 @@ github.com/mattn/go-sqlite3 v1.14.6 h1:dNPt6NO46WmLVt2DLNpwczCmdV5boIZ6g/tlDrlRU
 github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/meilisearch/meilisearch-go v0.12.0/go.mod h1:aqiJBd7zGUPzN2mnd0ZjVm//CfzeHCKSaYpqVNgujlE=
+github.com/meilisearch/meilisearch-go v0.20.0/go.mod h1:jUGQlQNFYcni/mSG/d71utwqPuKG0bRT+63Xenw2B+0=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
 github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg=
 github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
@@ -378,21 +499,33 @@ github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJ
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/nats-io/gnatsd v1.4.1/go.mod h1:nqco77VO78hLCJpIcVfygDP2rPGfsEHkGTUk94uh5DQ=
+github.com/nats-io/go-nats v1.7.2/go.mod h1:+t7RHT5ApZebkrQdnn6AhQJmhJJiKAvJUio1PiiCtj0=
 github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg=
 github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU=
+github.com/nats-io/jwt v1.1.0/go.mod h1:n3cvmLfBfnpV4JJRN7lRYCyZnw48ksGsbThGXEk4w9M=
 github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k=
+github.com/nats-io/nats-server/v2 v2.1.9/go.mod h1:9qVyoewoYXzG1ME9ox0HwkkzyYvnlBDugfR4Gg/8uHU=
 github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w=
+github.com/nats-io/nats.go v1.10.0/go.mod h1:AjGArbfyR50+afOUotNX2Xs5SYHf+CoOa5HH1eEl2HE=
 github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
 github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
+github.com/nats-io/nkeys v0.1.4/go.mod h1:XdZpAbhgyyODYqjTawOnIOI7VlbKSarI9Gfy1tqEu/s=
 github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
+github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs=
 github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
+github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
 github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
 github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis=
 github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74=
@@ -407,6 +540,7 @@ github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnh
 github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
+github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pelletier/go-toml v1.9.3 h1:zeC5b1GviRUyKYd6OJPvBU/mcVDVoL1OhT17FCt5dSQ=
 github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac=
@@ -423,6 +557,7 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
+github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og=
 github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
@@ -435,7 +570,9 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:
 github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M=
 github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
 github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
@@ -443,11 +580,13 @@ github.com/prometheus/common v0.15.0 h1:4fgOnadei3EZvgRwxJ7RMpG1k1pOZth5Pc13tysp
 github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
 github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/prometheus/procfs v0.2.0 h1:wH4vA7pcjKuZzjF7lM8awk4fnuJO6idemZXoKnULUx4=
 github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
+github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
@@ -459,8 +598,12 @@ github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
+github.com/savsgio/gotils v0.0.0-20200117113501-90175b0fbe3f/go.mod h1:lHhJedqxCoHN+zMtwGNTXWmF0u9Jt363FYRhV6g0CdY=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
+github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
+github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
+github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
 github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=
 github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
@@ -476,16 +619,24 @@ github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIK
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
 github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY=
+github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
+github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
 github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY=
 github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
+github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng=
 github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
+github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo=
+github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
 github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
 github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
 github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
+github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
 github.com/spf13/viper v1.8.1 h1:Kq1fyeebqsBfbjZj4EL7gj2IO0mMaiyjYUWcUsl2O44=
 github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns=
 github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
@@ -494,6 +645,7 @@ github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5J
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
@@ -501,18 +653,50 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
+github.com/swaggo/files v0.0.0-20190704085106-630677cd5c14/go.mod h1:gxQT6pBGRuIGunNf/+tSOB5OHvguWi8Tbt82WOkf35E=
+github.com/swaggo/gin-swagger v1.2.0/go.mod h1:qlH2+W7zXGZkczuL+r2nEBR2JTT+/lX05Nn6vPhc7OI=
+github.com/swaggo/http-swagger v0.0.0-20200308142732-58ac5e232fba/go.mod h1:O1lAbCgAAX/KZ80LM/OXwtWFI/5TvZlwxSg8Cq08PV0=
+github.com/swaggo/http-swagger v1.0.0/go.mod h1:cKIcshBU9yEAnfWv6ZzVKSsEf8h5ozxB8/zHQWyOQ/8=
+github.com/swaggo/swag v1.5.1/go.mod h1:1Bl9F/ZBpVWh22nY0zmYyASPO1lI/zIwRDrpZU+tv8Y=
+github.com/swaggo/swag v1.6.3/go.mod h1:wcc83tB4Mb2aNiL/HP4MFeQdpHUrca+Rp/DRNgWAUio=
+github.com/swaggo/swag v1.6.7/go.mod h1:xDhTyuFIujYiN3DKWC/H/83xcfHp+UE/IzWWampG7Zc=
+github.com/swaggo/swag v1.7.0/go.mod h1:BdPIL73gvS9NBsdi7M1JOxLvlbfvNRaBP8m6WT6Aajo=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
+github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
+github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
+github.com/ugorji/go v1.1.5-pre/go.mod h1:FwP/aQVg39TXzItUBMwnWp9T9gPQnXw4Poh4/oBQZ/0=
+github.com/ugorji/go/codec v0.0.0-20181022190402-e5e69e061d4f/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
+github.com/ugorji/go/codec v1.1.5-pre/go.mod h1:tULtS6Gy1AE1yCENaw4Vb//HLH5njI2tfCQDUqRd8fI=
 github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
 github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
+github.com/urfave/cli/v2 v2.1.1/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ=
+github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
+github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
+github.com/valyala/fasthttp v1.9.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBnvPM1Su9w=
+github.com/valyala/fasthttp v1.21.0/go.mod h1:jjraHZVbKOXftJfsOYoAjaeygpj5hr8ermTRJNroD7A=
+github.com/valyala/fasthttp v1.37.1-0.20220607072126-8a320890c08d/go.mod h1:t/G+3rLek+CyY9bnIE+YlMRddxVAAGjhxndDB4i4C0I=
+github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio=
+github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc=
+github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
+github.com/xeipuuv/gojsonschema v1.1.0/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs=
+github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
+github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod h1:/LWChgwKmvncFJFHJ7Gvn9wZArjbV5/FppcK2fKk/tI=
+github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg=
+github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM=
+github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
+go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg=
 go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
@@ -548,10 +732,13 @@ golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
@@ -598,6 +785,7 @@ golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -610,11 +798,13 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/net v0.0.0-20190611141213-3f473d35a33a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -629,15 +819,19 @@ golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/
 golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20201016165138-7b1cca2348c0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201207224615-747e23833adb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 h1:CIJ76btIcR3eFI5EgSo6k1qKw9KJexJuRLI9G7Hp5wE=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -669,6 +863,7 @@ golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -678,6 +873,8 @@ golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190610200419-93c9922d18ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -718,12 +915,15 @@ golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9 h1:nhht2DYV/Sn3qOayu8lM+cU1ii9sTLUeBQwQQfUHtrs=
 golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -751,7 +951,10 @@ golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBn
 golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190606050223-4d9ae51c2468/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190611222205-d73e1c7e250b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@@ -779,6 +982,7 @@ golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapK
 golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
 golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
+golang.org/x/tools v0.0.0-20200318054722-11a475a590ac/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
 golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
 golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@@ -788,9 +992,12 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY
 golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200903005429-2364a5e8fdcf/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
 golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
 golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20201120155355-20be4ac4bd6e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20201208062317-e652b2f42cc7/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
@@ -919,11 +1126,16 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o=
+gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
+gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y=
+gopkg.in/h2non/gock.v1 v1.0.15/go.mod h1:sX4zAkdYX1TRGJ2JY156cFspQn4yRWn6p9EMdODlynE=
 gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s=
+gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ini.v1 v1.62.0 h1:duBzk771uxoUuOlyRLkHsygud9+5lrlGjdFBb4mSKDU=
 gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
@@ -940,13 +1152,21 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gorm.io/driver/postgres v1.0.5/go.mod h1:qrD92UurYzNctBMVCJ8C3VQEjffEuphycXtxOudXNCA=
+gorm.io/driver/postgres v1.0.8/go.mod h1:4eOzrI1MUfm6ObJU/UcmbXyiHSs8jSwH95G5P5dxcAg=
 gorm.io/driver/postgres v1.3.8 h1:8bEphSAB69t3odsCR4NDzt581iZEWQuRM27Cg6KgfPY=
 gorm.io/driver/postgres v1.3.8/go.mod h1:qB98Aj6AhRO/oyu/jmZsi/YM9g6UzVCjMxO/6frFvcA=
 gorm.io/driver/sqlite v1.1.4 h1:PDzwYE+sI6De2+mxAneV9Xs11+ZyKV6oxD3wDGkaNvM=
 gorm.io/driver/sqlite v1.1.4/go.mod h1:mJCeTFr7+crvS+TRnWc5Z3UvwxUN1BGBLMrf5LA9DYw=
+gorm.io/gorm v1.20.4/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
+gorm.io/gorm v1.20.5/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
 gorm.io/gorm v1.20.7/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
+gorm.io/gorm v1.20.12/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
+gorm.io/gorm v1.21.11/go.mod h1:F+OptMscr0P2F2qU97WT1WimdH9GaQPoDW7AYd5i2Y0=
 gorm.io/gorm v1.23.6/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=
 gorm.io/gorm v1.23.8 h1:h8sGJ+biDgBA1AD1Ha9gFCx7h8npU7AsLdlkX0n2TpE=
 gorm.io/gorm v1.23.8/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=
@@ -958,6 +1178,7 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+moul.io/http2curl v1.0.1-0.20190925090545-5cd742060b0e/go.mod h1:nejbQVfXh96n9dSF6cH3Jsk/QI1Z2oEL7sSI2ifXFNA=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=

From 253f3878bdb5f038454e736b31f9e0fe4363f69b Mon Sep 17 00:00:00 2001
From: Mourya Prasanth <mouryaprasanthp@gmail.com>
Date: Wed, 17 Aug 2022 14:56:44 +0530
Subject: [PATCH 04/38] feat: add scooter to descriptionInput

---
 studio/package-lock.json                      | 115 ++++++++++++------
 studio/package.json                           |   1 +
 studio/src/App.js                             |   2 +-
 .../components/FormItems/DescriptionInput.js  |  18 ++-
 .../categories/components/CategoryForm.js     |   1 +
 5 files changed, 92 insertions(+), 45 deletions(-)

diff --git a/studio/package-lock.json b/studio/package-lock.json
index 7ccd30bb4..c9674e44e 100644
--- a/studio/package-lock.json
+++ b/studio/package-lock.json
@@ -17,6 +17,7 @@
         "@editorjs/quote": "^2.3.0",
         "@editorjs/raw": "^2.1.2",
         "@editorjs/table": "^1.2.2",
+        "@factly/scooter": "^0.0.2",
         "@testing-library/jest-dom": "^4.2.4",
         "@testing-library/react": "^9.5.0",
         "@testing-library/user-event": "^7.2.1",
@@ -2372,6 +2373,15 @@
       "resolved": "https://registry.npmjs.org/@editorjs/table/-/table-1.3.0.tgz",
       "integrity": "sha512-3/gr7IkjsYuECndCpcBSKzZQHos7C9QU1ach8avyVbXB3VLAa1RyGjgocu0Ct4d02HdxirrYZ7+vP1Na+s04GQ=="
     },
+    "node_modules/@factly/scooter": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/@factly/scooter/-/scooter-0.0.2.tgz",
+      "integrity": "sha512-hXMndNTZEnhAnx73OyTjrXLak+b6D7tj3fzej2qLPExRvAyMKp9OQ38BDpmIVfBKE4muKjHVU9lKjT8X0zgtKg==",
+      "peerDependencies": {
+        "react": "^18.2.0",
+        "react-dom": "^18.2.0"
+      }
+    },
     "node_modules/@hapi/address": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz",
@@ -11423,11 +11433,22 @@
       }
     },
     "node_modules/follow-redirects": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz",
-      "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==",
+      "version": "1.15.1",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz",
+      "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/RubenVerborgh"
+        }
+      ],
       "engines": {
         "node": ">=4.0"
+      },
+      "peerDependenciesMeta": {
+        "debug": {
+          "optional": true
+        }
       }
     },
     "node_modules/for-in": {
@@ -16015,6 +16036,10 @@
       "dependencies": {
         "@babel/runtime": "^7.12.1",
         "tiny-warning": "^1.0.3"
+      },
+      "peerDependencies": {
+        "prop-types": "^15.0.0",
+        "react": "^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
       }
     },
     "node_modules/mini-css-extract-plugin": {
@@ -16314,9 +16339,9 @@
       "optional": true
     },
     "node_modules/nanoid": {
-      "version": "3.1.23",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.23.tgz",
-      "integrity": "sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
+      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
       "bin": {
         "nanoid": "bin/nanoid.cjs"
       },
@@ -20093,7 +20118,7 @@
     "node_modules/path-to-regexp/node_modules/isarray": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="
     },
     "node_modules/path-type": {
       "version": "3.0.0",
@@ -22599,11 +22624,11 @@
       }
     },
     "node_modules/react-router": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.2.0.tgz",
-      "integrity": "sha512-smz1DUuFHRKdcJC0jobGo8cVbhO3x50tCL4icacOlcwDOEQPq4TMqwx3sY1TP+DvtTgz4nm3thuo7A+BK2U0Dw==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.3.1.tgz",
+      "integrity": "sha512-v+zwjqb7bakqgF+wMVKlAPTca/cEmPOvQ9zt7gpSNyPXau1+0qvuYZ5BWzzNDP1y6s15zDwgb9rPN63+SIniRQ==",
       "dependencies": {
-        "@babel/runtime": "^7.1.2",
+        "@babel/runtime": "^7.12.13",
         "history": "^4.9.0",
         "hoist-non-react-statics": "^3.1.0",
         "loose-envify": "^1.3.1",
@@ -22613,20 +22638,26 @@
         "react-is": "^16.6.0",
         "tiny-invariant": "^1.0.2",
         "tiny-warning": "^1.0.0"
+      },
+      "peerDependencies": {
+        "react": ">=15"
       }
     },
     "node_modules/react-router-dom": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.2.0.tgz",
-      "integrity": "sha512-gxAmfylo2QUjcwxI63RhQ5G85Qqt4voZpUXSEqCwykV0baaOTQDR1f0PmY8AELqIyVc0NEZUj0Gov5lNGcXgsA==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.3.1.tgz",
+      "integrity": "sha512-f0pj/gMAbv9e8gahTmCEY20oFhxhrmHwYeIwH5EO5xu0qme+wXtsdB8YfUOAZzUz4VaXmb58m3ceiLtjMhqYmQ==",
       "dependencies": {
-        "@babel/runtime": "^7.1.2",
+        "@babel/runtime": "^7.12.13",
         "history": "^4.9.0",
         "loose-envify": "^1.3.1",
         "prop-types": "^15.6.2",
-        "react-router": "5.2.0",
+        "react-router": "5.3.1",
         "tiny-invariant": "^1.0.2",
         "tiny-warning": "^1.0.0"
+      },
+      "peerDependencies": {
+        "react": ">=15"
       }
     },
     "node_modules/react-scripts": {
@@ -25918,9 +25949,9 @@
       "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q="
     },
     "node_modules/tiny-invariant": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.1.0.tgz",
-      "integrity": "sha512-ytxQvrb1cPc9WBEI/HSeYYoGD0kWnGEOR8RY6KomWLBVhqz0RgTwVO9dLrGz7dC+nN9llyI7OKAgRq8Vq4ZBSw=="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.2.0.tgz",
+      "integrity": "sha512-1Uhn/aqw5C6RI4KejVeTg6mIS7IqxnLJ8Mv2tV5rTc0qWobay7pDUz6Wi392Cnc8ak1H0F2cjoRzb2/AW4+Fvg=="
     },
     "node_modules/tiny-warning": {
       "version": "1.0.3",
@@ -29541,6 +29572,11 @@
       "resolved": "https://registry.npmjs.org/@editorjs/table/-/table-1.3.0.tgz",
       "integrity": "sha512-3/gr7IkjsYuECndCpcBSKzZQHos7C9QU1ach8avyVbXB3VLAa1RyGjgocu0Ct4d02HdxirrYZ7+vP1Na+s04GQ=="
     },
+    "@factly/scooter": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/@factly/scooter/-/scooter-0.0.2.tgz",
+      "integrity": "sha512-hXMndNTZEnhAnx73OyTjrXLak+b6D7tj3fzej2qLPExRvAyMKp9OQ38BDpmIVfBKE4muKjHVU9lKjT8X0zgtKg=="
+    },
     "@hapi/address": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz",
@@ -37114,9 +37150,9 @@
       }
     },
     "follow-redirects": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz",
-      "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg=="
+      "version": "1.15.1",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz",
+      "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA=="
     },
     "for-in": {
       "version": "1.0.2",
@@ -41051,9 +41087,9 @@
       "optional": true
     },
     "nanoid": {
-      "version": "3.1.23",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.23.tgz",
-      "integrity": "sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw=="
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
+      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="
     },
     "nanomatch": {
       "version": "1.2.13",
@@ -43867,7 +43903,7 @@
         "isarray": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
+          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="
         }
       }
     },
@@ -45979,11 +46015,11 @@
       }
     },
     "react-router": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.2.0.tgz",
-      "integrity": "sha512-smz1DUuFHRKdcJC0jobGo8cVbhO3x50tCL4icacOlcwDOEQPq4TMqwx3sY1TP+DvtTgz4nm3thuo7A+BK2U0Dw==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.3.1.tgz",
+      "integrity": "sha512-v+zwjqb7bakqgF+wMVKlAPTca/cEmPOvQ9zt7gpSNyPXau1+0qvuYZ5BWzzNDP1y6s15zDwgb9rPN63+SIniRQ==",
       "requires": {
-        "@babel/runtime": "^7.1.2",
+        "@babel/runtime": "^7.12.13",
         "history": "^4.9.0",
         "hoist-non-react-statics": "^3.1.0",
         "loose-envify": "^1.3.1",
@@ -45996,15 +46032,15 @@
       }
     },
     "react-router-dom": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.2.0.tgz",
-      "integrity": "sha512-gxAmfylo2QUjcwxI63RhQ5G85Qqt4voZpUXSEqCwykV0baaOTQDR1f0PmY8AELqIyVc0NEZUj0Gov5lNGcXgsA==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.3.1.tgz",
+      "integrity": "sha512-f0pj/gMAbv9e8gahTmCEY20oFhxhrmHwYeIwH5EO5xu0qme+wXtsdB8YfUOAZzUz4VaXmb58m3ceiLtjMhqYmQ==",
       "requires": {
-        "@babel/runtime": "^7.1.2",
+        "@babel/runtime": "^7.12.13",
         "history": "^4.9.0",
         "loose-envify": "^1.3.1",
         "prop-types": "^15.6.2",
-        "react-router": "5.2.0",
+        "react-router": "5.3.1",
         "tiny-invariant": "^1.0.2",
         "tiny-warning": "^1.0.0"
       }
@@ -46098,8 +46134,7 @@
     "react-side-effect": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-2.1.1.tgz",
-      "integrity": "sha512-2FoTQzRNTncBVtnzxFOk2mCpcfxQpenBMbk5kSVBg5UcPqV9fRbgY2zhb7GTWWOlpFmAxhClBDlIq8Rsubz1yQ==",
-      "requires": {}
+      "integrity": "sha512-2FoTQzRNTncBVtnzxFOk2mCpcfxQpenBMbk5kSVBg5UcPqV9fRbgY2zhb7GTWWOlpFmAxhClBDlIq8Rsubz1yQ=="
     },
     "react-test-renderer": {
       "version": "16.14.0",
@@ -48709,9 +48744,9 @@
       "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q="
     },
     "tiny-invariant": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.1.0.tgz",
-      "integrity": "sha512-ytxQvrb1cPc9WBEI/HSeYYoGD0kWnGEOR8RY6KomWLBVhqz0RgTwVO9dLrGz7dC+nN9llyI7OKAgRq8Vq4ZBSw=="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.2.0.tgz",
+      "integrity": "sha512-1Uhn/aqw5C6RI4KejVeTg6mIS7IqxnLJ8Mv2tV5rTc0qWobay7pDUz6Wi392Cnc8ak1H0F2cjoRzb2/AW4+Fvg=="
     },
     "tiny-warning": {
       "version": "1.0.3",
diff --git a/studio/package.json b/studio/package.json
index ab6022149..01b256dca 100644
--- a/studio/package.json
+++ b/studio/package.json
@@ -16,6 +16,7 @@
     "@editorjs/quote": "^2.3.0",
     "@editorjs/raw": "^2.1.2",
     "@editorjs/table": "^1.2.2",
+    "@factly/scooter": "^0.0.2",
     "@testing-library/jest-dom": "^4.2.4",
     "@testing-library/react": "^9.5.0",
     "@testing-library/user-event": "^7.2.1",
diff --git a/studio/src/App.js b/studio/src/App.js
index dd3b49973..9d8fddfc5 100644
--- a/studio/src/App.js
+++ b/studio/src/App.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { BrowserRouter as Router, Route, Switch, Link } from 'react-router-dom';
-import 'antd/dist/antd.less';
+import 'antd/dist/antd.css';
 import BasicLayout from './layouts/basic';
 //Routes
 import routes from './config/routesConfig';
diff --git a/studio/src/components/FormItems/DescriptionInput.js b/studio/src/components/FormItems/DescriptionInput.js
index db265cd9d..a49e6c101 100644
--- a/studio/src/components/FormItems/DescriptionInput.js
+++ b/studio/src/components/FormItems/DescriptionInput.js
@@ -1,21 +1,31 @@
 import React from 'react';
 import { Form } from 'antd';
-import Editor from '../Editor';
-
+// import Editor from '../Editor';
+import { Editor } from '@factly/scooter';
 const DescriptionInput = ({
   name = 'description',
   label = 'Description',
   noLabel = false,
-  onChange = () => {},
+  onChange = (data) => console.log(data),
   inputProps,
   formItemProps,
+  initialValue,
 }) => {
   inputProps = { ...inputProps, onChange };
   formItemProps = noLabel ? formItemProps : { ...formItemProps, label };
 
   return (
     <Form.Item name={name} {...formItemProps}>
-      <Editor {...inputProps} />
+      {console.log({ inputProps, formItemProps, initialValue })}
+      {/* <Editor {...inputProps} /> */}
+      <Editor
+        menuType="bubble"
+        heightStrategy="flexible"
+        rows={20}
+        onChange={({ json, html }) => console.log({ json, html })}
+        {...inputProps}
+        initialValue={initialValue}
+      />
     </Form.Item>
   );
 };
diff --git a/studio/src/pages/categories/components/CategoryForm.js b/studio/src/pages/categories/components/CategoryForm.js
index 34a41b196..9b4807453 100644
--- a/studio/src/pages/categories/components/CategoryForm.js
+++ b/studio/src/pages/categories/components/CategoryForm.js
@@ -194,6 +194,7 @@ const CategoryForm = ({ onCreate, data = {} }) => {
                   placeholder: 'Enter Description...',
                   basic: true,
                 }}
+                initialValue={formData.description}
               />
             </Col>
           </Row>

From e85497b66a155e46e3cb8cc91054768ea1f10891 Mon Sep 17 00:00:00 2001
From: vsumit89 <sumit.vishwakarma@factly.in>
Date: Wed, 17 Aug 2022 18:57:18 +0530
Subject: [PATCH 05/38] fixed the parsing error for description field

---
 server/service/core/action/category/create.go |  23 +-
 server/service/core/action/category/update.go |  23 +-
 server/service/core/action/page/create.go     |  23 +-
 server/service/core/action/page/update.go     |  23 +-
 server/service/core/action/post/create.go     |  23 +-
 server/service/core/action/post/update.go     |  23 +-
 server/service/core/action/tag/create.go      |  24 +-
 server/service/core/action/tag/update.go      |  23 +-
 .../service/fact-check/action/claim/create.go |  24 +-
 .../service/fact-check/action/claim/update.go |  24 +-
 .../fact-check/action/claimant/create.go      |  24 +-
 .../fact-check/action/claimant/update.go      |  24 +-
 .../fact-check/action/rating/create.go        |  24 +-
 .../fact-check/action/rating/default.go       |  10 +-
 .../fact-check/action/rating/update.go        |  24 +-
 server/service/podcast/action/create.go       |  23 +-
 .../service/podcast/action/episode/create.go  |  25 +-
 .../service/podcast/action/episode/update.go  |  24 +-
 server/service/podcast/action/update.go       |  24 +-
 server/util/description.go                    |  21 --
 server/util/scooter.go                        |  30 +++
 .../src/__tests__/actions/sachFactChecks.js   |  50 ++--
 .../components/FormItems/DescriptionInput.js  |   3 +-
 studio/src/constants/date.js                  |  15 +-
 .../fact-checks/components/FactCheckForm.js   |   8 +-
 studio/src/pages/posts/components/PostForm.js |   8 +-
 studio/src/pages/website/Branding.js          |   1 -
 .../website/components/WebsiteEditForm.js     |   1 -
 studio/src/utils/date.js                      |   7 +-
 templates/go.sum                              | 221 ++++++++++++++++++
 30 files changed, 580 insertions(+), 220 deletions(-)
 delete mode 100644 server/util/description.go
 create mode 100644 server/util/scooter.go

diff --git a/server/service/core/action/category/create.go b/server/service/core/action/category/create.go
index ed70d36ff..db9250005 100644
--- a/server/service/core/action/category/create.go
+++ b/server/service/core/action/category/create.go
@@ -5,14 +5,13 @@ import (
 	"encoding/json"
 	"errors"
 	"net/http"
-	"reflect"
 
 	"github.com/factly/x/loggerx"
+	"github.com/jinzhu/gorm/dialects/postgres"
 	"gorm.io/gorm"
 
 	"github.com/factly/dega-server/config"
 	"github.com/factly/dega-server/service/core/model"
-	"github.com/factly/dega-server/test"
 	"github.com/factly/dega-server/util"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/meilisearchx"
@@ -112,21 +111,29 @@ func create(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// Store HTML description
-	var description string
-	if len(category.Description.RawMessage) > 0 && !reflect.DeepEqual(category.Description, test.NilJsonb()) {
-		description, err = util.HTMLDescription(category.Description)
+	var htmlDescription string
+	var jsonDescription postgres.Jsonb
+	if len(category.Description.RawMessage) > 0 {
+		htmlDescription, err = util.GetHTMLDescription(category.Description)
 		if err != nil {
 			loggerx.Error(err)
-			errorx.Render(w, errorx.Parser(errorx.GetMessage("cannot parse category description", http.StatusUnprocessableEntity)))
+			errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+			return
+		}
+
+		jsonDescription, err = util.GetJSONDescription(category.Description)
+		if err != nil {
+			loggerx.Error(err)
+			errorx.Render(w, errorx.Parser(errorx.DecodeError()))
 			return
 		}
 	}
 
 	result := &model.Category{
 		Name:             category.Name,
-		Description:      category.Description,
+		Description:      jsonDescription,
 		BackgroundColour: category.BackgroundColour,
-		HTMLDescription:  description,
+		HTMLDescription:  htmlDescription,
 		Slug:             slugx.Approve(&config.DB, categorySlug, sID, tableName),
 		ParentID:         parentID,
 		MediumID:         mediumID,
diff --git a/server/service/core/action/category/update.go b/server/service/core/action/category/update.go
index 1052cebf2..2b2ab3659 100644
--- a/server/service/core/action/category/update.go
+++ b/server/service/core/action/category/update.go
@@ -4,13 +4,11 @@ import (
 	"encoding/json"
 	"errors"
 	"net/http"
-	"reflect"
 	"strconv"
 	"time"
 
 	"github.com/factly/dega-server/config"
 	"github.com/factly/dega-server/service/core/model"
-	"github.com/factly/dega-server/test"
 	"github.com/factly/dega-server/util"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
@@ -20,6 +18,7 @@ import (
 	"github.com/factly/x/slugx"
 	"github.com/factly/x/validationx"
 	"github.com/go-chi/chi"
+	"github.com/jinzhu/gorm/dialects/postgres"
 	"gorm.io/gorm"
 )
 
@@ -135,12 +134,20 @@ func update(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// Store HTML description
-	var description string
-	if len(category.Description.RawMessage) > 0 && !reflect.DeepEqual(category.Description, test.NilJsonb()) {
-		description, err = util.HTMLDescription(category.Description)
+	var htmlDescription string
+	var jsonDescription postgres.Jsonb
+	if len(category.Description.RawMessage) > 0 {
+		htmlDescription, err = util.GetHTMLDescription(category.Description)
 		if err != nil {
 			loggerx.Error(err)
-			errorx.Render(w, errorx.Parser(errorx.GetMessage("cannot parse category description", http.StatusUnprocessableEntity)))
+			errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+			return
+		}
+
+		jsonDescription, err = util.GetJSONDescription(category.Description)
+		if err != nil {
+			loggerx.Error(err)
+			errorx.Render(w, errorx.Parser(errorx.DecodeError()))
 			return
 		}
 	}
@@ -151,8 +158,8 @@ func update(w http.ResponseWriter, r *http.Request) {
 		"updated_by_id":    uID,
 		"name":             category.Name,
 		"slug":             categorySlug,
-		"description":      category.Description,
-		"html_description": description,
+		"description":      jsonDescription,
+		"html_description": htmlDescription,
 		"medium_id":        category.MediumID,
 		"is_featured":      category.IsFeatured,
 		"meta_fields":      category.MetaFields,
diff --git a/server/service/core/action/page/create.go b/server/service/core/action/page/create.go
index 2e1675e32..369031f67 100644
--- a/server/service/core/action/page/create.go
+++ b/server/service/core/action/page/create.go
@@ -6,12 +6,10 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
-	"reflect"
 
 	"github.com/factly/dega-server/config"
 	"github.com/factly/dega-server/service/core/action/author"
 	"github.com/factly/dega-server/service/core/model"
-	"github.com/factly/dega-server/test"
 	"github.com/factly/dega-server/util"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
@@ -20,6 +18,7 @@ import (
 	"github.com/factly/x/renderx"
 	"github.com/factly/x/slugx"
 	"github.com/factly/x/validationx"
+	"github.com/jinzhu/gorm/dialects/postgres"
 	"gorm.io/gorm"
 )
 
@@ -86,12 +85,20 @@ func create(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// Store HTML description
-	var description string
-	if len(page.Description.RawMessage) > 0 && !reflect.DeepEqual(page.Description, test.NilJsonb()) {
-		description, err = util.HTMLDescription(page.Description)
+	var htmlDescription string
+	var jsonDescription postgres.Jsonb
+	if len(page.Description.RawMessage) > 0 {
+		htmlDescription, err = util.GetHTMLDescription(page.Description)
 		if err != nil {
 			loggerx.Error(err)
-			errorx.Render(w, errorx.Parser(errorx.GetMessage("cannot parse post description", http.StatusUnprocessableEntity)))
+			errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+			return
+		}
+
+		jsonDescription, err = util.GetJSONDescription(page.Description)
+		if err != nil {
+			loggerx.Error(err)
+			errorx.Render(w, errorx.Parser(errorx.DecodeError()))
 			return
 		}
 	}
@@ -103,8 +110,8 @@ func create(w http.ResponseWriter, r *http.Request) {
 		IsPage:           true,
 		Subtitle:         page.Subtitle,
 		Excerpt:          page.Excerpt,
-		Description:      page.Description,
-		HTMLDescription:  description,
+		Description:      jsonDescription,
+		HTMLDescription:  htmlDescription,
 		IsHighlighted:    page.IsHighlighted,
 		IsSticky:         page.IsSticky,
 		FeaturedMediumID: featuredMediumID,
diff --git a/server/service/core/action/page/update.go b/server/service/core/action/page/update.go
index d89c977bc..83654749b 100644
--- a/server/service/core/action/page/update.go
+++ b/server/service/core/action/page/update.go
@@ -6,13 +6,11 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
-	"reflect"
 	"strconv"
 
 	"github.com/factly/dega-server/config"
 	"github.com/factly/dega-server/service/core/action/author"
 	"github.com/factly/dega-server/service/core/model"
-	"github.com/factly/dega-server/test"
 	"github.com/factly/dega-server/util"
 	"github.com/factly/dega-server/util/arrays"
 	"github.com/factly/x/errorx"
@@ -23,6 +21,7 @@ import (
 	"github.com/factly/x/slugx"
 	"github.com/factly/x/validationx"
 	"github.com/go-chi/chi"
+	"github.com/jinzhu/gorm/dialects/postgres"
 	"gorm.io/gorm"
 )
 
@@ -121,12 +120,20 @@ func update(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// Store HTML description
-	var description string
-	if len(page.Description.RawMessage) > 0 && !reflect.DeepEqual(page.Description, test.NilJsonb()) {
-		description, err = util.HTMLDescription(page.Description)
+	var htmlDescription string
+	var jsonDescription postgres.Jsonb
+	if len(page.Description.RawMessage) > 0 {
+		htmlDescription, err = util.GetHTMLDescription(page.Description)
 		if err != nil {
 			loggerx.Error(err)
-			errorx.Render(w, errorx.Parser(errorx.GetMessage("cannot parse page description", http.StatusUnprocessableEntity)))
+			errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+			return
+		}
+
+		jsonDescription, err = util.GetJSONDescription(page.Description)
+		if err != nil {
+			loggerx.Error(err)
+			errorx.Render(w, errorx.Parser(errorx.DecodeError()))
 			return
 		}
 	}
@@ -167,8 +174,8 @@ func update(w http.ResponseWriter, r *http.Request) {
 		"status":             page.Status,
 		"published_date":     page.PublishedDate,
 		"excerpt":            page.Excerpt,
-		"description":        page.Description,
-		"html_description":   description,
+		"description":        jsonDescription,
+		"html_description":   htmlDescription,
 		"is_highlighted":     page.IsHighlighted,
 		"is_sticky":          page.IsSticky,
 		"format_id":          page.FormatID,
diff --git a/server/service/core/action/post/create.go b/server/service/core/action/post/create.go
index 596723e93..e0f07e31e 100644
--- a/server/service/core/action/post/create.go
+++ b/server/service/core/action/post/create.go
@@ -6,14 +6,12 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
-	"reflect"
 	"time"
 
 	"github.com/factly/dega-server/config"
 	"github.com/factly/dega-server/service/core/action/author"
 	"github.com/factly/dega-server/service/core/model"
 	factCheckModel "github.com/factly/dega-server/service/fact-check/model"
-	"github.com/factly/dega-server/test"
 	"github.com/factly/dega-server/util"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
@@ -174,12 +172,19 @@ func createPost(ctx context.Context, post post, status string) (*postData, error
 		featuredMediumID = nil
 	}
 
-	// Store HTML description
-	var description string
-	if len(post.Description.RawMessage) > 0 && !reflect.DeepEqual(post.Description, test.NilJsonb()) {
-		description, err = util.HTMLDescription(post.Description)
+	var htmlDescription string
+	var jsonDescription postgres.Jsonb
+	if len(post.Description.RawMessage) > 0 {
+		htmlDescription, err = util.GetHTMLDescription(post.Description)
 		if err != nil {
-			return nil, errorx.GetMessage("cannot parse post description", http.StatusUnprocessableEntity)
+			loggerx.Error(err)
+			return nil, errorx.GetMessage("could not get html description", 422)
+		}
+
+		jsonDescription, err = util.GetJSONDescription(post.Description)
+		if err != nil {
+			loggerx.Error(err)
+			return nil, errorx.GetMessage("could not get json description", 422)
 		}
 	}
 
@@ -190,8 +195,8 @@ func createPost(ctx context.Context, post post, status string) (*postData, error
 		IsPage:           post.IsPage,
 		Subtitle:         post.Subtitle,
 		Excerpt:          post.Excerpt,
-		Description:      post.Description,
-		HTMLDescription:  description,
+		Description:      jsonDescription,
+		HTMLDescription:  htmlDescription,
 		IsHighlighted:    post.IsHighlighted,
 		IsSticky:         post.IsSticky,
 		FeaturedMediumID: featuredMediumID,
diff --git a/server/service/core/action/post/update.go b/server/service/core/action/post/update.go
index f0e02f18d..7d780f3c6 100644
--- a/server/service/core/action/post/update.go
+++ b/server/service/core/action/post/update.go
@@ -6,7 +6,6 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
-	"reflect"
 	"strconv"
 	"time"
 
@@ -14,7 +13,6 @@ import (
 	"github.com/factly/dega-server/service/core/action/author"
 	"github.com/factly/dega-server/service/core/model"
 	factCheckModel "github.com/factly/dega-server/service/fact-check/model"
-	"github.com/factly/dega-server/test"
 	"github.com/factly/dega-server/util"
 	"github.com/factly/dega-server/util/arrays"
 	"github.com/factly/x/errorx"
@@ -135,13 +133,20 @@ func update(w http.ResponseWriter, r *http.Request) {
 		postSlug = slugx.Approve(&config.DB, slugx.Make(post.Title), sID, tableName)
 	}
 
-	// Store HTML description
-	var description string
-	if len(post.Description.RawMessage) > 0 && !reflect.DeepEqual(post.Description, test.NilJsonb()) {
-		description, err = util.HTMLDescription(post.Description)
+	var htmlDescription string
+	var jsonDescription postgres.Jsonb
+	if len(post.Description.RawMessage) > 0 {
+		htmlDescription, err = util.GetHTMLDescription(post.Description)
 		if err != nil {
 			loggerx.Error(err)
-			errorx.Render(w, errorx.Parser(errorx.GetMessage("cannot parse post description", http.StatusUnprocessableEntity)))
+			errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+			return
+		}
+
+		jsonDescription, err = util.GetJSONDescription(post.Description)
+		if err != nil {
+			loggerx.Error(err)
+			errorx.Render(w, errorx.Parser(errorx.DecodeError()))
 			return
 		}
 	}
@@ -181,8 +186,8 @@ func update(w http.ResponseWriter, r *http.Request) {
 		"slug":               postSlug,
 		"subtitle":           post.Subtitle,
 		"excerpt":            post.Excerpt,
-		"description":        post.Description,
-		"html_description":   description,
+		"description":        jsonDescription,
+		"html_description":   htmlDescription,
 		"is_highlighted":     post.IsHighlighted,
 		"is_sticky":          post.IsSticky,
 		"is_featured":        post.IsFeatured,
diff --git a/server/service/core/action/tag/create.go b/server/service/core/action/tag/create.go
index f5df69af0..b531d3b5e 100644
--- a/server/service/core/action/tag/create.go
+++ b/server/service/core/action/tag/create.go
@@ -5,11 +5,9 @@ import (
 	"encoding/json"
 	"errors"
 	"net/http"
-	"reflect"
 
 	"github.com/factly/dega-server/config"
 	"github.com/factly/dega-server/service/core/model"
-	"github.com/factly/dega-server/test"
 	"github.com/factly/dega-server/util"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
@@ -18,6 +16,7 @@ import (
 	"github.com/factly/x/renderx"
 	"github.com/factly/x/slugx"
 	"github.com/factly/x/validationx"
+	"github.com/jinzhu/gorm/dialects/postgres"
 	"gorm.io/gorm"
 )
 
@@ -87,13 +86,20 @@ func create(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// Store HTML description
-	var description string
-	if len(tag.Description.RawMessage) > 0 && !reflect.DeepEqual(tag.Description, test.NilJsonb()) {
-		description, err = util.HTMLDescription(tag.Description)
+	var htmlDescription string
+	var jsonDescription postgres.Jsonb
+	if len(tag.Description.RawMessage) > 0 {
+		htmlDescription, err = util.GetHTMLDescription(tag.Description)
 		if err != nil {
 			loggerx.Error(err)
-			errorx.Render(w, errorx.Parser(errorx.GetMessage("cannot parse tag description", http.StatusUnprocessableEntity)))
+			errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+			return
+		}
+
+		jsonDescription, err = util.GetJSONDescription(tag.Description)
+		if err != nil {
+			loggerx.Error(err)
+			errorx.Render(w, errorx.Parser(errorx.DecodeError()))
 			return
 		}
 	}
@@ -107,8 +113,8 @@ func create(w http.ResponseWriter, r *http.Request) {
 		Name:             tag.Name,
 		Slug:             slugx.Approve(&config.DB, tagSlug, sID, tableName),
 		BackgroundColour: tag.BackgroundColour,
-		Description:      tag.Description,
-		HTMLDescription:  description,
+		Description:      jsonDescription,
+		HTMLDescription:  htmlDescription,
 		SpaceID:          uint(sID),
 		MediumID:         mediumID,
 		IsFeatured:       tag.IsFeatured,
diff --git a/server/service/core/action/tag/update.go b/server/service/core/action/tag/update.go
index a70f73186..00e332289 100644
--- a/server/service/core/action/tag/update.go
+++ b/server/service/core/action/tag/update.go
@@ -4,13 +4,11 @@ import (
 	"encoding/json"
 	"errors"
 	"net/http"
-	"reflect"
 	"strconv"
 	"time"
 
 	"github.com/factly/dega-server/config"
 	"github.com/factly/dega-server/service/core/model"
-	"github.com/factly/dega-server/test"
 	"github.com/factly/dega-server/util"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
@@ -20,6 +18,7 @@ import (
 	"github.com/factly/x/slugx"
 	"github.com/factly/x/validationx"
 	"github.com/go-chi/chi"
+	"github.com/jinzhu/gorm/dialects/postgres"
 	"gorm.io/gorm"
 )
 
@@ -114,12 +113,20 @@ func update(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// Store HTML description
-	var description string
-	if len(tag.Description.RawMessage) > 0 && !reflect.DeepEqual(tag.Description, test.NilJsonb()) {
-		description, err = util.HTMLDescription(tag.Description)
+	var htmlDescription string
+	var jsonDescription postgres.Jsonb
+	if len(tag.Description.RawMessage) > 0 {
+		htmlDescription, err = util.GetHTMLDescription(tag.Description)
 		if err != nil {
 			loggerx.Error(err)
-			errorx.Render(w, errorx.Parser(errorx.GetMessage("cannot parse tag description", http.StatusUnprocessableEntity)))
+			errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+			return
+		}
+
+		jsonDescription, err = util.GetJSONDescription(tag.Description)
+		if err != nil {
+			loggerx.Error(err)
+			errorx.Render(w, errorx.Parser(errorx.DecodeError()))
 			return
 		}
 	}
@@ -131,8 +138,8 @@ func update(w http.ResponseWriter, r *http.Request) {
 		"updated_by_id":    uint(uID),
 		"name":             tag.Name,
 		"slug":             tagSlug,
-		"description":      tag.Description,
-		"html_description": description,
+		"description":      jsonDescription,
+		"html_description": htmlDescription,
 		"meta_fields":      tag.MetaFields,
 		"meta":             tag.Meta,
 		"header_code":      tag.HeaderCode,
diff --git a/server/service/fact-check/action/claim/create.go b/server/service/fact-check/action/claim/create.go
index fab1e1fb5..4843ed5f1 100644
--- a/server/service/fact-check/action/claim/create.go
+++ b/server/service/fact-check/action/claim/create.go
@@ -5,11 +5,9 @@ import (
 	"encoding/json"
 	"errors"
 	"net/http"
-	"reflect"
 
 	"github.com/factly/dega-server/config"
 	"github.com/factly/dega-server/service/fact-check/model"
-	"github.com/factly/dega-server/test"
 	"github.com/factly/dega-server/util"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
@@ -18,6 +16,7 @@ import (
 	"github.com/factly/x/renderx"
 	"github.com/factly/x/slugx"
 	"github.com/factly/x/validationx"
+	"github.com/jinzhu/gorm/dialects/postgres"
 	"gorm.io/gorm"
 )
 
@@ -88,13 +87,20 @@ func create(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	// Store HTML description
-	var description string
-	if len(claim.Description.RawMessage) > 0 && !reflect.DeepEqual(claim.Description, test.NilJsonb()) {
-		description, err = util.HTMLDescription(claim.Description)
+	var htmlDescription string
+	var jsonDescription postgres.Jsonb
+	if len(claim.Description.RawMessage) > 0 {
+		htmlDescription, err = util.GetHTMLDescription(claim.Description)
 		if err != nil {
 			loggerx.Error(err)
-			errorx.Render(w, errorx.Parser(errorx.GetMessage("cannot parse claim description", http.StatusUnprocessableEntity)))
+			errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+			return
+		}
+
+		jsonDescription, err = util.GetJSONDescription(claim.Description)
+		if err != nil {
+			loggerx.Error(err)
+			errorx.Render(w, errorx.Parser(errorx.DecodeError()))
 			return
 		}
 	}
@@ -110,8 +116,8 @@ func create(w http.ResponseWriter, r *http.Request) {
 		ClaimDate:       claim.ClaimDate,
 		CheckedDate:     claim.CheckedDate,
 		ClaimSources:    claim.ClaimSources,
-		Description:     claim.Description,
-		HTMLDescription: description,
+		Description:     jsonDescription,
+		HTMLDescription: htmlDescription,
 		ClaimantID:      claim.ClaimantID,
 		RatingID:        claim.RatingID,
 		Fact:            claim.Fact,
diff --git a/server/service/fact-check/action/claim/update.go b/server/service/fact-check/action/claim/update.go
index 281b41bc0..bb5d62c1d 100644
--- a/server/service/fact-check/action/claim/update.go
+++ b/server/service/fact-check/action/claim/update.go
@@ -4,12 +4,10 @@ import (
 	"encoding/json"
 	"errors"
 	"net/http"
-	"reflect"
 	"strconv"
 
 	"github.com/factly/dega-server/config"
 	"github.com/factly/dega-server/service/fact-check/model"
-	"github.com/factly/dega-server/test"
 	"github.com/factly/dega-server/util"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
@@ -19,6 +17,7 @@ import (
 	"github.com/factly/x/slugx"
 	"github.com/factly/x/validationx"
 	"github.com/go-chi/chi"
+	"github.com/jinzhu/gorm/dialects/postgres"
 	"gorm.io/gorm"
 )
 
@@ -115,13 +114,20 @@ func update(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	// Store HTML description
-	var description string
-	if len(claim.Description.RawMessage) > 0 && !reflect.DeepEqual(claim.Description, test.NilJsonb()) {
-		description, err = util.HTMLDescription(claim.Description)
+	var htmlDescription string
+	var jsonDescription postgres.Jsonb
+	if len(claim.Description.RawMessage) > 0 {
+		htmlDescription, err = util.GetHTMLDescription(claim.Description)
 		if err != nil {
 			loggerx.Error(err)
-			errorx.Render(w, errorx.Parser(errorx.GetMessage("cannot parse claim description", http.StatusUnprocessableEntity)))
+			errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+			return
+		}
+
+		jsonDescription, err = util.GetJSONDescription(claim.Description)
+		if err != nil {
+			loggerx.Error(err)
+			errorx.Render(w, errorx.Parser(errorx.DecodeError()))
 			return
 		}
 	}
@@ -150,8 +156,8 @@ func update(w http.ResponseWriter, r *http.Request) {
 		Claim:           claim.Claim,
 		Slug:            claimSlug,
 		ClaimSources:    claim.ClaimSources,
-		Description:     claim.Description,
-		HTMLDescription: description,
+		Description:     jsonDescription,
+		HTMLDescription: htmlDescription,
 		ClaimantID:      claim.ClaimantID,
 		RatingID:        claim.RatingID,
 		Fact:            claim.Fact,
diff --git a/server/service/fact-check/action/claimant/create.go b/server/service/fact-check/action/claimant/create.go
index 960fd3201..d0223b9b7 100644
--- a/server/service/fact-check/action/claimant/create.go
+++ b/server/service/fact-check/action/claimant/create.go
@@ -5,11 +5,9 @@ import (
 	"encoding/json"
 	"errors"
 	"net/http"
-	"reflect"
 
 	"github.com/factly/dega-server/config"
 	"github.com/factly/dega-server/service/fact-check/model"
-	"github.com/factly/dega-server/test"
 	"github.com/factly/dega-server/util"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
@@ -18,6 +16,7 @@ import (
 	"github.com/factly/x/renderx"
 	"github.com/factly/x/slugx"
 	"github.com/factly/x/validationx"
+	"github.com/jinzhu/gorm/dialects/postgres"
 	"gorm.io/gorm"
 )
 
@@ -92,13 +91,20 @@ func create(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	var description string
-	// Store HTML description
-	if len(claimant.Description.RawMessage) > 0 && !reflect.DeepEqual(claimant.Description, test.NilJsonb()) {
-		description, err = util.HTMLDescription(claimant.Description)
+	var htmlDescription string
+	var jsonDescription postgres.Jsonb
+	if len(claimant.Description.RawMessage) > 0 {
+		htmlDescription, err = util.GetHTMLDescription(claimant.Description)
 		if err != nil {
 			loggerx.Error(err)
-			errorx.Render(w, errorx.Parser(errorx.GetMessage("cannot parse claimant description", http.StatusUnprocessableEntity)))
+			errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+			return
+		}
+
+		jsonDescription, err = util.GetJSONDescription(claimant.Description)
+		if err != nil {
+			loggerx.Error(err)
+			errorx.Render(w, errorx.Parser(errorx.DecodeError()))
 			return
 		}
 	}
@@ -106,8 +112,8 @@ func create(w http.ResponseWriter, r *http.Request) {
 	result := &model.Claimant{
 		Name:            claimant.Name,
 		Slug:            slugx.Approve(&config.DB, claimantSlug, sID, tableName),
-		Description:     claimant.Description,
-		HTMLDescription: description,
+		Description:     jsonDescription,
+		HTMLDescription: htmlDescription,
 		MediumID:        mediumID,
 		IsFeatured:      claimant.IsFeatured,
 		SpaceID:         uint(sID),
diff --git a/server/service/fact-check/action/claimant/update.go b/server/service/fact-check/action/claimant/update.go
index acac88b43..d9b58acc7 100644
--- a/server/service/fact-check/action/claimant/update.go
+++ b/server/service/fact-check/action/claimant/update.go
@@ -4,13 +4,11 @@ import (
 	"encoding/json"
 	"errors"
 	"net/http"
-	"reflect"
 	"strconv"
 	"time"
 
 	"github.com/factly/dega-server/config"
 	"github.com/factly/dega-server/service/fact-check/model"
-	"github.com/factly/dega-server/test"
 	"github.com/factly/dega-server/util"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
@@ -20,6 +18,7 @@ import (
 	"github.com/factly/x/slugx"
 	"github.com/factly/x/validationx"
 	"github.com/go-chi/chi"
+	"github.com/jinzhu/gorm/dialects/postgres"
 	"gorm.io/gorm"
 )
 
@@ -114,13 +113,20 @@ func update(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// Store HTML description
-	var description string
-	if len(claimant.Description.RawMessage) > 0 && !reflect.DeepEqual(claimant.Description, test.NilJsonb()) {
-		description, err = util.HTMLDescription(claimant.Description)
+	var htmlDescription string
+	var jsonDescription postgres.Jsonb
+	if len(claimant.Description.RawMessage) > 0 {
+		htmlDescription, err = util.GetHTMLDescription(claimant.Description)
 		if err != nil {
 			loggerx.Error(err)
-			errorx.Render(w, errorx.Parser(errorx.GetMessage("cannot parse claimant description", http.StatusUnprocessableEntity)))
+			errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+			return
+		}
+
+		jsonDescription, err = util.GetJSONDescription(claimant.Description)
+		if err != nil {
+			loggerx.Error(err)
+			errorx.Render(w, errorx.Parser(errorx.DecodeError()))
 			return
 		}
 	}
@@ -131,8 +137,8 @@ func update(w http.ResponseWriter, r *http.Request) {
 		"updated_by_id":    uID,
 		"name":             claimant.Name,
 		"slug":             claimantSlug,
-		"description":      claimant.Description,
-		"html_description": description,
+		"description":      jsonDescription,
+		"html_description": htmlDescription,
 		"medium_id":        claimant.MediumID,
 		"tag_line":         claimant.TagLine,
 		"is_featured":      claimant.IsFeatured,
diff --git a/server/service/fact-check/action/rating/create.go b/server/service/fact-check/action/rating/create.go
index 2e02eecf8..2bfb5035e 100644
--- a/server/service/fact-check/action/rating/create.go
+++ b/server/service/fact-check/action/rating/create.go
@@ -5,11 +5,9 @@ import (
 	"encoding/json"
 	"errors"
 	"net/http"
-	"reflect"
 
 	"github.com/factly/dega-server/config"
 	"github.com/factly/dega-server/service/fact-check/model"
-	"github.com/factly/dega-server/test"
 	"github.com/factly/dega-server/util"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
@@ -18,6 +16,7 @@ import (
 	"github.com/factly/x/renderx"
 	"github.com/factly/x/slugx"
 	"github.com/factly/x/validationx"
+	"github.com/jinzhu/gorm/dialects/postgres"
 	"gorm.io/gorm"
 )
 
@@ -105,13 +104,20 @@ func create(w http.ResponseWriter, r *http.Request) {
 		mediumID = nil
 	}
 
-	// Store HTML description
-	var description string
-	if len(rating.Description.RawMessage) > 0 && !reflect.DeepEqual(rating.Description, test.NilJsonb()) {
-		description, err = util.HTMLDescription(rating.Description)
+	var htmlDescription string
+	var jsonDescription postgres.Jsonb
+	if len(rating.Description.RawMessage) > 0 {
+		htmlDescription, err = util.GetHTMLDescription(rating.Description)
 		if err != nil {
 			loggerx.Error(err)
-			errorx.Render(w, errorx.Parser(errorx.GetMessage("cannot parse rating description", http.StatusUnprocessableEntity)))
+			errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+			return
+		}
+
+		jsonDescription, err = util.GetJSONDescription(rating.Description)
+		if err != nil {
+			loggerx.Error(err)
+			errorx.Render(w, errorx.Parser(errorx.DecodeError()))
 			return
 		}
 	}
@@ -121,8 +127,8 @@ func create(w http.ResponseWriter, r *http.Request) {
 		Slug:             slugx.Approve(&config.DB, ratingSlug, sID, tableName),
 		BackgroundColour: rating.BackgroundColour,
 		TextColour:       rating.TextColour,
-		Description:      rating.Description,
-		HTMLDescription:  description,
+		Description:      jsonDescription,
+		HTMLDescription:  htmlDescription,
 		MediumID:         mediumID,
 		SpaceID:          uint(sID),
 		NumericValue:     rating.NumericValue,
diff --git a/server/service/fact-check/action/rating/default.go b/server/service/fact-check/action/rating/default.go
index a6451bf36..8508d3c69 100644
--- a/server/service/fact-check/action/rating/default.go
+++ b/server/service/fact-check/action/rating/default.go
@@ -69,7 +69,15 @@ func createDefaults(w http.ResponseWriter, r *http.Request) {
 
 	for i := range ratings {
 		ratings[i].SpaceID = uint(sID)
-		ratings[i].HTMLDescription, err = util.HTMLDescription(ratings[i].Description)
+		ratings[i].HTMLDescription, err = util.GetHTMLDescription(ratings[i].Description)
+		if err != nil {
+			tx.Rollback()
+			loggerx.Error(err)
+			errorx.Render(w, errorx.Parser(errorx.GetMessage("cannot parse rating description", http.StatusUnprocessableEntity)))
+			return
+		}
+
+		ratings[i].Description, err = util.GetJSONDescription(ratings[i].Description)
 		if err != nil {
 			tx.Rollback()
 			loggerx.Error(err)
diff --git a/server/service/fact-check/action/rating/update.go b/server/service/fact-check/action/rating/update.go
index 0d94313ad..8fc7b872d 100644
--- a/server/service/fact-check/action/rating/update.go
+++ b/server/service/fact-check/action/rating/update.go
@@ -4,12 +4,10 @@ import (
 	"encoding/json"
 	"errors"
 	"net/http"
-	"reflect"
 	"strconv"
 
 	"github.com/factly/dega-server/config"
 	"github.com/factly/dega-server/service/fact-check/model"
-	"github.com/factly/dega-server/test"
 	"github.com/factly/dega-server/util"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
@@ -19,6 +17,7 @@ import (
 	"github.com/factly/x/slugx"
 	"github.com/factly/x/validationx"
 	"github.com/go-chi/chi"
+	"github.com/jinzhu/gorm/dialects/postgres"
 	"gorm.io/gorm"
 )
 
@@ -127,13 +126,20 @@ func update(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	// Store HTML description
-	var description string
-	if len(rating.Description.RawMessage) > 0 && !reflect.DeepEqual(rating.Description, test.NilJsonb()) {
-		description, err = util.HTMLDescription(rating.Description)
+	var htmlDescription string
+	var jsonDescription postgres.Jsonb
+	if len(rating.Description.RawMessage) > 0 {
+		htmlDescription, err = util.GetHTMLDescription(rating.Description)
 		if err != nil {
 			loggerx.Error(err)
-			errorx.Render(w, errorx.Parser(errorx.GetMessage("cannot parse rating description", http.StatusUnprocessableEntity)))
+			errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+			return
+		}
+
+		jsonDescription, err = util.GetJSONDescription(rating.Description)
+		if err != nil {
+			loggerx.Error(err)
+			errorx.Render(w, errorx.Parser(errorx.DecodeError()))
 			return
 		}
 	}
@@ -160,8 +166,8 @@ func update(w http.ResponseWriter, r *http.Request) {
 		BackgroundColour: rating.BackgroundColour,
 		TextColour:       rating.TextColour,
 		MediumID:         mediumID,
-		Description:      rating.Description,
-		HTMLDescription:  description,
+		Description:      jsonDescription,
+		HTMLDescription:  htmlDescription,
 		NumericValue:     rating.NumericValue,
 		MetaFields:       rating.MetaFields,
 		Meta:             rating.Meta,
diff --git a/server/service/podcast/action/create.go b/server/service/podcast/action/create.go
index a74d55ae4..bf3c04bbe 100644
--- a/server/service/podcast/action/create.go
+++ b/server/service/podcast/action/create.go
@@ -5,12 +5,10 @@ import (
 	"encoding/json"
 	"errors"
 	"net/http"
-	"reflect"
 
 	"github.com/factly/dega-server/config"
 	coreModel "github.com/factly/dega-server/service/core/model"
 	"github.com/factly/dega-server/service/podcast/model"
-	"github.com/factly/dega-server/test"
 	"github.com/factly/dega-server/util"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
@@ -19,6 +17,7 @@ import (
 	"github.com/factly/x/renderx"
 	"github.com/factly/x/slugx"
 	"github.com/factly/x/validationx"
+	"github.com/jinzhu/gorm/dialects/postgres"
 	"gorm.io/gorm"
 )
 
@@ -99,20 +98,28 @@ func create(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// Store HTML description
-	var description string
-	if len(podcast.Description.RawMessage) > 0 && !reflect.DeepEqual(podcast.Description, test.NilJsonb()) {
-		description, err = util.HTMLDescription(podcast.Description)
+	var htmlDescription string
+	var jsonDescription postgres.Jsonb
+	if len(podcast.Description.RawMessage) > 0 {
+		htmlDescription, err = util.GetHTMLDescription(podcast.Description)
 		if err != nil {
 			loggerx.Error(err)
-			errorx.Render(w, errorx.Parser(errorx.GetMessage("cannot parse podcast description", http.StatusUnprocessableEntity)))
+			errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+			return
+		}
+
+		jsonDescription, err = util.GetJSONDescription(podcast.Description)
+		if err != nil {
+			loggerx.Error(err)
+			errorx.Render(w, errorx.Parser(errorx.DecodeError()))
 			return
 		}
 	}
 
 	result := &model.Podcast{
 		Title:             podcast.Title,
-		Description:       podcast.Description,
-		HTMLDescription:   description,
+		Description:       jsonDescription,
+		HTMLDescription:   htmlDescription,
 		Slug:              slugx.Approve(&config.DB, podcastSlug, sID, tableName),
 		Language:          podcast.Language,
 		MediumID:          mediumID,
diff --git a/server/service/podcast/action/episode/create.go b/server/service/podcast/action/episode/create.go
index 9352ef1dc..3411e4d9c 100644
--- a/server/service/podcast/action/episode/create.go
+++ b/server/service/podcast/action/episode/create.go
@@ -6,13 +6,12 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
-	"reflect"
 
 	"github.com/factly/dega-server/config"
 	"github.com/factly/dega-server/service/core/action/author"
 	"github.com/factly/dega-server/service/podcast/model"
-	"github.com/factly/dega-server/test"
 	"github.com/factly/dega-server/util"
+	"github.com/jinzhu/gorm/dialects/postgres"
 
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
@@ -92,21 +91,29 @@ func create(w http.ResponseWriter, r *http.Request) {
 		podcastID = nil
 	}
 
-	// Store HTML description
-	var description string
-	if len(episode.Description.RawMessage) > 0 && !reflect.DeepEqual(episode.Description, test.NilJsonb()) {
-		description, err = util.HTMLDescription(episode.Description)
+	var htmlDescription string
+	var jsonDescription postgres.Jsonb
+	if len(episode.Description.RawMessage) > 0 {
+		htmlDescription, err = util.GetHTMLDescription(episode.Description)
 		if err != nil {
 			loggerx.Error(err)
-			errorx.Render(w, errorx.Parser(errorx.GetMessage("cannot parse episode description", http.StatusUnprocessableEntity)))
+			errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+			return
+		}
+
+		jsonDescription, err = util.GetJSONDescription(episode.Description)
+		if err != nil {
+			loggerx.Error(err)
+			errorx.Render(w, errorx.Parser(errorx.DecodeError()))
 			return
 		}
 	}
+
 	result := &episodeData{}
 	result.Episode = model.Episode{
 		Title:           episode.Title,
-		Description:     episode.Description,
-		HTMLDescription: description,
+		Description:     jsonDescription,
+		HTMLDescription: htmlDescription,
 		Slug:            slugx.Approve(&config.DB, episodeSlug, sID, tableName),
 		Season:          episode.Season,
 		Episode:         episode.Episode,
diff --git a/server/service/podcast/action/episode/update.go b/server/service/podcast/action/episode/update.go
index cb9e53cc1..8938d9265 100644
--- a/server/service/podcast/action/episode/update.go
+++ b/server/service/podcast/action/episode/update.go
@@ -5,13 +5,11 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
-	"reflect"
 	"strconv"
 
 	"github.com/factly/dega-server/config"
 	"github.com/factly/dega-server/service/core/action/author"
 	"github.com/factly/dega-server/service/podcast/model"
-	"github.com/factly/dega-server/test"
 	"github.com/factly/dega-server/util"
 	"github.com/factly/dega-server/util/arrays"
 	"github.com/factly/x/errorx"
@@ -22,6 +20,7 @@ import (
 	"github.com/factly/x/slugx"
 	"github.com/factly/x/validationx"
 	"github.com/go-chi/chi"
+	"github.com/jinzhu/gorm/dialects/postgres"
 	"gorm.io/gorm"
 )
 
@@ -109,13 +108,20 @@ func update(w http.ResponseWriter, r *http.Request) {
 		episodeSlug = slugx.Approve(&config.DB, slugx.Make(episode.Title), sID, tableName)
 	}
 
-	// Store HTML description
-	var description string
-	if len(episode.Description.RawMessage) > 0 && !reflect.DeepEqual(episode.Description, test.NilJsonb()) {
-		description, err = util.HTMLDescription(episode.Description)
+	var htmlDescription string
+	var jsonDescription postgres.Jsonb
+	if len(episode.Description.RawMessage) > 0 {
+		htmlDescription, err = util.GetHTMLDescription(episode.Description)
 		if err != nil {
 			loggerx.Error(err)
-			errorx.Render(w, errorx.Parser(errorx.GetMessage("cannot parse episode description", http.StatusUnprocessableEntity)))
+			errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+			return
+		}
+
+		jsonDescription, err = util.GetJSONDescription(episode.Description)
+		if err != nil {
+			loggerx.Error(err)
+			errorx.Render(w, errorx.Parser(errorx.DecodeError()))
 			return
 		}
 	}
@@ -151,8 +157,8 @@ func update(w http.ResponseWriter, r *http.Request) {
 	tx.Model(&result.Episode).Updates(model.Episode{
 		Base:            config.Base{UpdatedByID: uint(uID)},
 		Title:           episode.Title,
-		HTMLDescription: description,
-		Description:     episode.Description,
+		HTMLDescription: htmlDescription,
+		Description:     jsonDescription,
 		Slug:            slugx.Approve(&config.DB, episodeSlug, sID, tableName),
 		Season:          episode.Season,
 		Episode:         episode.Episode,
diff --git a/server/service/podcast/action/update.go b/server/service/podcast/action/update.go
index db5a72281..175989c80 100644
--- a/server/service/podcast/action/update.go
+++ b/server/service/podcast/action/update.go
@@ -4,13 +4,11 @@ import (
 	"encoding/json"
 	"errors"
 	"net/http"
-	"reflect"
 	"strconv"
 
 	"github.com/factly/dega-server/config"
 	coreModel "github.com/factly/dega-server/service/core/model"
 	"github.com/factly/dega-server/service/podcast/model"
-	"github.com/factly/dega-server/test"
 	"github.com/factly/dega-server/util"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
@@ -20,6 +18,7 @@ import (
 	"github.com/factly/x/slugx"
 	"github.com/factly/x/validationx"
 	"github.com/go-chi/chi"
+	"github.com/jinzhu/gorm/dialects/postgres"
 	"gorm.io/gorm"
 )
 
@@ -114,13 +113,20 @@ func update(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// Store HTML description
-	var description string
-	if len(podcast.Description.RawMessage) > 0 && !reflect.DeepEqual(podcast.Description, test.NilJsonb()) {
-		description, err = util.HTMLDescription(podcast.Description)
+	var htmlDescription string
+	var jsonDescription postgres.Jsonb
+	if len(podcast.Description.RawMessage) > 0 {
+		htmlDescription, err = util.GetHTMLDescription(podcast.Description)
 		if err != nil {
 			loggerx.Error(err)
-			errorx.Render(w, errorx.Parser(errorx.GetMessage("cannot parse podcast description", http.StatusUnprocessableEntity)))
+			errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+			return
+		}
+
+		jsonDescription, err = util.GetJSONDescription(podcast.Description)
+		if err != nil {
+			loggerx.Error(err)
+			errorx.Render(w, errorx.Parser(errorx.DecodeError()))
 			return
 		}
 	}
@@ -168,8 +174,8 @@ func update(w http.ResponseWriter, r *http.Request) {
 
 	tx.Model(&result).Omit("Categories").Updates(model.Podcast{
 		Base:              config.Base{UpdatedByID: uint(uID)},
-		HTMLDescription:   description,
-		Description:       podcast.Description,
+		HTMLDescription:   htmlDescription,
+		Description:       jsonDescription,
 		Slug:              slugx.Approve(&config.DB, podcastSlug, sID, tableName),
 		Language:          podcast.Language,
 		MediumID:          mediumID,
diff --git a/server/util/description.go b/server/util/description.go
deleted file mode 100644
index 7268a097f..000000000
--- a/server/util/description.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package util
-
-import (
-	"encoding/json"
-
-	"github.com/factly/x/editorx"
-	"github.com/jinzhu/gorm/dialects/postgres"
-)
-
-func HTMLDescription(jsonData postgres.Jsonb) (string, error) {
-	editorjsBlocks := make(map[string]interface{})
-	err := json.Unmarshal(jsonData.RawMessage, &editorjsBlocks)
-	if err != nil {
-		return "", err
-	}
-	description, err := editorx.EditorjsToHTML(editorjsBlocks)
-	if err != nil {
-		return "", err
-	}
-	return description, nil
-}
diff --git a/server/util/scooter.go b/server/util/scooter.go
new file mode 100644
index 000000000..27a9391d8
--- /dev/null
+++ b/server/util/scooter.go
@@ -0,0 +1,30 @@
+package util
+
+import (
+	"encoding/json"
+
+	"github.com/jinzhu/gorm/dialects/postgres"
+)
+
+type Description struct {
+	HTML string
+	JSON postgres.Jsonb
+}
+
+func GetHTMLDescription(jsonData postgres.Jsonb) (string, error) {
+	var description Description
+	err := json.Unmarshal(jsonData.RawMessage, &description)
+	if err != nil {
+		return "", err
+	}
+	return description.HTML, nil
+}
+
+func GetJSONDescription(jsonData postgres.Jsonb) (postgres.Jsonb, error) {
+	var description Description
+	err := json.Unmarshal(jsonData.RawMessage, &description)
+	if err != nil {
+		return postgres.Jsonb{}, err
+	}
+	return description.JSON, nil
+}
diff --git a/studio/src/__tests__/actions/sachFactChecks.js b/studio/src/__tests__/actions/sachFactChecks.js
index fdae4142e..5025f8760 100644
--- a/studio/src/__tests__/actions/sachFactChecks.js
+++ b/studio/src/__tests__/actions/sachFactChecks.js
@@ -73,32 +73,30 @@ const factcheck = {
 };
 
 describe('sach fact-checks action', () => {
+  // testing the loadingSachFactChecks action
+  it('should create an action to set loading to true', () => {
+    const startLoadingAction = {
+      type: types.SET_SACH_FACT_CHECKS_LOADING,
+      payload: true,
+    };
+    expect(actions.loadingSachFactChecks()).toEqual(startLoadingAction);
+  });
 
-	// testing the loadingSachFactChecks action
-	it('should create an action to set loading to true', () => {
-		const startLoadingAction = {
-			type: types.SET_SACH_FACT_CHECKS_LOADING,
-			payload: true,
-		}
-		expect(actions.loadingSachFactChecks()).toEqual(startLoadingAction)
-	});
+  // testing the stopLoading fact check action
+  it('should create an action to stop loading', () => {
+    const stopLoadingAction = {
+      type: types.SET_SACH_FACT_CHECKS_LOADING,
+      payload: false,
+    };
+    expect(actions.stopLoading()).toEqual(stopLoadingAction);
+  });
 
-	// testing the stopLoading fact check action
-	it('should create an action to stop loading', () => {
-		const stopLoadingAction = {
-			type: types.SET_SACH_FACT_CHECKS_LOADING,
-			payload: false
-		}
-		expect(actions.stopLoading()).toEqual(stopLoadingAction);
-	})
-
-	//testing it addFactChecks action
-	it('should create an action to add fact checks', () => {
-		const addFactChecksAction  = {
-			type: types.ADD_SACH_FACT_CHECKS,
-			payload: [factcheck]
-		};
-		expect(actions.addFactChecks([factcheck])).toEqual(addFactChecksAction);
-	})
+  //testing it addFactChecks action
+  it('should create an action to add fact checks', () => {
+    const addFactChecksAction = {
+      type: types.ADD_SACH_FACT_CHECKS,
+      payload: [factcheck],
+    };
+    expect(actions.addFactChecks([factcheck])).toEqual(addFactChecksAction);
+  });
 });
- 
\ No newline at end of file
diff --git a/studio/src/components/FormItems/DescriptionInput.js b/studio/src/components/FormItems/DescriptionInput.js
index a49e6c101..1cc2b43a1 100644
--- a/studio/src/components/FormItems/DescriptionInput.js
+++ b/studio/src/components/FormItems/DescriptionInput.js
@@ -6,7 +6,7 @@ const DescriptionInput = ({
   name = 'description',
   label = 'Description',
   noLabel = false,
-  onChange = (data) => console.log(data),
+  onChange = (data) => console.log({ data }),
   inputProps,
   formItemProps,
   initialValue,
@@ -16,7 +16,6 @@ const DescriptionInput = ({
 
   return (
     <Form.Item name={name} {...formItemProps}>
-      {console.log({ inputProps, formItemProps, initialValue })}
       {/* <Editor {...inputProps} /> */}
       <Editor
         menuType="bubble"
diff --git a/studio/src/constants/date.js b/studio/src/constants/date.js
index 6900dd55d..d2c7a7a71 100644
--- a/studio/src/constants/date.js
+++ b/studio/src/constants/date.js
@@ -1 +1,14 @@
-export const listOfMonths = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"]
\ No newline at end of file
+export const listOfMonths = [
+  'January',
+  'February',
+  'March',
+  'April',
+  'May',
+  'June',
+  'July',
+  'August',
+  'September',
+  'October',
+  'November',
+  'December',
+];
diff --git a/studio/src/pages/fact-checks/components/FactCheckForm.js b/studio/src/pages/fact-checks/components/FactCheckForm.js
index 3d5f4082f..5538e70b0 100644
--- a/studio/src/pages/fact-checks/components/FactCheckForm.js
+++ b/studio/src/pages/fact-checks/components/FactCheckForm.js
@@ -296,9 +296,11 @@ function FactCheckForm({ onCreate, data = {}, actions = {}, format }) {
                   style={{ fontSize: '2.5rem', fontWeight: 'bold', textAlign: 'center' }}
                 />
               </Form.Item>
-              {
-                (data?.updated_at) ? <p style={{fontSize: '18px', color:'#595E60'}}>Last updated on : {getDatefromStringWithoutDay(data.updated_at)}</p> : null
-              }
+              {data?.updated_at ? (
+                <p style={{ fontSize: '18px', color: '#595E60' }}>
+                  Last updated on : {getDatefromStringWithoutDay(data.updated_at)}
+                </p>
+              ) : null}
               {form.getFieldValue('claims') &&
               form.getFieldValue('claims').length > 0 &&
               !loading ? (
diff --git a/studio/src/pages/posts/components/PostForm.js b/studio/src/pages/posts/components/PostForm.js
index 42fe42704..3b55948d2 100644
--- a/studio/src/pages/posts/components/PostForm.js
+++ b/studio/src/pages/posts/components/PostForm.js
@@ -236,9 +236,11 @@ function PostForm({ onCreate, data = {}, actions = {}, format, page = false }) {
                   autoSize={{ minRows: 2, maxRows: 6 }}
                 />
               </Form.Item>
-              {
-                (data?.updated_at) ? <p style={{fontSize: '18px', color:'#595E60'}}>Last updated on : {getDatefromStringWithoutDay(data.updated_at)}</p> : null
-              }
+              {data?.updated_at ? (
+                <p style={{ fontSize: '18px', color: '#595E60' }}>
+                  Last updated on : {getDatefromStringWithoutDay(data.updated_at)}
+                </p>
+              ) : null}
               <DescriptionInput
                 type="editor"
                 formItemProps={{ className: 'post-description' }}
diff --git a/studio/src/pages/website/Branding.js b/studio/src/pages/website/Branding.js
index 8bf8867b2..e2a92ae31 100644
--- a/studio/src/pages/website/Branding.js
+++ b/studio/src/pages/website/Branding.js
@@ -52,7 +52,6 @@ function Branding() {
         onFinishFailed={(errors) => {
           //let name = errors.errorFields[0].name[0];
           // if (['name', 'slug'].includes(name)) {
-          console.log({ errors });
           // }
         }}
         onValuesChange={() => {
diff --git a/studio/src/pages/website/components/WebsiteEditForm.js b/studio/src/pages/website/components/WebsiteEditForm.js
index 94e2daa32..56df24a89 100644
--- a/studio/src/pages/website/components/WebsiteEditForm.js
+++ b/studio/src/pages/website/components/WebsiteEditForm.js
@@ -41,7 +41,6 @@ const WebsiteEditForm = ({ onCreate, data = {} }) => {
         onFinishFailed={(errors) => {
           //let name = errors.errorFields[0].name[0];
           // if (['name', 'slug'].includes(name)) {
-          console.log({ errors });
           // }
         }}
         onValuesChange={() => {
diff --git a/studio/src/utils/date.js b/studio/src/utils/date.js
index 21721cdba..71ea06c52 100644
--- a/studio/src/utils/date.js
+++ b/studio/src/utils/date.js
@@ -1,14 +1,11 @@
-import { listOfMonths } from "../constants/date";
-
+import { listOfMonths } from '../constants/date';
 
 export const getDatefromString = (dateString) => {
   const dateObj = new Date(Date.parse(dateString));
   return dateObj.toDateString();
 };
 
-
 export const getDatefromStringWithoutDay = (dateString) => {
   const dateObj = new Date(Date.parse(dateString));
-  return `${listOfMonths[dateObj.getMonth()]} ${dateObj.getDate()} ${dateObj.getFullYear()}`
+  return `${listOfMonths[dateObj.getMonth()]} ${dateObj.getDate()} ${dateObj.getFullYear()}`;
 };
-
diff --git a/templates/go.sum b/templates/go.sum
index ac9b39529..dbb79fec3 100644
--- a/templates/go.sum
+++ b/templates/go.sum
@@ -39,19 +39,28 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
 github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
+github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
 github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc=
 github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
+github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
+github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
+github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
+github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
 github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
 github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
 github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=
+github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
+github.com/andybalholm/brotli v1.0.0/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
+github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
 github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
@@ -68,10 +77,13 @@ github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+Ce
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
+github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84=
 github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM=
 github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
 github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
+github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
@@ -86,6 +98,8 @@ github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
 github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
 github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
+github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
+github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
@@ -93,13 +107,17 @@ github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7
 github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
+github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
+github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
 github.com/dlmiddlecote/sqlstats v1.0.2 h1:gSU11YN23D/iY50A2zVYwgXgy072khatTsIW6UPjUtI=
 github.com/dlmiddlecote/sqlstats v1.0.2/go.mod h1:0CWaIh/Th+z2aI6Q9Jpfg/o21zmGxWhbByHgQSCUQvY=
 github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
@@ -107,6 +125,7 @@ github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5m
 github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
 github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
 github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
+github.com/eduncan911/podcast v1.4.2/go.mod h1:mSxiK1z5KeNO0YFaQ3ElJlUZbbDV9dA7R9c1coeeXkc=
 github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -116,15 +135,32 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m
 github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0=
+github.com/factly/dega-server v0.0.0-20210629085956-9acf3184fde4/go.mod h1:gDnZ9IwWKI5Zfo2hi6debHZ7QDuZH7ghqucfF+gdze8=
+github.com/factly/hukz v0.0.0-20210513184540-cb49caf5c3d1/go.mod h1:JnwNJ/nQ4Y+qpW44k2Ap/vL0mZHQFstZlrIGPbd77nQ=
+github.com/factly/x v0.0.23/go.mod h1:hYG+r3T4aSb4LTFnMGgf5dlLuN9cpHRaG90psbsTFrY=
+github.com/factly/x v0.0.46/go.mod h1:hYG+r3T4aSb4LTFnMGgf5dlLuN9cpHRaG90psbsTFrY=
 github.com/factly/x v0.0.77 h1:HQXTOLTpPWZhNhCC3TwLQk9nfKlJqzSYjjrCQ20p57o=
 github.com/factly/x v0.0.77/go.mod h1:ZB3evopCd4ev4uZNCxldkh0AgYsxvEabiefrM8RJHBc=
+github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8=
+github.com/fasthttp/websocket v1.4.2/go.mod h1:smsv/h4PBEBaU0XDTY5UwJTpZv69fQ0FfcLJr21mA6Y=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
+github.com/fatih/structs v1.0.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
+github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
 github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4=
 github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
+github.com/gavv/httpexpect v2.0.0+incompatible/go.mod h1:x+9tiU1YnrOvnB725RkpoLv1M62hOWzwo5OXotisrKc=
+github.com/gavv/httpexpect/v2 v2.1.0/go.mod h1:lnd0TqJLrP+wkJk3SFwtrpSlOAZQ7HaaIFuOYbgqgUM=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/gin-contrib/gzip v0.0.1/go.mod h1:fGBJBCdt6qCZuCAOwWuFhBB4OOq9EFqlo5dEaFhhu5w=
+github.com/gin-contrib/sse v0.0.0-20170109093832-22d885f9ecc7/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s=
+github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s=
+github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
+github.com/gin-gonic/gin v1.3.0/go.mod h1:7cKuhb5qV2ggCFctp2fJQ+ErvciLZrIeoOSOm6mUr7Y=
+github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/3rZdM=
+github.com/go-chi/chi v4.0.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ=
 github.com/go-chi/chi v4.1.2+incompatible h1:fGFk2Gmi/YKXk0OmGfBh0WgmN3XB8lVnEyNz34tQRec=
 github.com/go-chi/chi v4.1.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
@@ -137,10 +173,36 @@ github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vb
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
+github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
+github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
+github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
+github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
+github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
+github.com/go-openapi/jsonreference v0.19.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
+github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc=
+github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8=
+github.com/go-openapi/jsonreference v0.19.4/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg=
+github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg=
+github.com/go-openapi/spec v0.19.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
+github.com/go-openapi/spec v0.19.4/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo=
+github.com/go-openapi/spec v0.19.9/go.mod h1:vqK/dIdLGCosfvYsQV3WfC7N3TiZSnGY2RZKoFK7X28=
+github.com/go-openapi/spec v0.19.14/go.mod h1:gwrgJS15eCUgjLpMjBJmbZezCsw88LmgeEip0M63doA=
+github.com/go-openapi/spec v0.20.0/go.mod h1:+81FIL1JwC5P3/Iuuozq3pPE9dXdIEGxFutcFKaVbmU=
+github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
+github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
+github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
+github.com/go-openapi/swag v0.19.11/go.mod h1:Uc0gKkdR+ojzsEpjh39QChyu92vPgIr72POcgHMAgSY=
+github.com/go-openapi/swag v0.19.12/go.mod h1:eFdyEBkTdoAf/9RXBvj4cr1nH7GD8Kzo5HTt47gr72M=
+github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
+github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
+github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
+github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
+github.com/go-playground/validator/v10 v10.6.1/go.mod h1:xm76BBt941f7yWdGnI2DVPFFg1UK3YY04qifoXU3lOk=
 github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
 github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s=
@@ -148,9 +210,11 @@ github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7a
 github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
+github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -195,6 +259,7 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
@@ -218,13 +283,19 @@ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5m
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
+github.com/gorilla/feeds v1.1.1/go.mod h1:Nk0jZrvPFZX1OBe5NPiddPw7CfwF6Q9eqzaBbaightA=
 github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
+github.com/gorilla/websocket v1.0.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
+github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
+github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
+github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplbc8s8sSb3V2oUCygFHVp8gC3Dn6U4MNI=
 github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=
 github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE=
 github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
@@ -253,8 +324,11 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO
 github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/imkira/go-interpol v1.0.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA=
+github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
+github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0=
 github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
 github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
 github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8=
@@ -262,6 +336,10 @@ github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgO
 github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA=
 github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE=
 github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s=
+github.com/jackc/pgconn v1.4.0/go.mod h1:Y2O3ZDF0q4mMacyWV3AstPJpeHXWGEetiFttmq5lahk=
+github.com/jackc/pgconn v1.5.0/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI=
+github.com/jackc/pgconn v1.5.1-0.20200601181101-fa742c524853/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI=
+github.com/jackc/pgconn v1.7.0/go.mod h1:sF/lPpNEMEOp+IYhyQGdAvrG20gWf6A1tKlr0v7JMeA=
 github.com/jackc/pgconn v1.8.0/go.mod h1:1C2Pb36bGIP9QHGBYCjnyhqu7Rv3sGshaQUvmfGIB/o=
 github.com/jackc/pgconn v1.9.0/go.mod h1:YctiPyvzfU11JFxoXokUOOKQXQmDMoJL9vJzHH8/2JY=
 github.com/jackc/pgconn v1.9.1-0.20210724152538-d89c8390a530/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI=
@@ -275,31 +353,48 @@ github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65 h1:DadwsjnMwFjfWc9y5W
 github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65/go.mod h1:5R2h2EEX+qri8jOWMbJCtaPWkrrNc7OHwsp2TCqp7ak=
 github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
 github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
+github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A=
 github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78=
 github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA=
 github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg=
 github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=
 github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=
+github.com/jackc/pgproto3/v2 v2.0.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
+github.com/jackc/pgproto3/v2 v2.0.5/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
 github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
 github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
 github.com/jackc/pgproto3/v2 v2.3.0 h1:brH0pCGBDkBW07HWlN/oSBXrmo3WB0UvZd1pIuDcL8Y=
 github.com/jackc/pgproto3/v2 v2.3.0/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
+github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E=
 github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg=
 github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E=
 github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg=
 github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc=
 github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw=
+github.com/jackc/pgtype v1.2.0/go.mod h1:5m2OfMh1wTK7x+Fk952IDmI4nw3nPrvtQdM0ZT4WpC0=
+github.com/jackc/pgtype v1.3.1-0.20200510190516-8cd94a14c75a/go.mod h1:vaogEUkALtxZMCH411K+tKzNpwzCKU+AnPzBKZ+I+Po=
+github.com/jackc/pgtype v1.3.1-0.20200606141011-f6355165a91c/go.mod h1:cvk9Bgu/VzJ9/lxTO5R5sf80p0DiucVtN7ZxvaC4GmQ=
+github.com/jackc/pgtype v1.5.0/go.mod h1:JCULISAZBFGrHaOXIIFiyfzW5VY0GRitRr8NeJsrdig=
+github.com/jackc/pgtype v1.6.2/go.mod h1:JCULISAZBFGrHaOXIIFiyfzW5VY0GRitRr8NeJsrdig=
 github.com/jackc/pgtype v1.8.1-0.20210724151600-32e20a603178/go.mod h1:C516IlIV9NKqfsMCXTdChteoXmwgUceqaLfjg2e3NlM=
 github.com/jackc/pgtype v1.11.0 h1:u4uiGPz/1hryuXzyaBhSk6dnIyyG2683olG2OV+UUgs=
 github.com/jackc/pgtype v1.11.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4=
 github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y=
 github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM=
 github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc=
+github.com/jackc/pgx/v4 v4.5.0/go.mod h1:EpAKPLdnTorwmPUUsqrPxy5fphV18j9q3wrfRXgo+kA=
+github.com/jackc/pgx/v4 v4.6.1-0.20200510190926-94ba730bb1e9/go.mod h1:t3/cdRQl6fOLDxqtlyhe9UWgfIi9R8+8v8GKV5TRA/o=
+github.com/jackc/pgx/v4 v4.6.1-0.20200606145419-4e5062306904/go.mod h1:ZDaNWkt9sW1JMiNn0kdYBaLelIhw7Pg4qd+Vk6tw7Hg=
+github.com/jackc/pgx/v4 v4.9.0/go.mod h1:MNGWmViCgqbZck9ujOOBN63gK9XVGILXWCvKLGKmnms=
+github.com/jackc/pgx/v4 v4.10.1/go.mod h1:QlrWebbs3kqEZPHCTGyxecvzG6tvIsYu+A5b1raylkA=
 github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs=
 github.com/jackc/pgx/v4 v4.16.1 h1:JzTglcal01DrghUqt+PmzWsZx/Yh7SC/CTQmSBMTd0Y=
 github.com/jackc/pgx/v4 v4.16.1/go.mod h1:SIhx0D5hoADaiXZVyv+3gSm3LCIIINTVO0PficsvWGQ=
 github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
+github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
+github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
+github.com/jackc/puddle v1.1.2/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.2.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jinzhu/gorm v1.9.16 h1:+IyIjPEABKRpsu/F8OvDPy9fyQlgsg2luMV2ZIH5i5o=
@@ -308,11 +403,14 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
+github.com/jinzhu/now v1.1.2/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/jinzhu/now v1.1.4 h1:tHnRBy1i5F2Dh8BAFxqFzxKqqvezXrL2OW1TnX+Mlas=
 github.com/jinzhu/now v1.1.4/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
+github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
+github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
@@ -324,9 +422,16 @@ github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
+github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=
+github.com/k3a/html2text v1.0.8/go.mod h1:ieEXykM67iT8lTvEWBh6fhpH4B23kB9OMKPdIBmgUqA=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
+github.com/klauspost/compress v1.10.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
+github.com/klauspost/compress v1.15.0/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
+github.com/klauspost/compress v1.15.6/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU=
+github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -335,27 +440,40 @@ github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFB
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
 github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.10.2 h1:AqzbZs4ZoCBp+GtejcpCpcxM3zlSMx29dXbUSeVtJb8=
 github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM=
 github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4=
 github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ=
+github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls=
 github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
+github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
+github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
+github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus=
@@ -364,9 +482,12 @@ github.com/mattn/go-sqlite3 v1.14.6 h1:dNPt6NO46WmLVt2DLNpwczCmdV5boIZ6g/tlDrlRU
 github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/meilisearch/meilisearch-go v0.12.0/go.mod h1:aqiJBd7zGUPzN2mnd0ZjVm//CfzeHCKSaYpqVNgujlE=
+github.com/meilisearch/meilisearch-go v0.20.0/go.mod h1:jUGQlQNFYcni/mSG/d71utwqPuKG0bRT+63Xenw2B+0=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
 github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg=
 github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
@@ -378,21 +499,33 @@ github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJ
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/nats-io/gnatsd v1.4.1/go.mod h1:nqco77VO78hLCJpIcVfygDP2rPGfsEHkGTUk94uh5DQ=
+github.com/nats-io/go-nats v1.7.2/go.mod h1:+t7RHT5ApZebkrQdnn6AhQJmhJJiKAvJUio1PiiCtj0=
 github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg=
 github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU=
+github.com/nats-io/jwt v1.1.0/go.mod h1:n3cvmLfBfnpV4JJRN7lRYCyZnw48ksGsbThGXEk4w9M=
 github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k=
+github.com/nats-io/nats-server/v2 v2.1.9/go.mod h1:9qVyoewoYXzG1ME9ox0HwkkzyYvnlBDugfR4Gg/8uHU=
 github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w=
+github.com/nats-io/nats.go v1.10.0/go.mod h1:AjGArbfyR50+afOUotNX2Xs5SYHf+CoOa5HH1eEl2HE=
 github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
 github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
+github.com/nats-io/nkeys v0.1.4/go.mod h1:XdZpAbhgyyODYqjTawOnIOI7VlbKSarI9Gfy1tqEu/s=
 github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
+github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs=
 github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
+github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
 github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
 github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis=
 github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74=
@@ -407,6 +540,7 @@ github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnh
 github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
+github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pelletier/go-toml v1.9.3 h1:zeC5b1GviRUyKYd6OJPvBU/mcVDVoL1OhT17FCt5dSQ=
 github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac=
@@ -423,6 +557,7 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
+github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og=
 github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
@@ -435,7 +570,9 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:
 github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M=
 github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
 github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
@@ -443,11 +580,13 @@ github.com/prometheus/common v0.15.0 h1:4fgOnadei3EZvgRwxJ7RMpG1k1pOZth5Pc13tysp
 github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
 github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/prometheus/procfs v0.2.0 h1:wH4vA7pcjKuZzjF7lM8awk4fnuJO6idemZXoKnULUx4=
 github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
+github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
@@ -459,8 +598,12 @@ github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
+github.com/savsgio/gotils v0.0.0-20200117113501-90175b0fbe3f/go.mod h1:lHhJedqxCoHN+zMtwGNTXWmF0u9Jt363FYRhV6g0CdY=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
+github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
+github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
+github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
 github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=
 github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
@@ -476,16 +619,24 @@ github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIK
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
 github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY=
+github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
+github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
 github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY=
 github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
+github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng=
 github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
+github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo=
+github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
 github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
 github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
 github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
+github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
 github.com/spf13/viper v1.8.1 h1:Kq1fyeebqsBfbjZj4EL7gj2IO0mMaiyjYUWcUsl2O44=
 github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns=
 github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
@@ -494,6 +645,7 @@ github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5J
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
@@ -501,18 +653,50 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
+github.com/swaggo/files v0.0.0-20190704085106-630677cd5c14/go.mod h1:gxQT6pBGRuIGunNf/+tSOB5OHvguWi8Tbt82WOkf35E=
+github.com/swaggo/gin-swagger v1.2.0/go.mod h1:qlH2+W7zXGZkczuL+r2nEBR2JTT+/lX05Nn6vPhc7OI=
+github.com/swaggo/http-swagger v0.0.0-20200308142732-58ac5e232fba/go.mod h1:O1lAbCgAAX/KZ80LM/OXwtWFI/5TvZlwxSg8Cq08PV0=
+github.com/swaggo/http-swagger v1.0.0/go.mod h1:cKIcshBU9yEAnfWv6ZzVKSsEf8h5ozxB8/zHQWyOQ/8=
+github.com/swaggo/swag v1.5.1/go.mod h1:1Bl9F/ZBpVWh22nY0zmYyASPO1lI/zIwRDrpZU+tv8Y=
+github.com/swaggo/swag v1.6.3/go.mod h1:wcc83tB4Mb2aNiL/HP4MFeQdpHUrca+Rp/DRNgWAUio=
+github.com/swaggo/swag v1.6.7/go.mod h1:xDhTyuFIujYiN3DKWC/H/83xcfHp+UE/IzWWampG7Zc=
+github.com/swaggo/swag v1.7.0/go.mod h1:BdPIL73gvS9NBsdi7M1JOxLvlbfvNRaBP8m6WT6Aajo=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
+github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
+github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
+github.com/ugorji/go v1.1.5-pre/go.mod h1:FwP/aQVg39TXzItUBMwnWp9T9gPQnXw4Poh4/oBQZ/0=
+github.com/ugorji/go/codec v0.0.0-20181022190402-e5e69e061d4f/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
+github.com/ugorji/go/codec v1.1.5-pre/go.mod h1:tULtS6Gy1AE1yCENaw4Vb//HLH5njI2tfCQDUqRd8fI=
 github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
 github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
+github.com/urfave/cli/v2 v2.1.1/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ=
+github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
+github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
+github.com/valyala/fasthttp v1.9.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBnvPM1Su9w=
+github.com/valyala/fasthttp v1.21.0/go.mod h1:jjraHZVbKOXftJfsOYoAjaeygpj5hr8ermTRJNroD7A=
+github.com/valyala/fasthttp v1.37.1-0.20220607072126-8a320890c08d/go.mod h1:t/G+3rLek+CyY9bnIE+YlMRddxVAAGjhxndDB4i4C0I=
+github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio=
+github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc=
+github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
+github.com/xeipuuv/gojsonschema v1.1.0/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs=
+github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
+github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod h1:/LWChgwKmvncFJFHJ7Gvn9wZArjbV5/FppcK2fKk/tI=
+github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg=
+github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM=
+github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
+go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg=
 go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
@@ -548,10 +732,13 @@ golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
@@ -598,6 +785,7 @@ golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -610,11 +798,13 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/net v0.0.0-20190611141213-3f473d35a33a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -629,15 +819,19 @@ golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/
 golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20201016165138-7b1cca2348c0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201207224615-747e23833adb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 h1:CIJ76btIcR3eFI5EgSo6k1qKw9KJexJuRLI9G7Hp5wE=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -669,6 +863,7 @@ golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -678,6 +873,8 @@ golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190610200419-93c9922d18ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -718,12 +915,15 @@ golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9 h1:nhht2DYV/Sn3qOayu8lM+cU1ii9sTLUeBQwQQfUHtrs=
 golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -751,7 +951,10 @@ golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBn
 golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190606050223-4d9ae51c2468/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190611222205-d73e1c7e250b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@@ -779,6 +982,7 @@ golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapK
 golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
 golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
+golang.org/x/tools v0.0.0-20200318054722-11a475a590ac/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
 golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
 golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@@ -788,9 +992,12 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY
 golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200903005429-2364a5e8fdcf/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
 golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
 golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20201120155355-20be4ac4bd6e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20201208062317-e652b2f42cc7/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
@@ -919,11 +1126,16 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o=
+gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
+gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y=
+gopkg.in/h2non/gock.v1 v1.0.15/go.mod h1:sX4zAkdYX1TRGJ2JY156cFspQn4yRWn6p9EMdODlynE=
 gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s=
+gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ini.v1 v1.62.0 h1:duBzk771uxoUuOlyRLkHsygud9+5lrlGjdFBb4mSKDU=
 gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
@@ -940,13 +1152,21 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gorm.io/driver/postgres v1.0.5/go.mod h1:qrD92UurYzNctBMVCJ8C3VQEjffEuphycXtxOudXNCA=
+gorm.io/driver/postgres v1.0.8/go.mod h1:4eOzrI1MUfm6ObJU/UcmbXyiHSs8jSwH95G5P5dxcAg=
 gorm.io/driver/postgres v1.3.8 h1:8bEphSAB69t3odsCR4NDzt581iZEWQuRM27Cg6KgfPY=
 gorm.io/driver/postgres v1.3.8/go.mod h1:qB98Aj6AhRO/oyu/jmZsi/YM9g6UzVCjMxO/6frFvcA=
 gorm.io/driver/sqlite v1.1.4 h1:PDzwYE+sI6De2+mxAneV9Xs11+ZyKV6oxD3wDGkaNvM=
 gorm.io/driver/sqlite v1.1.4/go.mod h1:mJCeTFr7+crvS+TRnWc5Z3UvwxUN1BGBLMrf5LA9DYw=
+gorm.io/gorm v1.20.4/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
+gorm.io/gorm v1.20.5/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
 gorm.io/gorm v1.20.7/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
+gorm.io/gorm v1.20.12/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
+gorm.io/gorm v1.21.11/go.mod h1:F+OptMscr0P2F2qU97WT1WimdH9GaQPoDW7AYd5i2Y0=
 gorm.io/gorm v1.23.6/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=
 gorm.io/gorm v1.23.8 h1:h8sGJ+biDgBA1AD1Ha9gFCx7h8npU7AsLdlkX0n2TpE=
 gorm.io/gorm v1.23.8/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=
@@ -958,6 +1178,7 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+moul.io/http2curl v1.0.1-0.20190925090545-5cd742060b0e/go.mod h1:nejbQVfXh96n9dSF6cH3Jsk/QI1Z2oEL7sSI2ifXFNA=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=

From 0fd2314f870d1978901b918563f858b967dc689f Mon Sep 17 00:00:00 2001
From: vsumit89 <sumit.vishwakarma@factly.in>
Date: Wed, 17 Aug 2022 19:10:54 +0530
Subject: [PATCH 06/38] added initial value for description

---
 studio/src/pages/posts/components/PostForm.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/studio/src/pages/posts/components/PostForm.js b/studio/src/pages/posts/components/PostForm.js
index 3b55948d2..668841f81 100644
--- a/studio/src/pages/posts/components/PostForm.js
+++ b/studio/src/pages/posts/components/PostForm.js
@@ -244,6 +244,7 @@ function PostForm({ onCreate, data = {}, actions = {}, format, page = false }) {
               <DescriptionInput
                 type="editor"
                 formItemProps={{ className: 'post-description' }}
+                initialValue={data.description}
                 noLabel
               />
               <Drawer

From 965c3392462fd78f1f7572236959f638d0ff3883 Mon Sep 17 00:00:00 2001
From: Mourya Prasanth <mouryaprasanthp@gmail.com>
Date: Thu, 18 Aug 2022 00:03:14 +0530
Subject: [PATCH 07/38] fix: add initial value to DescriptionInput component

---
 studio/package-lock.json                           | 14 +++++++-------
 studio/package.json                                |  2 +-
 .../src/pages/claimants/components/ClaimantForm.js |  1 +
 studio/src/pages/claims/components/ClaimForm.js    |  5 ++++-
 .../src/pages/episodes/components/EpisodeForm.js   |  1 +
 .../pages/fact-checks/components/FactCheckForm.js  |  6 +++++-
 .../src/pages/podcasts/components/PodcastForm.js   |  1 +
 studio/src/pages/ratings/components/RatingForm.js  |  1 +
 studio/src/pages/tags/components/TagForm.js        |  1 +
 9 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/studio/package-lock.json b/studio/package-lock.json
index c9674e44e..161c75841 100644
--- a/studio/package-lock.json
+++ b/studio/package-lock.json
@@ -17,7 +17,7 @@
         "@editorjs/quote": "^2.3.0",
         "@editorjs/raw": "^2.1.2",
         "@editorjs/table": "^1.2.2",
-        "@factly/scooter": "^0.0.2",
+        "@factly/scooter": "^0.0.3",
         "@testing-library/jest-dom": "^4.2.4",
         "@testing-library/react": "^9.5.0",
         "@testing-library/user-event": "^7.2.1",
@@ -2374,9 +2374,9 @@
       "integrity": "sha512-3/gr7IkjsYuECndCpcBSKzZQHos7C9QU1ach8avyVbXB3VLAa1RyGjgocu0Ct4d02HdxirrYZ7+vP1Na+s04GQ=="
     },
     "node_modules/@factly/scooter": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/@factly/scooter/-/scooter-0.0.2.tgz",
-      "integrity": "sha512-hXMndNTZEnhAnx73OyTjrXLak+b6D7tj3fzej2qLPExRvAyMKp9OQ38BDpmIVfBKE4muKjHVU9lKjT8X0zgtKg==",
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/@factly/scooter/-/scooter-0.0.3.tgz",
+      "integrity": "sha512-qE21CrZCSin2MZA7rLtILitKkZbqX/PcZWjzdgbcSDysUpSxNiGx3l1fhZVH86B3I6ehlm0thCcTeCqWPGJ9ig==",
       "peerDependencies": {
         "react": "^18.2.0",
         "react-dom": "^18.2.0"
@@ -29573,9 +29573,9 @@
       "integrity": "sha512-3/gr7IkjsYuECndCpcBSKzZQHos7C9QU1ach8avyVbXB3VLAa1RyGjgocu0Ct4d02HdxirrYZ7+vP1Na+s04GQ=="
     },
     "@factly/scooter": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/@factly/scooter/-/scooter-0.0.2.tgz",
-      "integrity": "sha512-hXMndNTZEnhAnx73OyTjrXLak+b6D7tj3fzej2qLPExRvAyMKp9OQ38BDpmIVfBKE4muKjHVU9lKjT8X0zgtKg=="
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/@factly/scooter/-/scooter-0.0.3.tgz",
+      "integrity": "sha512-qE21CrZCSin2MZA7rLtILitKkZbqX/PcZWjzdgbcSDysUpSxNiGx3l1fhZVH86B3I6ehlm0thCcTeCqWPGJ9ig=="
     },
     "@hapi/address": {
       "version": "2.1.4",
diff --git a/studio/package.json b/studio/package.json
index 01b256dca..8544cd3a6 100644
--- a/studio/package.json
+++ b/studio/package.json
@@ -16,7 +16,7 @@
     "@editorjs/quote": "^2.3.0",
     "@editorjs/raw": "^2.1.2",
     "@editorjs/table": "^1.2.2",
-    "@factly/scooter": "^0.0.2",
+    "@factly/scooter": "^0.0.3",
     "@testing-library/jest-dom": "^4.2.4",
     "@testing-library/react": "^9.5.0",
     "@testing-library/user-event": "^7.2.1",
diff --git a/studio/src/pages/claimants/components/ClaimantForm.js b/studio/src/pages/claimants/components/ClaimantForm.js
index 51e62a0b6..ce0b298ab 100644
--- a/studio/src/pages/claimants/components/ClaimantForm.js
+++ b/studio/src/pages/claimants/components/ClaimantForm.js
@@ -90,6 +90,7 @@ const ClaimantForm = ({ onCreate, data = {} }) => {
                   placeholder: 'Enter Description...',
                   basic: true,
                 }}
+                initialValue={data.description}
               />
             </Col>
           </Row>
diff --git a/studio/src/pages/claims/components/ClaimForm.js b/studio/src/pages/claims/components/ClaimForm.js
index e4f90395c..449225837 100644
--- a/studio/src/pages/claims/components/ClaimForm.js
+++ b/studio/src/pages/claims/components/ClaimForm.js
@@ -187,7 +187,10 @@ const ClaimForm = ({ onCreate, data = {} }) => {
                 <DatePicker disabledDate={disabledDate} />
               </Form.Item>
             </Form.Item>
-            <DescriptionInput inputProps={{ placeholder: 'Enter Description...' }} />
+            <DescriptionInput
+              inputProps={{ placeholder: 'Enter Description...' }}
+              initialValue={data.description}
+            />
           </Panel>
           <Panel header="Sources" key="2">
             <Form.Item label="Claim Sources">
diff --git a/studio/src/pages/episodes/components/EpisodeForm.js b/studio/src/pages/episodes/components/EpisodeForm.js
index ea3a5bc98..62b8b8c10 100644
--- a/studio/src/pages/episodes/components/EpisodeForm.js
+++ b/studio/src/pages/episodes/components/EpisodeForm.js
@@ -94,6 +94,7 @@ const EpisodeForm = ({ onCreate, data = {} }) => {
           </Form.Item>
           <DescriptionInput
             inputProps={{ style: { width: '600px' }, placeholder: 'Enter Description...' }}
+            initialValue={data.description}
           />
           <MetaForm />
           <Form.Item {...tailLayout}>
diff --git a/studio/src/pages/fact-checks/components/FactCheckForm.js b/studio/src/pages/fact-checks/components/FactCheckForm.js
index 5538e70b0..22410e47a 100644
--- a/studio/src/pages/fact-checks/components/FactCheckForm.js
+++ b/studio/src/pages/fact-checks/components/FactCheckForm.js
@@ -315,7 +315,11 @@ function FactCheckForm({ onCreate, data = {}, actions = {}, format }) {
                   />
                 </Form.Item>
               ) : null}
-              <DescriptionInput formItemProps={{ className: 'post-description' }} noLabel />
+              <DescriptionInput
+                formItemProps={{ className: 'post-description' }}
+                noLabel
+                initialValue={data.description}
+              />
               <Drawer
                 title={<h4 style={{ fontWeight: 'bold' }}>Post Settings</h4>}
                 placement="right"
diff --git a/studio/src/pages/podcasts/components/PodcastForm.js b/studio/src/pages/podcasts/components/PodcastForm.js
index b63179ad8..01a72bf2b 100644
--- a/studio/src/pages/podcasts/components/PodcastForm.js
+++ b/studio/src/pages/podcasts/components/PodcastForm.js
@@ -80,6 +80,7 @@ const PodcastForm = ({ onCreate, data = {} }) => {
           <DescriptionInput
             type="editor"
             inputProps={{ style: { width: '600px' }, placeholder: 'Enter Description...' }}
+            initialValue={data.description}
           />
           <MetaForm />
           <Form.Item {...tailLayout}>
diff --git a/studio/src/pages/ratings/components/RatingForm.js b/studio/src/pages/ratings/components/RatingForm.js
index 5b5a830f9..a8123f221 100644
--- a/studio/src/pages/ratings/components/RatingForm.js
+++ b/studio/src/pages/ratings/components/RatingForm.js
@@ -233,6 +233,7 @@ const RatingForm = ({ onCreate, data = {} }) => {
                   placeholder: 'Enter Description...',
                   basic: true,
                 }}
+                initialValue={data.description}
               />
             </Col>
           </Row>
diff --git a/studio/src/pages/tags/components/TagForm.js b/studio/src/pages/tags/components/TagForm.js
index 8f61dc94b..ac1445f1e 100644
--- a/studio/src/pages/tags/components/TagForm.js
+++ b/studio/src/pages/tags/components/TagForm.js
@@ -143,6 +143,7 @@ const TagForm = ({ onCreate, data = {} }) => {
                     placeholder: 'Enter Description...',
                     basic: true,
                   }}
+                  initialValue={data.description}
                 />
               </Col>
             </Row>

From 2b56560563e3dda5cb292fc22bb710df561dff1a Mon Sep 17 00:00:00 2001
From: vsumit89 <sumit.vishwakarma@factly.in>
Date: Fri, 26 Aug 2022 18:41:30 +0530
Subject: [PATCH 08/38] added latest kavach changes

---
 server/config/organisation.go                 |   1 -
 server/data/policies.json                     |   6 +-
 server/data/roles.json                        |  17 ++
 server/go.mod                                 |   2 +-
 server/go.sum                                 |   8 +-
 server/service/core/action/author/list.go     |   4 +-
 server/service/core/action/format/default.go  |   7 +-
 .../core/action/permissions/space/details.go  |   2 +-
 .../core/action/permissions/space/my.go       |   2 +-
 server/service/core/action/policy/create.go   |  55 ++++-
 server/service/core/action/policy/default.go  | 128 +++++++++--
 server/service/core/action/policy/delete.go   |  19 +-
 server/service/core/action/policy/list.go     |  42 +---
 server/service/core/action/policy/route.go    |  13 ++
 server/service/core/action/post/create.go     |  15 +-
 server/service/core/action/post/details.go    |   2 +-
 server/service/core/action/post/list.go       |   2 +-
 server/service/core/action/post/template.go   |   2 +-
 server/service/core/action/post/update.go     |  13 +-
 server/service/core/action/role/create.go     |  55 +++--
 server/service/core/action/role/delete.go     |  67 ++++++
 server/service/core/action/role/details.go    |  55 +++--
 server/service/core/action/role/list.go       |  69 ++++++
 server/service/core/action/role/route.go      |  22 +-
 server/service/core/action/role/update.go     |  98 +++++++++
 server/service/core/action/space/create.go    | 195 +++++++++--------
 server/service/core/action/space/delete.go    |  80 +++----
 server/service/core/action/space/details.go   |  45 +---
 server/service/core/action/space/my.go        | 168 +++++---------
 server/service/core/action/space/update.go    | 205 +++++++-----------
 server/service/core/action/user/permission.go |  26 +--
 server/service/core/model/category.go         |   1 -
 server/service/core/model/format.go           |   1 -
 server/service/core/model/menu.go             |   1 -
 server/service/core/model/migration.go        |   1 -
 server/service/core/model/policy.go           |  11 +
 server/service/core/model/post.go             |   1 -
 server/service/core/model/request.go          |   1 -
 server/service/core/model/role.go             |  37 ++--
 server/service/core/model/space.go            |  11 +-
 server/service/core/model/tag.go              |   1 -
 .../service/fact-check/action/google/list.go  |   4 +-
 server/service/fact-check/model/claim.go      |   1 -
 server/service/fact-check/model/claimant.go   |   1 -
 server/service/fact-check/model/rating.go     |   1 -
 server/service/podcast/model/episode.go       |   1 -
 server/service/podcast/model/podcast.go       |   1 -
 server/service/reindex/all.go                 |   9 +-
 server/service/reindex/space.go               |  42 +++-
 server/service/route.go                       |  11 +-
 server/service/user/route.go                  |   4 +-
 server/util/getservices.go                    |   6 +-
 server/util/healthCheckers.go                 |   4 +-
 server/util/keto.go                           |   4 +-
 server/util/organisation.go                   |   6 +-
 server/util/organisationID.go                 |  53 ++++-
 server/util/policy.go                         |  85 +++++---
 server/util/space.go                          |  52 +++++
 server/util/timex/time.go                     |   3 +
 studio/src/actions/roles.js                   |  47 +---
 studio/src/components/GlobalNav/Sidebar.js    |   2 +-
 studio/src/config/routesConfig.js             |   7 +
 studio/src/pages/policies/CreatePolicy.js     |   4 +-
 .../pages/policies/components/PolicyForm.js   |   5 +-
 .../pages/policies/components/PolicyList.js   |  68 +++---
 .../pages/policies/components/ViewPolicy.js   |  75 +++++++
 studio/src/pages/policies/index.js            |   1 -
 studio/src/pages/roles/CreateRole.js          |   5 -
 studio/src/pages/roles/components/RoleForm.js |  13 --
 studio/src/pages/roles/components/RoleList.js |  90 +-------
 studio/src/pages/roles/index.js               |  41 +---
 studio/src/reducers/spacesReducer.js          |   9 +-
 72 files changed, 1289 insertions(+), 857 deletions(-)
 create mode 100644 server/data/roles.json
 create mode 100644 server/service/core/action/role/delete.go
 create mode 100644 server/service/core/action/role/list.go
 create mode 100644 server/service/core/action/role/update.go
 create mode 100644 server/util/space.go
 create mode 100644 server/util/timex/time.go
 create mode 100644 studio/src/pages/policies/components/ViewPolicy.js

diff --git a/server/config/organisation.go b/server/config/organisation.go
index 6f04a4e10..24584d866 100644
--- a/server/config/organisation.go
+++ b/server/config/organisation.go
@@ -77,7 +77,6 @@ func CheckSuperOrganisation() bool {
 	req, _ = http.NewRequest("GET", viper.GetString("kavach_url")+"/organisations/"+orgID, nil)
 	req.Header.Set("Content-Type", "application/json")
 
-	client = &http.Client{}
 	resp, err = client.Do(req)
 	if err != nil {
 		return false
diff --git a/server/data/policies.json b/server/data/policies.json
index 9a6bb1605..c6b890ffa 100644
--- a/server/data/policies.json
+++ b/server/data/policies.json
@@ -1,7 +1,7 @@
 [
     {
         "name": "Editor",
-        "Description": "Editor",
+        "description": "Editor",
         "permissions": [
             {
                 "resource": "categories",
@@ -47,7 +47,7 @@
     },
     {
         "name": "Author",
-        "Description": "Author",
+        "description": "Author",
         "permissions": [
             {
                 "resource": "categories",
@@ -93,7 +93,7 @@
     },
     {
         "name": "Contributor",
-        "Description": "Contributor",
+        "description": "Contributor",
         "permissions": [
             {
                 "resource": "formats",
diff --git a/server/data/roles.json b/server/data/roles.json
new file mode 100644
index 000000000..24d0a24ea
--- /dev/null
+++ b/server/data/roles.json
@@ -0,0 +1,17 @@
+[
+  {
+    "name":"Editor",
+    "slug":"editor",
+    "description":"Someone who edits the posts, pages, factchecks, etc."
+  },
+  {
+    "name":"Author",
+    "slug":"author",
+    "description":"Someone who writes the posts, pages, factchecks, etc."
+  },
+  {
+    "name":"Contributor",
+    "slug":"contributor",
+    "description":"Someone who contributes in some way to the posts, pages, factchecks, etc."
+  }
+]
\ No newline at end of file
diff --git a/server/go.mod b/server/go.mod
index a6d16f7d9..30debdf0c 100644
--- a/server/go.mod
+++ b/server/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
 	github.com/dlmiddlecote/sqlstats v1.0.2
 	github.com/eduncan911/podcast v1.4.2
-	github.com/factly/x v0.0.77
+	github.com/factly/x v0.0.82
 	github.com/gavv/httpexpect v2.0.0+incompatible
 	github.com/gavv/httpexpect/v2 v2.1.0
 	github.com/go-chi/chi v4.1.2+incompatible
diff --git a/server/go.sum b/server/go.sum
index b41080dd1..a6fe35987 100644
--- a/server/go.sum
+++ b/server/go.sum
@@ -140,8 +140,12 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m
 github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0=
-github.com/factly/x v0.0.77 h1:HQXTOLTpPWZhNhCC3TwLQk9nfKlJqzSYjjrCQ20p57o=
-github.com/factly/x v0.0.77/go.mod h1:ZB3evopCd4ev4uZNCxldkh0AgYsxvEabiefrM8RJHBc=
+github.com/factly/x v0.0.80 h1:K23FGEPdPNPsGvReVnnfZFhjiYRdu4phzRm0Soh8XVw=
+github.com/factly/x v0.0.80/go.mod h1:ZB3evopCd4ev4uZNCxldkh0AgYsxvEabiefrM8RJHBc=
+github.com/factly/x v0.0.81 h1:jkJd6icepUhSko3qffN9nlXio27r8c8zK1oT7d+LMgA=
+github.com/factly/x v0.0.81/go.mod h1:ZB3evopCd4ev4uZNCxldkh0AgYsxvEabiefrM8RJHBc=
+github.com/factly/x v0.0.82 h1:qKrmP6yDEeyS20nKYWxG0gDUZqkMogW8xSkIhqXSEbc=
+github.com/factly/x v0.0.82/go.mod h1:ZB3evopCd4ev4uZNCxldkh0AgYsxvEabiefrM8RJHBc=
 github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072 h1:DddqAaWDpywytcG8w/qoQ5sAN8X12d3Z3koB0C3Rxsc=
 github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8=
 github.com/fasthttp/websocket v1.4.2 h1:AU/zSiIIAuJjBMf5o+vO0syGOnEfvZRu40xIhW/3RuM=
diff --git a/server/service/core/action/author/list.go b/server/service/core/action/author/list.go
index 853ed9c7f..98c9c941b 100644
--- a/server/service/core/action/author/list.go
+++ b/server/service/core/action/author/list.go
@@ -5,12 +5,14 @@ import (
 	"fmt"
 	"net/http"
 	"strconv"
+	"time"
 
 	"github.com/factly/x/loggerx"
 	"github.com/spf13/viper"
 
 	"github.com/factly/dega-server/service/core/model"
 	"github.com/factly/dega-server/util"
+	"github.com/factly/dega-server/util/timex"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/middlewarex"
 	"github.com/factly/x/paginationx"
@@ -66,7 +68,7 @@ func list(w http.ResponseWriter, r *http.Request) {
 
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("X-User", strconv.Itoa(uID))
-	client := &http.Client{}
+	client := http.Client{Timeout: time.Second * time.Duration(timex.HTTP_TIMEOUT)}
 	resp, err := client.Do(req)
 
 	if err != nil {
diff --git a/server/service/core/action/format/default.go b/server/service/core/action/format/default.go
index 0c8475ebf..dbddca808 100644
--- a/server/service/core/action/format/default.go
+++ b/server/service/core/action/format/default.go
@@ -67,7 +67,12 @@ func createDefaults(w http.ResponseWriter, r *http.Request) {
 	tx := config.DB.WithContext(context.WithValue(r.Context(), userContext, uID)).Begin()
 	for i := range formats {
 		formats[i].SpaceID = uint(sID)
-		tx.Model(&model.Format{}).FirstOrCreate(&formats[i], &formats[i])
+		err := tx.Model(&model.Format{}).FirstOrCreate(&formats[i], &formats[i]).Error
+		if err != nil {
+			loggerx.Error(err)
+			errorx.Render(w, errorx.Parser(errorx.DBError()))
+			return
+		}
 		if config.SearchEnabled() {
 			_ = insertIntoMeili(formats[i])
 		}
diff --git a/server/service/core/action/permissions/space/details.go b/server/service/core/action/permissions/space/details.go
index a8c3e5e40..716bedf25 100644
--- a/server/service/core/action/permissions/space/details.go
+++ b/server/service/core/action/permissions/space/details.go
@@ -35,7 +35,7 @@ func details(w http.ResponseWriter, r *http.Request) {
 	result := model.SpacePermission{}
 	result.ID = uint(id)
 
-	err = config.DB.Preload("Space").First(&result).Error
+	err = config.DB.First(&result).Error
 	if err != nil {
 		loggerx.Error(err)
 		errorx.Render(w, errorx.Parser(errorx.RecordNotFound()))
diff --git a/server/service/core/action/permissions/space/my.go b/server/service/core/action/permissions/space/my.go
index 2b343a4d3..e3a9154cd 100644
--- a/server/service/core/action/permissions/space/my.go
+++ b/server/service/core/action/permissions/space/my.go
@@ -33,7 +33,7 @@ func my(w http.ResponseWriter, r *http.Request) {
 
 	err = config.DB.Model(&model.SpacePermission{}).Where(&model.SpacePermission{
 		SpaceID: uint(sID),
-	}).Preload("Space").First(&result).Error
+	}).First(&result).Error
 
 	if err != nil {
 		loggerx.Error(err)
diff --git a/server/service/core/action/policy/create.go b/server/service/core/action/policy/create.go
index 33e196d0c..0e8a12f98 100644
--- a/server/service/core/action/policy/create.go
+++ b/server/service/core/action/policy/create.go
@@ -1,17 +1,23 @@
 package policy
 
 import (
+	"bytes"
 	"encoding/json"
+	"errors"
+	"fmt"
 	"net/http"
+	"strconv"
+	"time"
 
-	"github.com/factly/dega-server/service/core/action/author"
 	"github.com/factly/dega-server/service/core/model"
 	"github.com/factly/dega-server/util"
+	"github.com/factly/dega-server/util/timex"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
 	"github.com/factly/x/meilisearchx"
 	"github.com/factly/x/middlewarex"
 	"github.com/factly/x/renderx"
+	"github.com/spf13/viper"
 )
 
 // create - Create policy
@@ -51,7 +57,7 @@ func create(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	policyReq := policyReq{}
+	policyReq := kavachPolicy{}
 
 	err = json.NewDecoder(r.Body).Decode(&policyReq)
 	if err != nil {
@@ -60,9 +66,48 @@ func create(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	result := Mapper(Composer(organisationID, spaceID, policyReq), author.Mapper(organisationID, userID))
+	buf := new(bytes.Buffer)
+	err = json.NewEncoder(buf).Encode(policyReq)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+		return
+	}
+
+	requrl := viper.GetString("kavach_url") + "/organisations/" + fmt.Sprintf("%d", organisationID) + "/applications/" + viper.GetString("dega_application_id") + "/spaces/" + fmt.Sprintf("%d", spaceID) + "/policy"
+	req, err := http.NewRequest(http.MethodPost, requrl, buf)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
 
-	err = insertIntoMeili(result)
+	req.Header.Set("X-User", strconv.Itoa(userID))
+	req.Header.Set("Content-Type", "application/json")
+
+	client := &http.Client{Timeout: time.Duration(timex.HTTP_TIMEOUT) * time.Second}
+	resp, err := client.Do(req)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+
+	defer resp.Body.Close()
+	if resp.StatusCode != http.StatusOK {
+		loggerx.Error(errors.New("internal server error on kavach server"))
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+
+	result := &model.KavachPolicy{}
+	err = json.NewDecoder(resp.Body).Decode(result)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+	err = insertIntoMeili(*result)
 	if err != nil {
 		loggerx.Error(err)
 		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
@@ -80,7 +125,7 @@ func create(w http.ResponseWriter, r *http.Request) {
 	renderx.JSON(w, http.StatusOK, result)
 }
 
-func insertIntoMeili(result model.Policy) error {
+func insertIntoMeili(result model.KavachPolicy) error {
 	// Insert into meili index
 	meiliObj := map[string]interface{}{
 		"id":          result.ID,
diff --git a/server/service/core/action/policy/default.go b/server/service/core/action/policy/default.go
index e42280866..a05a649d4 100644
--- a/server/service/core/action/policy/default.go
+++ b/server/service/core/action/policy/default.go
@@ -1,22 +1,29 @@
 package policy
 
 import (
+	"bytes"
 	"encoding/json"
+	"errors"
+	"fmt"
 	"io/ioutil"
 	"net/http"
 	"os"
+	"time"
 
-	"github.com/factly/dega-server/service/core/action/author"
 	"github.com/factly/dega-server/service/core/model"
 	"github.com/factly/dega-server/util"
+	"github.com/factly/dega-server/util/timex"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
 	"github.com/factly/x/middlewarex"
 	"github.com/factly/x/renderx"
+	"github.com/factly/x/slugx"
+	"github.com/spf13/viper"
 )
 
-// DataFile default json data file
-var DataFile = "./data/policies.json"
+// policyDataFile default json data file
+var policyDataFile = "./data/policies.json"
+var rolesDataFile = "./data/roles.json"
 
 // createDefaults - Create Default Policies
 // @Summary Create Default Policies
@@ -52,18 +59,20 @@ func createDefaults(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	jsonFile, err := os.Open(DataFile)
+	policyJsonFile, err := os.Open(policyDataFile)
 	if err != nil {
 		loggerx.Error(err)
 		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
 		return
 	}
-
-	defer jsonFile.Close()
-
+	defer policyJsonFile.Close()
 	policies := make([]policyReq, 0)
-
-	byteValue, _ := ioutil.ReadAll(jsonFile)
+	byteValue, err := ioutil.ReadAll(policyJsonFile)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
 	err = json.Unmarshal(byteValue, &policies)
 	if err != nil {
 		loggerx.Error(err)
@@ -71,23 +80,102 @@ func createDefaults(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	authors := author.Mapper(oID, uID)
-
-	result := paging{}
-	result.Nodes = make([]model.Policy, 0)
-
-	for _, policy := range policies {
-		res := Mapper(Composer(oID, sID, policy), authors)
-		result.Nodes = append(result.Nodes, res)
+	rolesJsonFile, err := os.Open(rolesDataFile)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+	defer rolesJsonFile.Close()
+	roles := make([]roleReq, 0)
+	byteValue, err = ioutil.ReadAll(rolesJsonFile)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+	err = json.Unmarshal(byteValue, &roles)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
 
-		if err = insertIntoMeili(res); err != nil {
+	defaultPolicies := make([]model.KavachPolicy, 0)
+	for index, role := range roles {
+		policy, err := createRoleandPolicyonKavach(role, policies[index], uint(oID), uint(sID), uint(uID))
+		if err != nil {
 			loggerx.Error(err)
 			errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
 			return
 		}
+
+		defaultPolicies = append(defaultPolicies, *policy)
+	}
+	renderx.JSON(w, http.StatusCreated, defaultPolicies)
+}
+
+func createRoleandPolicyonKavach(role roleReq, policy policyReq, orgID, spaceID, userID uint) (*model.KavachPolicy, error) {
+	buf := new(bytes.Buffer)
+	err := json.NewEncoder(buf).Encode(&role)
+	if err != nil {
+		return nil, err
+	}
+	client := http.Client{Timeout: time.Second * time.Duration(timex.HTTP_TIMEOUT)}
+	req, err := http.NewRequest(http.MethodPost, viper.GetString("kavach_url")+"/organisations/"+fmt.Sprintf("%d", orgID)+"/applications/"+viper.GetString("dega_application_id")+"/spaces/"+fmt.Sprintf("%d", spaceID)+"/roles", buf)
+	if err != nil {
+		return nil, err
+	}
+	req.Header.Set("X-User", fmt.Sprintf("%d", userID))
+	resp, err := client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+
+	defer resp.Body.Close()
+	if resp.StatusCode != 200 {
+		return nil, errors.New("could not create role in the space")
+	}
+
+	spaceRole := model.SpaceRole{}
+	err = json.NewDecoder(resp.Body).Decode(&spaceRole)
+	if err != nil {
+		return nil, errors.New("unable to decode default space role response body")
+	}
+	fmt.Println("spacerole", spaceRole.ID, spaceRole.Name)
+	policyReqBody := map[string]interface{}{
+		"name":        policy.Name,
+		"description": policy.Description,
+		"slug":        slugx.Make(policy.Name),
+		"permissions": policy.Permissions,
+		"roles":       append([]int{}, int(spaceRole.ID)),
+	}
+
+	fmt.Println("this is policy roles", policyReqBody["roles"])
+	err = json.NewEncoder(buf).Encode(&policyReqBody)
+	if err != nil {
+		return nil, err
 	}
 
-	result.Total = len(result.Nodes)
+	req, err = http.NewRequest(http.MethodPost, viper.GetString("kavach_url")+"/organisations/"+fmt.Sprintf("%d", orgID)+"/applications/"+viper.GetString("dega_application_id")+"/spaces/"+fmt.Sprintf("%d", spaceID)+"/policy", buf)
+	if err != nil {
+		return nil, err
+	}
+	req.Header.Set("X-User", fmt.Sprintf("%d", userID))
+	resp, err = client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+
+	if resp.StatusCode != 200 {
+		return nil, errors.New("error in creating policy on kavach")
+	}
+
+	spacePolicy := &model.KavachPolicy{}
+	err = json.NewDecoder(resp.Body).Decode(spacePolicy)
+	if err != nil {
+		return nil, errors.New("unable to decode default space policy response body")
+	}
 
-	renderx.JSON(w, http.StatusCreated, result)
+	return spacePolicy, nil
 }
diff --git a/server/service/core/action/policy/delete.go b/server/service/core/action/policy/delete.go
index b3405848c..df42ca4fa 100644
--- a/server/service/core/action/policy/delete.go
+++ b/server/service/core/action/policy/delete.go
@@ -1,6 +1,7 @@
 package policy
 
 import (
+	"errors"
 	"fmt"
 	"net/http"
 
@@ -35,6 +36,13 @@ func delete(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	userID, err := middlewarex.GetUser(r.Context())
+
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
+		return
+	}
 	organisationID, err := util.GetOrganisation(r.Context())
 
 	if err != nil {
@@ -46,14 +54,14 @@ func delete(w http.ResponseWriter, r *http.Request) {
 	/* delete old policy */
 	policyId := chi.URLParam(r, "policy_id")
 
-	policyID := fmt.Sprint("id:org:", organisationID, ":app:dega:space:", spaceID, ":"+policyId)
-
-	req, err := http.NewRequest("DELETE", viper.GetString("keto_url")+"/engines/acp/ory/regex/policies/"+policyID, nil)
+	reqURL := viper.GetString("kavach_url") + fmt.Sprintf("/organisations/%d/applications/%d/spaces/%d/policy/%s", organisationID, viper.GetInt("dega_application_id"), spaceID, policyId)
+	req, err := http.NewRequest(http.MethodDelete, reqURL, nil)
 	if err != nil {
 		loggerx.Error(err)
 		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
 		return
 	}
+	req.Header.Set("X-User", fmt.Sprintf("%d", userID))
 	req.Header.Set("Content-Type", "application/json")
 
 	client := &http.Client{}
@@ -66,6 +74,11 @@ func delete(w http.ResponseWriter, r *http.Request) {
 	}
 
 	defer resp.Body.Close()
+	if resp.StatusCode != 200 {
+		loggerx.Error(errors.New("unable to delete policy on kavach"))
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
 
 	objectID := fmt.Sprint("policy_", policyId)
 	_, err = meilisearchx.Client.Index("dega").Delete(objectID)
diff --git a/server/service/core/action/policy/list.go b/server/service/core/action/policy/list.go
index baadeb415..9c2b36a5b 100644
--- a/server/service/core/action/policy/list.go
+++ b/server/service/core/action/policy/list.go
@@ -4,9 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
-	"strings"
 
-	"github.com/factly/dega-server/service/core/action/author"
 	"github.com/factly/dega-server/service/core/model"
 	"github.com/factly/dega-server/util"
 	"github.com/factly/x/errorx"
@@ -18,8 +16,8 @@ import (
 )
 
 type paging struct {
-	Total int            `json:"total"`
-	Nodes []model.Policy `json:"nodes"`
+	Total int                  `json:"total"`
+	Nodes []model.KavachPolicy `json:"nodes"`
 }
 
 // list - Get all policies
@@ -55,12 +53,14 @@ func list(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	req, err := http.NewRequest("GET", viper.GetString("keto_url")+"/engines/acp/ory/regex/policies", nil)
+	reqURL := viper.GetString("kavach_url") + fmt.Sprintf("/organisations/%d/applications/%d/spaces/%d/policy", organisationID, viper.GetInt("dega_application_id"), spaceID)
+	req, err := http.NewRequest("GET", reqURL, nil)
 	if err != nil {
 		loggerx.Error(err)
 		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
 		return
 	}
+	req.Header.Set("X-User", fmt.Sprintf("%d", userID))
 	req.Header.Set("Content-Type", "application/json")
 
 	client := &http.Client{}
@@ -74,32 +74,18 @@ func list(w http.ResponseWriter, r *http.Request) {
 
 	defer resp.Body.Close()
 
-	var polices []model.KetoPolicy
+	var polices []model.KavachPolicy
 
 	err = json.NewDecoder(resp.Body).Decode(&polices)
-
 	if err != nil {
 		loggerx.Error(err)
 		errorx.Render(w, errorx.Parser(errorx.DecodeError()))
 		return
 	}
 
-	prefixName := fmt.Sprint("id:org:", organisationID, ":app:dega:space:", spaceID, ":")
-	var onlyOrgPolicy []model.KetoPolicy
-
-	for _, each := range polices {
-		if strings.HasPrefix(each.ID, prefixName) {
-			onlyOrgPolicy = append(onlyOrgPolicy, each)
-		}
-	}
-
-	for i, j := 0, len(onlyOrgPolicy)-1; i < j; i, j = i+1, j-1 {
-		onlyOrgPolicy[i], onlyOrgPolicy[j] = onlyOrgPolicy[j], onlyOrgPolicy[i]
-	}
-
 	offset, limit := paginationx.Parse(r.URL.Query())
 
-	total := len(onlyOrgPolicy)
+	total := len(polices)
 	lowerLimit := offset
 	upperLimit := offset + limit
 	if offset > total {
@@ -110,19 +96,9 @@ func list(w http.ResponseWriter, r *http.Request) {
 		upperLimit = total
 	}
 
-	onlyOrgPolicy = onlyOrgPolicy[lowerLimit:upperLimit]
-
-	/* User req */
-	userMap := author.Mapper(organisationID, userID)
-
-	pagePolicies := make([]model.Policy, 0)
-
-	for _, each := range onlyOrgPolicy {
-		pagePolicies = append(pagePolicies, Mapper(each, userMap))
-	}
-
+	polices = polices[lowerLimit:upperLimit]
 	var result paging
-	result.Nodes = pagePolicies
+	result.Nodes = polices
 	result.Total = total
 	renderx.JSON(w, http.StatusOK, result)
 }
diff --git a/server/service/core/action/policy/route.go b/server/service/core/action/policy/route.go
index c1be8c260..a35c78681 100644
--- a/server/service/core/action/policy/route.go
+++ b/server/service/core/action/policy/route.go
@@ -13,6 +13,19 @@ type policyReq struct {
 	Users       []string           `json:"users"`
 }
 
+type kavachPolicy struct {
+	Name        string             `json:"name"`
+	Description string             `json:"description"`
+	Permissions []model.Permission `json:"permissions"`
+	Roles       []uint             `json:"roles"`
+}
+
+type roleReq struct {
+	Name        string `json:"name"`
+	Slug        string `json:"slug"`
+	Description string `json:"description"`
+}
+
 // Router - Group of medium router
 func Router() chi.Router {
 	r := chi.NewRouter()
diff --git a/server/service/core/action/post/create.go b/server/service/core/action/post/create.go
index 596723e93..d634793a4 100644
--- a/server/service/core/action/post/create.go
+++ b/server/service/core/action/post/create.go
@@ -135,6 +135,11 @@ func createPost(ctx context.Context, post post, status string) (*postData, error
 		return nil, errorx.Unauthorized()
 	}
 
+	orgID, err := util.GetOrganisation(ctx)
+	if err != nil {
+		loggerx.Error(err)
+		return nil, errorx.Unauthorized()
+	}
 	if viper.GetBool("create_super_organisation") {
 		// Fetch space permissions
 		permission := model.SpacePermission{}
@@ -231,7 +236,7 @@ func createPost(ctx context.Context, post post, status string) (*postData, error
 		return nil, errorx.DBError()
 	}
 
-	tx.Model(&model.Post{}).Preload("Medium").Preload("Format").Preload("Tags").Preload("Categories").Preload("Space").Preload("Space.Logo").First(&result.Post)
+	tx.Model(&model.Post{}).Preload("Medium").Preload("Format").Preload("Tags").Preload("Categories").Preload("Space.Logo").First(&result.Post)
 
 	if result.Format.Slug == "fact-check" {
 		// create post claim
@@ -285,6 +290,12 @@ func createPost(ctx context.Context, post post, status string) (*postData, error
 		}
 	}
 
+	spaceObjectforDega, err := util.GetSpacefromKavach(uint(uID), uint(orgID), uint(sID))
+	if err != nil {
+		loggerx.Error(err)
+		return nil, errorx.InternalServerError()
+	}
+
 	ratings := make([]factCheckModel.Rating, 0)
 	config.DB.Model(&factCheckModel.Rating{}).Where(factCheckModel.Rating{
 		SpaceID: uint(sID),
@@ -294,7 +305,7 @@ func createPost(ctx context.Context, post post, status string) (*postData, error
 		Post:    result.Post,
 		Authors: result.Authors,
 		Claims:  result.Claims,
-	}, *result.Space, ratings)
+	}, *spaceObjectforDega, ratings)
 
 	byteArr, err := json.Marshal(schemas)
 	if err != nil {
diff --git a/server/service/core/action/post/details.go b/server/service/core/action/post/details.go
index 311f5ed4f..976b30a45 100644
--- a/server/service/core/action/post/details.go
+++ b/server/service/core/action/post/details.go
@@ -53,7 +53,7 @@ func details(w http.ResponseWriter, r *http.Request) {
 	postClaims := []factCheckModel.PostClaim{}
 	result.ID = uint(id)
 
-	err = config.DB.Model(&model.Post{}).Preload("Medium").Preload("Format").Preload("Tags").Preload("Categories").Preload("Space").Where(&model.Post{
+	err = config.DB.Model(&model.Post{}).Preload("Medium").Preload("Format").Preload("Tags").Preload("Categories").Where(&model.Post{
 		SpaceID: uint(sID),
 	}).Where("is_page = ?", false).First(&result.Post).Error
 
diff --git a/server/service/core/action/post/list.go b/server/service/core/action/post/list.go
index db8462cd6..b4633ba9a 100644
--- a/server/service/core/action/post/list.go
+++ b/server/service/core/action/post/list.go
@@ -70,7 +70,7 @@ func list(w http.ResponseWriter, r *http.Request) {
 		sort = "desc"
 	}
 
-	tx := config.DB.Preload("Medium").Preload("Format").Preload("Tags").Preload("Categories").Preload("Space").Model(&model.Post{}).Where(&model.Post{
+	tx := config.DB.Preload("Medium").Preload("Format").Preload("Tags").Preload("Categories").Model(&model.Post{}).Where(&model.Post{
 		SpaceID: uint(sID),
 	}).Where("is_page = ?", false).Order("posts.created_at " + sort)
 	var statusTemplate bool = false
diff --git a/server/service/core/action/post/template.go b/server/service/core/action/post/template.go
index 8ba67e209..c66700bac 100644
--- a/server/service/core/action/post/template.go
+++ b/server/service/core/action/post/template.go
@@ -97,7 +97,7 @@ func createTemplate(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	tx.Preload("Medium").Preload("Format").Preload("Tags").Preload("Categories").Preload("Space").First(&template.Post)
+	tx.Preload("Medium").Preload("Format").Preload("Tags").Preload("Categories").First(&template.Post)
 
 	if template.Post.Format.Slug == "fact-check" {
 
diff --git a/server/service/core/action/post/update.go b/server/service/core/action/post/update.go
index f0e02f18d..083aecaf1 100644
--- a/server/service/core/action/post/update.go
+++ b/server/service/core/action/post/update.go
@@ -252,7 +252,7 @@ func update(w http.ResponseWriter, r *http.Request) {
 		updateMap["status"] = "draft"
 	}
 
-	err = tx.Model(&result.Post).Updates(&updateMap).Preload("Medium").Preload("Format").Preload("Tags").Preload("Categories").Preload("Space").Preload("Space.Logo").First(&result.Post).Error
+	err = tx.Model(&result.Post).Updates(&updateMap).Preload("Medium").Preload("Format").Preload("Tags").Preload("Categories").Preload("Space.Logo").First(&result.Post).Error
 
 	if err != nil {
 		tx.Rollback()
@@ -379,6 +379,13 @@ func update(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
+	spaceObjectforDega, err := util.GetSpacefromKavach(uint(uID), uint(oID), uint(sID))
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+
 	ratings := make([]factCheckModel.Rating, 0)
 	config.DB.Model(&factCheckModel.Rating{}).Where(factCheckModel.Rating{
 		SpaceID: uint(sID),
@@ -388,7 +395,7 @@ func update(w http.ResponseWriter, r *http.Request) {
 		Post:    result.Post,
 		Authors: result.Authors,
 		Claims:  result.Claims,
-	}, *result.Space, ratings)
+	}, *spaceObjectforDega, ratings)
 
 	byteArr, err := json.Marshal(schemas)
 	if err != nil {
@@ -482,7 +489,7 @@ func getPublishPermissions(oID, sID, uID int) (int, error) {
 	result.Resource = kresource
 	result.Subject = fmt.Sprint(uID)
 
-	resStatus, err := util.IsAllowed(result)
+	resStatus, err := util.IsAllowed(result, uint(oID), uint(sID), uint(uID))
 	if err != nil {
 		return 0, err
 	}
diff --git a/server/service/core/action/role/create.go b/server/service/core/action/role/create.go
index 17b44fc3f..95613b105 100644
--- a/server/service/core/action/role/create.go
+++ b/server/service/core/action/role/create.go
@@ -2,29 +2,22 @@ package role
 
 import (
 	"bytes"
+	"encoding/json"
 	"errors"
 	"fmt"
-
-	//"context"
-	"encoding/json"
-
-	//	"fmt"
 	"net/http"
 	"strconv"
+	"time"
 
+	"github.com/factly/dega-server/service/core/model"
+	"github.com/factly/dega-server/util"
+	"github.com/factly/dega-server/util/timex"
 	"github.com/spf13/viper"
 
-	//"github.com/factly/dega-server/config"
-	"github.com/factly/dega-server/service/core/model"
-	//"github.com/factly/dega-server/util"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
-
-	//"github.com/factly/x/meilisearchx"
 	"github.com/factly/x/middlewarex"
 	"github.com/factly/x/renderx"
-
-	//"github.com/factly/x/slugx"
 	"github.com/go-chi/chi"
 )
 
@@ -35,62 +28,64 @@ func create(w http.ResponseWriter, r *http.Request) {
 		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
 		return
 	}
-	spaceID := chi.URLParam(r, "space_id")
 
-	reqBody := map[string]interface{}{}
-	err = json.NewDecoder(r.Body).Decode(&reqBody)
+	spaceID := chi.URLParam(r, "space_id")
+	sID, err := strconv.Atoi(spaceID)
 	if err != nil {
 		loggerx.Error(err)
 		errorx.Render(w, errorx.Parser(errorx.DecodeError()))
 		return
 	}
-	fmt.Println(reqBody, "reqBody")
-	orgID := uint(reqBody["organisation_id"].(float64))
-	// if !ok {
-	// 	loggerx.Error(errors.New("organisation id is not defined"))
-	// 	errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
-	// 	return
-	// }
-	role, ok := reqBody["role"].(map[string]interface{})
-	if !ok {
-		loggerx.Error(errors.New("request body is empty"))
+	spaceRole := new(model.SpaceRole)
+	err = json.NewDecoder(r.Body).Decode(spaceRole)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+		return
+	}
+
+	orgID, err := util.GetOrganisationIDfromSpaceID(uint(sID), uint(uID))
+	if err != nil {
+		loggerx.Error(err)
 		errorx.Render(w, errorx.Parser(errorx.DecodeError()))
 		return
 	}
 	buf := new(bytes.Buffer)
-	err = json.NewEncoder(buf).Encode(&role)
+	err = json.NewEncoder(buf).Encode(spaceRole)
 	if err != nil {
 		loggerx.Error(err)
 		errorx.Render(w, errorx.Parser(errorx.DecodeError()))
 		return
 	}
-	//**need to get util func from x-package for org id
+
 	requrl := viper.GetString("kavach_url") + "/organisations/" + fmt.Sprintf("%d", orgID) + "/applications/" + viper.GetString("dega_application_id") + "/spaces/" + spaceID + "/roles"
-	fmt.Println(requrl, "requrl")
 	req, err := http.NewRequest("POST", requrl, buf)
 	if err != nil {
 		loggerx.Error(err)
 		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
 		return
 	}
+
 	req.Header.Set("X-User", strconv.Itoa(uID))
 	req.Header.Set("Content-Type", "application/json")
 
-	client := &http.Client{}
+	client := &http.Client{Timeout: time.Duration(timex.HTTP_TIMEOUT) * time.Second}
 	resp, err := client.Do(req)
 	if err != nil {
 		loggerx.Error(err)
 		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
 		return
 	}
+
+	defer resp.Body.Close()
 	if resp.StatusCode != http.StatusOK {
 		loggerx.Error(errors.New("internal server error on kavach server"))
 		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
 		return
 	}
+
 	result := &model.SpaceRole{}
 	err = json.NewDecoder(resp.Body).Decode(result)
-
 	if err != nil {
 		loggerx.Error(err)
 		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
diff --git a/server/service/core/action/role/delete.go b/server/service/core/action/role/delete.go
new file mode 100644
index 000000000..843a6bf55
--- /dev/null
+++ b/server/service/core/action/role/delete.go
@@ -0,0 +1,67 @@
+package role
+
+import (
+	"fmt"
+	"net/http"
+	"strconv"
+	"time"
+
+	"github.com/factly/dega-server/util"
+	"github.com/factly/dega-server/util/timex"
+	"github.com/factly/x/errorx"
+	"github.com/factly/x/loggerx"
+	"github.com/factly/x/middlewarex"
+	"github.com/factly/x/renderx"
+	"github.com/go-chi/chi"
+	"github.com/spf13/viper"
+)
+
+func delete(w http.ResponseWriter, r *http.Request) {
+	uID, err := middlewarex.GetUser(r.Context())
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
+		return
+	}
+
+	spaceID := chi.URLParam(r, "space_id")
+	sID, err := strconv.Atoi(spaceID)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+		return
+	}
+	
+	roleID := chi.URLParam(r, "role_id")
+	orgID, err := util.GetOrganisationIDfromSpaceID(uint(sID), uint(uID))
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+		return
+	}
+	reqURL := viper.GetString("kavach_url") + fmt.Sprintf("/organisations/%d/applications/%d/spaces/%s/roles/%s", orgID, viper.GetInt("dega_application_id"), spaceID, roleID)
+	client := http.Client{Timeout: time.Minute * time.Duration(timex.HTTP_TIMEOUT)}
+
+	req, err := http.NewRequest(http.MethodDelete, reqURL, nil)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+	req.Header.Set("X-User", fmt.Sprintf("%d", uID))
+	req.Header.Set("Content-type", "application/json")
+	response, err := client.Do(req)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+	defer response.Body.Close()
+	if response.StatusCode != 200 {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+
+	renderx.JSON(w, http.StatusOK, nil)
+}
diff --git a/server/service/core/action/role/details.go b/server/service/core/action/role/details.go
index f8d44d6d8..92ba91d0f 100644
--- a/server/service/core/action/role/details.go
+++ b/server/service/core/action/role/details.go
@@ -2,19 +2,20 @@ package role
 
 import (
 	"encoding/json"
+	"fmt"
 	"net/http"
 	"strconv"
+	"time"
 
-	"github.com/factly/x/middlewarex"
-	"github.com/spf13/viper"
-
-	//	"github.com/factly/dega-server/config"
 	"github.com/factly/dega-server/service/core/model"
+	"github.com/factly/dega-server/util"
+	"github.com/factly/dega-server/util/timex"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
-
+	"github.com/factly/x/middlewarex"
 	"github.com/factly/x/renderx"
 	"github.com/go-chi/chi"
+	"github.com/spf13/viper"
 )
 
 func details(w http.ResponseWriter, r *http.Request) {
@@ -24,31 +25,55 @@ func details(w http.ResponseWriter, r *http.Request) {
 		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
 		return
 	}
-	orgID := r.URL.Query().Get("organisation_id")
+
 	spaceID := chi.URLParam(r, "space_id")
-	req, err := http.NewRequest("GET", viper.GetString("kavach_url")+"/organisations/"+orgID+"/applications/"+viper.GetString("dega_application_id")+"/spaces/"+spaceID+"/roles", nil)
+	sID, err := strconv.Atoi(spaceID)
 	if err != nil {
 		loggerx.Error(err)
-		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+		return
+	}
+
+	orgID, err := util.GetOrganisationIDfromSpaceID(uint(sID), uint(uID))
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.DecodeError()))
 		return
 	}
-	req.Header.Set("X-User", strconv.Itoa(uID))
-	req.Header.Set("Content-Type", "application/json")
+	
+	roleID := chi.URLParam(r, "role_id")
+
+	reqURL := viper.GetString("kavach_url") + fmt.Sprintf("/organisations/%d/applications/%d/spaces/%s/roles/%s", orgID, viper.GetInt("dega_application_id"), spaceID, roleID)
+	client := http.Client{Timeout: time.Minute * time.Duration(timex.HTTP_TIMEOUT)}
 
-	client := &http.Client{}
-	resp, err := client.Do(req)
+	req, err := http.NewRequest(http.MethodGet, reqURL, nil)
 	if err != nil {
 		loggerx.Error(err)
 		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
 		return
 	}
-	result := []model.SpaceRole{}
-	err = json.NewDecoder(resp.Body).Decode(&result)
+	req.Header.Set("X-User", fmt.Sprintf("%d", uID))
+	req.Header.Set("Content-type", "application/json")
+	response, err := client.Do(req)
 	if err != nil {
 		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+	defer response.Body.Close()
+	if response.StatusCode != 200 {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
 		return
 	}
 
-	renderx.JSON(w, http.StatusOK, result)
+	spaceRole := model.SpaceRole{}
+	err = json.NewDecoder(response.Body).Decode(&spaceRole)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
 
+	renderx.JSON(w, http.StatusOK, spaceRole)
 }
diff --git a/server/service/core/action/role/list.go b/server/service/core/action/role/list.go
new file mode 100644
index 000000000..b165a848f
--- /dev/null
+++ b/server/service/core/action/role/list.go
@@ -0,0 +1,69 @@
+package role
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"strconv"
+
+	"github.com/factly/x/middlewarex"
+	"github.com/spf13/viper"
+
+	"github.com/factly/dega-server/service/core/model"
+	"github.com/factly/dega-server/util"
+	"github.com/factly/x/errorx"
+	"github.com/factly/x/loggerx"
+
+	"github.com/factly/x/renderx"
+	"github.com/go-chi/chi"
+)
+
+func list(w http.ResponseWriter, r *http.Request) {
+	uID, err := middlewarex.GetUser(r.Context())
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
+		return
+	}
+
+	spaceID := chi.URLParam(r, "space_id")
+	sID, err := strconv.Atoi(spaceID)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+		return
+	}
+
+	orgID, err := util.GetOrganisationIDfromSpaceID(uint(sID), uint(uID))
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+		return
+	}
+	req, err := http.NewRequest("GET", viper.GetString("kavach_url")+"/organisations/"+fmt.Sprintf("%d", orgID)+"/applications/"+viper.GetString("dega_application_id")+"/spaces/"+spaceID+"/roles", nil)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+	req.Header.Set("X-User", strconv.Itoa(uID))
+	req.Header.Set("Content-Type", "application/json")
+
+	client := &http.Client{}
+	resp, err := client.Do(req)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+	defer resp.Body.Close()
+	result := []model.SpaceRole{}
+	err = json.NewDecoder(resp.Body).Decode(&result)
+	if err != nil {
+		loggerx.Error(err)
+		return
+	}
+
+	renderx.JSON(w, http.StatusOK, result)
+
+}
diff --git a/server/service/core/action/role/route.go b/server/service/core/action/role/route.go
index f3f0684e2..63f3bda41 100644
--- a/server/service/core/action/role/route.go
+++ b/server/service/core/action/role/route.go
@@ -1,29 +1,19 @@
 package role
 
 import (
-	//"github.com/factly/dega-server/config"
 	"github.com/go-chi/chi"
-	//"github.com/jinzhu/gorm/dialects/postgres"
 )
 
-type spaceRole struct {
-	Name        string `gorm:"column:name" json:"name"`
-	Description string `gorm:"column:description" json:"description"`
-	Slug        string `gorm:"column:slug" json:"slug"`
-}
-
 func Router() chi.Router {
 	r := chi.NewRouter()
 
-	//r.Post("/", create)
-	//r.Get("/", my)
-	r.Get("/", details)
+	r.Get("/", list)
 	r.Post("/", create)
-	// r.Route("/{space_id}", func(r chi.Router) {
-
-	//r.Put("/", update)
-	//r.Delete("/", delete)
-	//})
+	r.Route("/{role_id}", func(r chi.Router) {
+		r.Put("/", update)
+		r.Delete("/", delete)
+		r.Get("/", details)
+	})
 
 	return r
 }
diff --git a/server/service/core/action/role/update.go b/server/service/core/action/role/update.go
new file mode 100644
index 000000000..a443b6ad6
--- /dev/null
+++ b/server/service/core/action/role/update.go
@@ -0,0 +1,98 @@
+package role
+
+import (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"net/http"
+	"strconv"
+	"time"
+
+	"github.com/factly/dega-server/service/core/model"
+	"github.com/factly/dega-server/util"
+	"github.com/factly/dega-server/util/timex"
+	"github.com/spf13/viper"
+
+	"github.com/factly/x/errorx"
+	"github.com/factly/x/loggerx"
+	"github.com/factly/x/middlewarex"
+	"github.com/factly/x/renderx"
+	"github.com/go-chi/chi"
+)
+
+func update(w http.ResponseWriter, r *http.Request) {
+	uID, err := middlewarex.GetUser(r.Context())
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
+		return
+	}
+
+	spaceID := chi.URLParam(r, "space_id")
+	sID, err := strconv.Atoi(spaceID)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+		return
+	}
+
+	orgID, err := util.GetOrganisationIDfromSpaceID(uint(sID), uint(uID))
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+		return
+	}
+
+	roleID := chi.URLParam(r, "role_id")
+	spaceRole := new(model.SpaceRole)
+	err = json.NewDecoder(r.Body).Decode(spaceRole)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+		return
+	}
+
+	buf := new(bytes.Buffer)
+	err = json.NewEncoder(buf).Encode(spaceRole)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+		return
+	}
+
+	requrl := viper.GetString("kavach_url") + "/organisations/" + fmt.Sprintf("%d", orgID) + "/applications/" + viper.GetString("dega_application_id") + "/spaces/" + spaceID + "/roles/" + roleID
+	req, err := http.NewRequest(http.MethodPut, requrl, buf)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+
+	req.Header.Set("X-User", strconv.Itoa(uID))
+	req.Header.Set("Content-Type", "application/json")
+
+	client := &http.Client{Timeout: time.Duration(timex.HTTP_TIMEOUT)}
+	resp, err := client.Do(req)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+
+	defer resp.Body.Close()
+	if resp.StatusCode != http.StatusOK {
+		loggerx.Error(errors.New("internal server error on kavach server"))
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+
+	result := &model.SpaceRole{}
+	err = json.NewDecoder(resp.Body).Decode(result)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+	renderx.JSON(w, http.StatusCreated, result)
+}
diff --git a/server/service/core/action/space/create.go b/server/service/core/action/space/create.go
index c12db8380..93170b31d 100644
--- a/server/service/core/action/space/create.go
+++ b/server/service/core/action/space/create.go
@@ -4,8 +4,9 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
-
+	"errors"
 	"fmt"
+
 	"net/http"
 	"strconv"
 
@@ -19,6 +20,7 @@ import (
 	"github.com/factly/x/meilisearchx"
 	"github.com/factly/x/middlewarex"
 	"github.com/factly/x/renderx"
+	"github.com/factly/x/validationx"
 	//"github.com/factly/x/slugx"
 )
 
@@ -41,46 +43,49 @@ func create(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	space := map[string]interface{}{}
-
+	space := space{}
 	err = json.NewDecoder(r.Body).Decode(&space)
-
 	if err != nil {
 		loggerx.Error(err)
 		errorx.Render(w, errorx.Parser(errorx.DecodeError()))
 		return
 	}
 
-	// err = util.CheckSpaceKetoPermission("create", uint(space.OrganisationID), uint(uID))
-	// if err != nil {
-	// 	loggerx.Error(err)
-	// 	errorx.Render(w, errorx.Parser(errorx.GetMessage(err.Error(), http.StatusUnauthorized)))
-	// 	return
-	// }
-
-	// validationError := validationx.Check(space)
+	validationError := validationx.Check(space)
 
-	// if validationError != nil {
-	// 	loggerx.Error(errors.New("validation error"))
-	// 	errorx.Render(w, validationError)
-	// 	return
-	// }
+	if validationError != nil {
+		loggerx.Error(errors.New("validation error"))
+		errorx.Render(w, validationError)
+		return
+	}
 
-	spaceOrgID := int(space["organisation_id"].(float64))
-	if spaceOrgID == 0 {
+	if space.OrganisationID == 0 {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
 		return
 	}
 
 	buf := new(bytes.Buffer)
-	err = json.NewEncoder(buf).Encode(&space)
-	fmt.Println(space, "spacetestnew")
+
+	requestBody := map[string]interface{}{
+		"name":        space.Name,
+		"description": space.Description,
+		"slug":        space.Slug,
+		"metadata": map[string]interface{}{
+			"meta_fields":  space.MetaFields,
+			"site_address": space.SiteAddress,
+			"tag_line":     space.TagLine,
+			"site_title":   space.SiteTitle,
+		},
+	}
+	err = json.NewEncoder(buf).Encode(&requestBody)
 	if err != nil {
 		loggerx.Error(err)
 		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
 		return
 	}
 
-	req, err := http.NewRequest("POST", viper.GetString("kavach_url")+"/organisations/"+strconv.Itoa(spaceOrgID)+"/applications/"+viper.GetString("dega_application_id")+"/spaces", buf)
+	req, err := http.NewRequest("POST", viper.GetString("kavach_url")+"/organisations/"+fmt.Sprintf("%d", space.OrganisationID)+"/applications/"+viper.GetString("dega_application_id")+"/spaces", buf)
 	if err != nil {
 		loggerx.Error(err)
 		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
@@ -92,58 +97,93 @@ func create(w http.ResponseWriter, r *http.Request) {
 
 	client := &http.Client{}
 	resp, err := client.Do(req)
-	fmt.Println(resp.Status, "resp status")
-	result := &model.Space{}
-	err = json.NewDecoder(resp.Body).Decode(result)
 	if err != nil {
 		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+
+	defer resp.Body.Close()
+
+	if resp.StatusCode != 201 {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+	spaceObjectfromKavach := &model.KavachSpace{}
+	err = json.NewDecoder(resp.Body).Decode(spaceObjectfromKavach)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+
+	spaceObjectforDega := model.Space{}
+	spaceObjectforDega.ID = spaceObjectfromKavach.ID
+	spaceObjectforDega.CreatedAt = spaceObjectfromKavach.CreatedAt
+	spaceObjectforDega.UpdatedAt = spaceObjectfromKavach.UpdatedAt
+	spaceObjectforDega.DeletedAt = spaceObjectfromKavach.DeletedAt
+	spaceObjectforDega.CreatedByID = spaceObjectfromKavach.CreatedByID
+	spaceObjectforDega.UpdatedByID = spaceObjectfromKavach.UpdatedByID
+	spaceObjectforDega.Name = spaceObjectfromKavach.Name
+	spaceObjectforDega.Slug = spaceObjectfromKavach.Slug
+	spaceObjectforDega.Description = spaceObjectfromKavach.Description
+	spaceObjectforDega.ApplicationID = spaceObjectfromKavach.ApplicationID
+	spaceObjectforDega.OrganisationID = int(spaceObjectfromKavach.OrganisationID)
+	err = json.Unmarshal(spaceObjectfromKavach.Metadata.RawMessage, &spaceObjectforDega)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.DBError()))
 		return
 	}
-	fmt.Println(resp)
 
 	var superOrgID int
 	if viper.GetBool("create_super_organisation") {
-		superOrgID, err = middlewarex.GetSuperOrganisationID("dega")
+		superOrgID, err = middlewarex.GetSuperOrganisationID("Kavach")
 		if err != nil {
 			loggerx.Error(err)
 			errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
 			return
 		}
-
 		// Fetch organisation permissions
 		permission := model.OrganisationPermission{}
 		err = config.DB.Model(&model.OrganisationPermission{}).Where(&model.OrganisationPermission{
-			OrganisationID: uint(spaceOrgID),
+			OrganisationID: uint(space.OrganisationID),
 		}).First(&permission).Error
 
-		if err != nil && spaceOrgID != superOrgID {
+		if err != nil && space.OrganisationID != superOrgID {
 			loggerx.Error(err)
 			errorx.Render(w, errorx.Parser(errorx.GetMessage("cannot create more spaces", http.StatusUnprocessableEntity)))
 			return
 		}
 
-		if err == nil {
-			// Fetch total number of spaces in organisation
-			var totSpaces int64
-			config.DB.Model(&model.Space{}).Where(&model.Space{
-				OrganisationID: spaceOrgID,
-			}).Count(&totSpaces)
-
-			if totSpaces >= permission.Spaces && permission.Spaces > 0 {
-				errorx.Render(w, errorx.Parser(errorx.GetMessage("cannot create more spaces", http.StatusUnprocessableEntity)))
-				return
-			}
-		}
+		// if err == nil {
+		// 	// Fetch total number of spaces in organisation
+		// 	var totSpaces int64
+		// 	err = config.DB.Model(&model.Space{}).Where(&model.Space{
+		// 		OrganisationID: space.OrganisationID,
+		// 	}).Count(&totSpaces).Error
+		// 	if err != nil {
+		// 		loggerx.Error(err)
+		// 		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		// 		return
+		// 	}
+		// 	if totSpaces >= permission.Spaces && permission.Spaces > 0 {
+		// 		errorx.Render(w, errorx.Parser(errorx.GetMessage("cannot create more spaces", http.StatusUnprocessableEntity)))
+		// 		return
+		// 	}
+		// }
 	}
 
 	tx := config.DB.WithContext(context.WithValue(r.Context(), userContext, uID)).Begin()
 
 	if viper.GetBool("create_super_organisation") {
-		// Create SpacePermission for super organisation
+		fmt.Println("here")
+		//Create SpacePermission for super organisation
 		var spacePermission model.SpacePermission
-		if superOrgID == spaceOrgID {
+		if superOrgID == space.OrganisationID {
 			spacePermission = model.SpacePermission{
-				SpaceID:   result.ID,
+				SpaceID:   spaceObjectforDega.ID,
 				Media:     -1,
 				Posts:     -1,
 				Podcast:   true,
@@ -153,7 +193,7 @@ func create(w http.ResponseWriter, r *http.Request) {
 			}
 		} else {
 			spacePermission = model.SpacePermission{
-				SpaceID:   result.ID,
+				SpaceID:   spaceObjectforDega.ID,
 				Media:     viper.GetInt64("default_number_of_media"),
 				Posts:     viper.GetInt64("default_number_of_posts"),
 				Episodes:  viper.GetInt64("default_number_of_episodes"),
@@ -162,72 +202,47 @@ func create(w http.ResponseWriter, r *http.Request) {
 				FactCheck: false,
 			}
 		}
-		var spacePermContext config.ContextKey = "space_perm_user"
-		if err = tx.WithContext(context.WithValue(r.Context(), spacePermContext, uID)).Create(&spacePermission).Error; err != nil {
+		fmt.Println("create permissions for space", spacePermission)
+		if err = tx.Model(&model.SpacePermission{}).Create(&spacePermission).Error; err != nil {
 			tx.Rollback()
 			loggerx.Error(err)
 			errorx.Render(w, errorx.Parser(errorx.DBError()))
 			return
 		}
-
 	}
 
 	// Insert into meili index
 	meiliObj := map[string]interface{}{
-		"id":              result.ID,
+		"id":              spaceObjectforDega.ID,
 		"kind":            "space",
-		"name":            result.Name,
-		"slug":            result.Slug,
-		"description":     result.Description,
-		"site_title":      result.SiteTitle,
-		"site_address":    result.SiteAddress,
-		"tag_line":        result.TagLine,
-		"organisation_id": result.OrganisationID,
-		"analytics":       result.Analytics,
+		"name":            spaceObjectforDega.Name,
+		"slug":            spaceObjectforDega.Slug,
+		"description":     spaceObjectforDega.Description,
+		"site_title":      spaceObjectforDega.SiteTitle,
+		"site_address":    spaceObjectforDega.SiteAddress,
+		"tag_line":        spaceObjectforDega.TagLine,
+		"organisation_id": spaceObjectforDega.OrganisationID,
+		"analytics":       spaceObjectforDega.Analytics,
 	}
 
 	if config.SearchEnabled() {
-		_ = meilisearchx.AddDocument("dega", meiliObj)
+		err = meilisearchx.AddDocument("dega", meiliObj)
+		if err != nil {
+			loggerx.Error(err)
+			errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+			return
+		}
 	}
 
 	tx.Commit()
 
 	if util.CheckNats() {
-		if err = util.NC.Publish("space.created", result); err != nil {
+		if err = util.NC.Publish("space.created", spaceObjectforDega); err != nil {
 			loggerx.Error(err)
 			errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
 			return
 		}
 	}
 
-	renderx.JSON(w, http.StatusCreated, result)
-}
-
-func approveSpaceSlug(slug string) string {
-	spaceList := make([]model.Space, 0)
-	config.DB.Model(&model.Space{}).Where("slug LIKE ? AND deleted_at IS NULL", slug+"%").Find(&spaceList)
-
-	count := 0
-	for {
-		flag := true
-		for _, each := range spaceList {
-			temp := slug
-			if count != 0 {
-				temp = temp + "-" + strconv.Itoa(count)
-			}
-			if each.Slug == temp {
-				flag = false
-				break
-			}
-		}
-		if flag {
-			break
-		}
-		count++
-	}
-	temp := slug
-	if count != 0 {
-		temp = temp + "-" + strconv.Itoa(count)
-	}
-	return temp
+	renderx.JSON(w, http.StatusCreated, spaceObjectforDega)
 }
diff --git a/server/service/core/action/space/delete.go b/server/service/core/action/space/delete.go
index e2c9d1c57..585ff8963 100644
--- a/server/service/core/action/space/delete.go
+++ b/server/service/core/action/space/delete.go
@@ -2,6 +2,8 @@ package space
 
 import (
 	//	"encoding/json"
+
+	"fmt"
 	"net/http"
 	"strconv"
 
@@ -36,20 +38,6 @@ func delete(w http.ResponseWriter, r *http.Request) {
 		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
 		return
 	}
-	// space := map[string]interface{}{}
-
-	// err = json.NewDecoder(r.Body).Decode(&space)
-
-	// if err != nil {
-	// 	loggerx.Error(err)
-	// 	errorx.Render(w, errorx.Parser(errorx.DecodeError()))
-	// 	return
-	// }
-
-	// spaceOrgID := int(space["organisation_id"].(float64))
-	// if spaceOrgID == 0 {
-	// 	return
-	// }
 
 	spaceID := chi.URLParam(r, "space_id")
 	sID, err := strconv.Atoi(spaceID)
@@ -59,10 +47,22 @@ func delete(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	result := &model.Space{}
-	result.ID = uint(sID)
+	orgID, err := util.GetOrganisationIDfromSpaceID(uint(sID), uint(uID))
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
 
-	req, err := http.NewRequest("DELETE", viper.GetString("kavach_url")+"/organisations/1/applications/"+viper.GetString("dega_application_id")+"/spaces/"+spaceID, nil)
+	spaceObjectforDega, err := util.GetSpacefromKavach(uint(uID), uint(orgID), uint(sID))
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+	// getting the details for the space to be deleted
+	client := http.Client{}
+	req, err := http.NewRequest("DELETE", viper.GetString("kavach_url")+fmt.Sprintf("/organisations/%d/applications/", orgID)+viper.GetString("dega_application_id")+"/spaces/"+spaceID, nil)
 	if err != nil {
 		loggerx.Error(err)
 		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
@@ -72,10 +72,10 @@ func delete(w http.ResponseWriter, r *http.Request) {
 	req.Header.Set("X-User", strconv.Itoa(uID))
 	req.Header.Set("Content-Type", "application/json")
 
-	client := &http.Client{}
 	resp, err := client.Do(req)
 	if err != nil {
 		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
 		return
 	}
 	if resp.StatusCode != 200 {
@@ -83,44 +83,30 @@ func delete(w http.ResponseWriter, r *http.Request) {
 		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
 		return
 	}
-
-	//	fmt.Println(resp)
-
-	// check record exists or not
-	// err = config.DB.First(&result).Error
-	// if err != nil {
-	// 	loggerx.Error(err)
-	// 	errorx.Render(w, errorx.Parser(errorx.RecordNotFound()))
-	// 	return
-	// }
-
-	// if result.OrganisationID == 0 {
-	// 	return
-	// }
-
-	// err = util.CheckSpaceKetoPermission("delete", uint(result.OrganisationID), uint(uID))
-	// if err != nil {
-	// 	loggerx.Error(err)
-	// 	errorx.Render(w, errorx.Parser(errorx.GetMessage(err.Error(), http.StatusUnauthorized)))
-	// 	return
-	// }
-
-	// tx := config.DB.Begin()
-	// tx.Model(&model.Space{}).Delete(&result)
-
+	defer resp.Body.Close()
 	if config.SearchEnabled() {
-		_ = meilisearchx.DeleteDocument("dega", result.ID, "space")
+		err = meilisearchx.DeleteDocument("dega", uint(sID), "space")
+		if err != nil {
+			loggerx.Error(err)
+			errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		}
 	}
 
-	// tx.Commit()
-
 	if util.CheckNats() {
-		if err = util.NC.Publish("space.deleted", result); err != nil {
+		if err = util.NC.Publish("space.deleted", spaceObjectforDega); err != nil {
 			loggerx.Error(err)
 			errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
 			return
 		}
 	}
 
+	err = config.DB.Model(&model.SpacePermission{}).Where(&model.SpacePermission{
+		SpaceID: uint(sID),
+	}).Delete(&model.SpacePermission{}).Error
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.DBError()))
+		return
+	}
 	renderx.JSON(w, http.StatusOK, nil)
 }
diff --git a/server/service/core/action/space/details.go b/server/service/core/action/space/details.go
index db86bed8b..f8bbb52bf 100644
--- a/server/service/core/action/space/details.go
+++ b/server/service/core/action/space/details.go
@@ -1,15 +1,14 @@
 package space
 
 import (
-	"encoding/json"
 	"net/http"
 	"strconv"
 
 	"github.com/factly/x/middlewarex"
-	"github.com/spf13/viper"
 
 	//	"github.com/factly/dega-server/config"
-	"github.com/factly/dega-server/service/core/model"
+
+	"github.com/factly/dega-server/util"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
 	"github.com/factly/x/renderx"
@@ -35,50 +34,26 @@ func details(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	spaceID := chi.URLParam(r, "space_id")
-	//id, err := strconv.Atoi(spaceID)
-
-	// if err != nil {
-	// 	loggerx.Error(err)
-	// 	errorx.Render(w, errorx.Parser(errorx.InvalidID()))
-	// 	return
-	// }
-	//** HARDCODED organisation id need x-package util to get organisation id , given space id and uid
-	req, err := http.NewRequest("GET", viper.GetString("kavach_url")+"/organisations/1/applications/"+viper.GetString("dega_application_id")+"/spaces/"+spaceID, nil)
+	sID := chi.URLParam(r, "space_id")
+	spaceID, err := strconv.Atoi(sID)
 	if err != nil {
 		loggerx.Error(err)
-		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		errorx.Render(w, errorx.Parser(errorx.InvalidID()))
 		return
 	}
 
-	req.Header.Set("X-User", strconv.Itoa(uID))
-	req.Header.Set("Content-Type", "application/json")
-
-	client := &http.Client{}
-	resp, err := client.Do(req)
+	orgID, err := util.GetOrganisationIDfromSpaceID(uint(spaceID), uint(uID))
 	if err != nil {
 		loggerx.Error(err)
 		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
 		return
 	}
-	result := &model.Space{}
-	err = json.NewDecoder(resp.Body).Decode(result)
+
+	spaceObjectforDega, err := util.GetSpacefromKavach(uint(uID), uint(orgID), uint(spaceID))
 	if err != nil {
 		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
 		return
 	}
-
-	//result := &model.Space{}
-
-	//result.ID = uint(id)
-
-	//err = config.DB.Model(&model.Space{}).Preload("Logo").Preload("LogoMobile").Preload("FavIcon").Preload("MobileIcon").First(&result).Error
-
-	// if err != nil {
-	// 	loggerx.Error(err)
-	// 	errorx.Render(w, errorx.Parser(errorx.RecordNotFound()))
-	// 	return
-	// }
-
-	renderx.JSON(w, http.StatusOK, result)
+	renderx.JSON(w, http.StatusOK, spaceObjectforDega)
 }
diff --git a/server/service/core/action/space/my.go b/server/service/core/action/space/my.go
index 3f6fbc056..e7a89ecb5 100644
--- a/server/service/core/action/space/my.go
+++ b/server/service/core/action/space/my.go
@@ -2,14 +2,13 @@ package space
 
 import (
 	"encoding/json"
-	"fmt"
 	"io/ioutil"
 	"net/http"
 	"strconv"
+	"time"
 
-	//"github.com/factly/dega-server/service/core/action/user"
-	//"github.com/factly/dega-server/util"
-	"github.com/jinzhu/gorm/dialects/postgres"
+	"github.com/factly/dega-server/util"
+	"github.com/factly/dega-server/util/timex"
 	"github.com/spf13/viper"
 
 	"github.com/factly/dega-server/config"
@@ -25,18 +24,15 @@ type organisationUser struct {
 	config.Base
 	Role string `gorm:"column:role" json:"role"`
 }
-type policyReq struct {
-	Name        string         `json:"name"`
-	Description string         `json:"description"`
-	Slug        string         `json:"slug"`
-	Permissions postgres.Jsonb `json:"permissions"`
-	Roles       []uint         `json:"roles"`
+
+type organisation struct {
+	config.Base
+	Title string `json:"title"`
+	Slug  string `json:"slug"`
 }
 
 type orgWithSpace struct {
-	config.Base
-	Title        string                 `gorm:"column:title" json:"title"`
-	Slug         string                 `gorm:"column:slug;unique_index" json:"slug"`
+	Organisation organisation           `json:"organisation"`
 	Permission   organisationUser       `json:"permission"`
 	Applications []application          `json:"applications"`
 	Spaces       []spaceWithPermissions `json:"spaces"`
@@ -74,9 +70,8 @@ func my(w http.ResponseWriter, r *http.Request) {
 		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
 		return
 	}
-
 	// Fetched all organisations of the user
-	req, err := http.NewRequest("GET", viper.GetString("kavach_url")+"/organisations/my", nil)
+	req, err := http.NewRequest(http.MethodGet, viper.GetString("kavach_url")+"/organisations/my", nil)
 	if err != nil {
 		loggerx.Error(err)
 		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
@@ -85,7 +80,7 @@ func my(w http.ResponseWriter, r *http.Request) {
 	req.Header.Set("X-User", strconv.Itoa(uID))
 	req.Header.Set("Content-Type", "application/json")
 
-	client := &http.Client{}
+	client := http.Client{Timeout: time.Minute * time.Duration(timex.HTTP_TIMEOUT)}
 	resp, err := client.Do(req)
 
 	if err != nil {
@@ -104,129 +99,76 @@ func my(w http.ResponseWriter, r *http.Request) {
 	allOrg := []orgWithSpace{}
 
 	err = json.Unmarshal(body, &allOrg)
-
 	if err != nil {
 		loggerx.Error(err)
 		errorx.Render(w, errorx.Parser(errorx.DecodeError()))
 		return
 	}
 
-	var allOrgIDs []int
-
-	for _, each := range allOrg {
-		allOrgIDs = append(allOrgIDs, int(each.ID))
-	}
-
-	// Fetched all the spaces related to all the organisations
-
-	var allSpaces = make([]model.Space, 0)
-
-	//	config.DB.Model(model.Space{}).Where("organisation_id IN (?)", allOrgIDs).Preload("Logo").Preload("LogoMobile").Preload("FavIcon").Preload("MobileIcon").Find(&allSpaces)
-
-	for _, org_id := range allOrgIDs {
-		req, err := http.NewRequest("GET", viper.GetString("kavach_url")+"/organisations/"+strconv.Itoa(org_id)+"/applications/"+viper.GetString("dega_application_id")+"/spaces/", nil)
+	for index, organisation := range allOrg {
+		req, err := http.NewRequest("GET", viper.GetString("kavach_url")+"/organisations/"+strconv.Itoa(int(organisation.Organisation.ID))+"/applications/"+viper.GetString("dega_application_id")+"/spaces/", nil)
 		req.Header.Set("X-User", strconv.Itoa(uID))
 		if err != nil {
 			loggerx.Error(err)
 			errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
 			return
 		}
-		client := &http.Client{}
+		client := http.Client{Timeout: time.Minute * time.Duration(timex.HTTP_TIMEOUT)}
 		resp, err := client.Do(req)
 		if err != nil {
 			loggerx.Error(err)
 			errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
 			return
 		}
-		org_spaces := []model.Space{}
-		err = json.NewDecoder(resp.Body).Decode(&org_spaces)
-		if err != nil {
-			loggerx.Error(err)
-			errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
-			return
-		}
-		fmt.Println(org_spaces, "org_spaces_test")
-
-		for _, space := range org_spaces {
-			allSpaces = append(allSpaces, space)
-		}
-
-	}
-	//fetch all the keto policies
-
-	policyList := make([]policyReq, 0)
-	fmt.Println(allSpaces, "allSpaces")
-	for _, space := range allSpaces {
-		fmt.Println("strconv.Itoa(space.OrganisationID)", strconv.Itoa(space.OrganisationID))
-		fmt.Println("+strconv.Itoa(int(space.ID))", strconv.Itoa(int(space.ID)))
-		req, err := http.NewRequest("GET", viper.GetString("kavach_url")+"/organisations/"+strconv.Itoa(space.OrganisationID)+"/applications/"+viper.GetString("dega_application_id")+"/spaces/"+strconv.Itoa(int(space.ID))+"/policy/", nil)
-		req.Header.Set("X-User", strconv.Itoa(uID))
+		defer resp.Body.Close()
+		organisationSpacesfromKavach := []model.KavachSpace{}
+		err = json.NewDecoder(resp.Body).Decode(&organisationSpacesfromKavach)
 		if err != nil {
 			loggerx.Error(err)
 			errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
 			return
 		}
-		client := &http.Client{}
-		resp, err := client.Do(req)
-		if err != nil {
-			loggerx.Error(err)
-			errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
-			return
-		}
-		space_policies := []policyReq{}
-		err = json.NewDecoder(resp.Body).Decode(&space_policies)
-		if err != nil {
-			loggerx.Error(err)
-			errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
-			return
-		}
-		for _, space_policy := range space_policies {
-			policyList = append(policyList, space_policy)
-		}
-	}
-
-	adminPerm := model.Permission{
-		Resource: "admin",
-		Actions:  []string{"admin"},
-	}
-
-	result := make([]orgWithSpace, 0)
-
-	for _, each := range allOrg {
-		spaceWithPermArr := []spaceWithPermissions{}
-		for _, space := range allSpaces {
-			if space.OrganisationID == int(each.ID) {
-				//*need to figure out
-				//	var services []string
-				//	services, err = util.GetAllowedServices(space.ID)
-				if err != nil {
-					loggerx.Error(err)
-					errorx.Render(w, errorx.Parser(errorx.DBError()))
-					return
-				}
-				//**need to figure out
-				// if each.Permission.Role != "owner" {
-				// 	permissions := user.GetPermissions(int(each.ID), int(space.ID), uID, policyList)
-				// 	spaceWithPerm := spaceWithPermissions{
-				// 		Space:           space,
-				// 		Permissions:     permissions,
-				// 		AllowedServices: services,
-				// 	}
-				// 	spaceWithPermArr = append(spaceWithPermArr, spaceWithPerm)
-				// }
-				//else {
-				adminSpaceWithPerm := spaceWithPermissions{
-					Space:           space,
-					Permissions:     []model.Permission{adminPerm},
-					AllowedServices: []string{"core", "fact-checks", "podcast"},
+		organisationSpacesforDega := make([]spaceWithPermissions, 0)
+		for _, eachSpace := range organisationSpacesfromKavach {
+			spaceWithPerm := spaceWithPermissions{}
+			spaceWithPerm.ID = eachSpace.ID
+			spaceWithPerm.CreatedAt = eachSpace.CreatedAt
+			spaceWithPerm.UpdatedAt = eachSpace.UpdatedAt
+			spaceWithPerm.DeletedAt = eachSpace.DeletedAt
+			spaceWithPerm.UpdatedByID = eachSpace.UpdatedByID
+			spaceWithPerm.CreatedByID = eachSpace.CreatedByID
+			spaceWithPerm.Name = eachSpace.Name
+			spaceWithPerm.Slug = eachSpace.Slug
+			spaceWithPerm.Description = eachSpace.Description
+			spaceWithPerm.ApplicationID = eachSpace.ApplicationID
+			spaceWithPerm.OrganisationID = int(eachSpace.OrganisationID)
+			err = json.Unmarshal(eachSpace.Metadata.RawMessage, &spaceWithPerm)
+			if err != nil {
+				loggerx.Error(err)
+				errorx.Render(w, errorx.Parser(errorx.DBError()))
+				return
+			}
+			if organisation.Permission.Role == "owner" {
+				adminPerm := model.Permission{
+					Resource: "admin",
+					Actions:  []string{"admin"},
 				}
-				spaceWithPermArr = append(spaceWithPermArr, adminSpaceWithPerm)
-				//	}
+				spaceWithPerm.Permissions = append(spaceWithPerm.Permissions, adminPerm)
+			} else {
+				spaceWithPerm.Permissions = []model.Permission{}
+			}
+
+			spaceWithPerm.AllowedServices, err = util.GetAllowedServices(eachSpace.ID)
+			if err != nil {
+				loggerx.Error(err)
+				errorx.Render(w, errorx.Parser(errorx.DBError()))
+				return
 			}
+			organisationSpacesforDega = append(organisationSpacesforDega, spaceWithPerm)
 		}
-		each.Spaces = spaceWithPermArr
-		result = append(result, each)
+		organisation.Spaces = organisationSpacesforDega
+		allOrg[index] = organisation
 	}
 
-	renderx.JSON(w, http.StatusOK, result)
+	renderx.JSON(w, http.StatusOK, allOrg)
 }
diff --git a/server/service/core/action/space/update.go b/server/service/core/action/space/update.go
index 4c424038e..673e9eabb 100644
--- a/server/service/core/action/space/update.go
+++ b/server/service/core/action/space/update.go
@@ -4,26 +4,24 @@ import (
 	//"context"
 	"bytes"
 	"encoding/json"
+	"errors"
 	"fmt"
-
-	//"errors"
 	"net/http"
 	"strconv"
-
-	"github.com/spf13/viper"
+	"time"
 
 	"github.com/factly/dega-server/config"
 	"github.com/factly/dega-server/service/core/model"
 	"github.com/factly/dega-server/util"
+	"github.com/factly/dega-server/util/timex"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
 	"github.com/factly/x/meilisearchx"
 	"github.com/factly/x/middlewarex"
 	"github.com/factly/x/renderx"
-
-	//	"github.com/factly/x/slugx"
-	//"github.com/factly/x/validationx"
+	"github.com/factly/x/validationx"
 	"github.com/go-chi/chi"
+	"github.com/spf13/viper"
 )
 
 // update - Update space
@@ -46,180 +44,143 @@ func update(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	spaceID := chi.URLParam(r, "space_id")
-
-	// id, err := strconv.Atoi(spaceID)
-
-	// if err != nil {
-	// 	loggerx.Error(err)
-	// 	errorx.Render(w, errorx.Parser(errorx.InvalidID()))
-	// 	return
-	//}
+	sID := chi.URLParam(r, "space_id")
+	spaceID, err := strconv.Atoi(sID)
 
-	// space := &space{}
-	space := map[string]interface{}{}
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InvalidID()))
+		return
+	}
 
+	space := &model.Space{}
 	err = json.NewDecoder(r.Body).Decode(&space)
-
 	if err != nil {
 		loggerx.Error(err)
 		errorx.Render(w, errorx.Parser(errorx.DecodeError()))
 		return
 	}
 
-	//	validationError := validationx.Check(space)
-
-	// if validationError != nil {
-	// 	loggerx.Error(errors.New("validation error"))
-	// 	errorx.Render(w, validationError)
-	// 	return
-	// }
-
-	spaceOrgID := int(space["organisation_id"].(float64))
-	if spaceOrgID == 0 {
+	space.ID = uint(spaceID)
+	validationError := validationx.Check(space)
+	if validationError != nil {
+		loggerx.Error(errors.New("validation error"))
+		errorx.Render(w, validationError)
 		return
 	}
 
+	requestBody := map[string]interface{}{
+		"name":        space.Name,
+		"slug":        space.Slug,
+		"description": space.Description,
+		"metadata": map[string]interface{}{
+			"meta_fields":        space.MetaFields,
+			"site_address":       space.SiteAddress,
+			"tag_line":           space.TagLine,
+			"site_title":         space.SiteTitle,
+			"logo_id":            space.LogoID,
+			"logo_mobile_id":     space.LogoMobileID,
+			"fav_icon_id":        space.FavIconID,
+			"mobile_icon_id":     space.MobileIconID,
+			"verification_codes": space.VerificationCodes,
+			"social_media_urls":  space.SocialMediaURLs,
+			"contact_info":       space.ContactInfo,
+			"analytics":          space.Analytics,
+			"header_code":        space.HeaderCode,
+			"footer_code":        space.FooterCode,
+		},
+	}
 	buf := new(bytes.Buffer)
-	err = json.NewEncoder(buf).Encode(&space)
-	fmt.Println(space, "spacetestnew")
+	err = json.NewEncoder(buf).Encode(&requestBody)
 	if err != nil {
 		loggerx.Error(err)
 		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
 		return
 	}
 
-	req, err := http.NewRequest("PUT", viper.GetString("kavach_url")+"/organisations/"+strconv.Itoa(spaceOrgID)+"/applications/"+viper.GetString("dega_application_id")+"/spaces/"+spaceID, buf)
+	client := http.Client{Timeout: time.Second * time.Duration(timex.HTTP_TIMEOUT)}
+	req, err := http.NewRequest("PUT", viper.GetString("kavach_url")+"/organisations/"+fmt.Sprintf("%d", space.OrganisationID)+"/applications/"+viper.GetString("dega_application_id")+"/spaces/"+fmt.Sprintf("%d", spaceID), buf)
 	if err != nil {
 		loggerx.Error(err)
 		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
 		return
 	}
-
 	req.Header.Set("X-User", strconv.Itoa(uID))
 	req.Header.Set("Content-Type", "application/json")
 
-	client := &http.Client{}
 	resp, err := client.Do(req)
 	if err != nil {
 		loggerx.Error(err)
 		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
 		return
 	}
+
+	defer resp.Body.Close()
+
 	if resp.StatusCode != 200 {
 		loggerx.Error(err)
 		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
 		return
 	}
-	fmt.Println(resp.Status, "resp status")
-	result := &model.Space{}
-	err = json.NewDecoder(resp.Body).Decode(result)
+	spaceObjectfromKavach := &model.KavachSpace{}
+	err = json.NewDecoder(resp.Body).Decode(spaceObjectfromKavach)
 	if err != nil {
 		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
 		return
 	}
 
-	// err = util.CheckSpaceKetoPermission("update", uint(space.OrganisationID), uint(uID))
-	// if err != nil {
-	// 	loggerx.Error(err)
-	// 	errorx.Render(w, errorx.Parser(errorx.GetMessage(err.Error(), http.StatusUnauthorized)))
-	// 	return
-	// }
-
-	// result := model.Space{}
-	// result.ID = uint(id)
-
-	// check record exists or not
-	//	err = config.DB.First(&result).Error
-
-	// if err != nil {
-	// 	loggerx.Error(err)
-	// 	errorx.Render(w, errorx.Parser(errorx.RecordNotFound()))
-	// 	return
-	// }
-
-	//	tx := config.DB.WithContext(context.WithValue(r.Context(), userContext, uID)).Begin()
-	// var spaceSlug string
-	// if result.Slug == space.Slug {
-	// 	spaceSlug = result.Slug
-	// } else if space.Slug != "" && slugx.Check(space.Slug) {
-	// 	spaceSlug = approveSpaceSlug(space.Slug)
-	// } else {
-	// 	spaceSlug = approveSpaceSlug(slugx.Make(space.Name))
-	// }
-	// updateMap := map[string]interface{}{
-	// 	"name":               space.Name,
-	// 	"slug":               spaceSlug,
-	// 	"site_title":         space.SiteTitle,
-	// 	"tag_line":           space.TagLine,
-	// 	"site_address":       space.SiteAddress,
-	// 	"description":        space.Description,
-	// 	"logo_id":            space.LogoID,
-	// 	"logo_mobile_id":     space.LogoMobileID,
-	// 	"fav_icon_id":        space.FavIconID,
-	// 	"mobile_icon_id":     space.MobileIconID,
-	// 	"header_code":        space.HeaderCode,
-	// 	"footer_code":        space.FooterCode,
-	// 	"meta_fields":        space.MetaFields,
-	// 	"verification_codes": space.VerificationCodes,
-	// 	"social_media_urls":  space.SocialMediaURLs,
-	// 	"contact_info":       space.ContactInfo,
-	// 	"analytics":          space.Analytics,
-	// }
-
-	// check if the id for all the mediums in space is 0 or not if it is zero then make it null
-	// if space.LogoID == 0 {
-	// 	updateMap["logo_id"] = nil
-	// }
-
-	// if space.LogoMobileID == 0 {
-	// 	updateMap["logo_mobile_id"] = nil
-	// }
-
-	// if space.FavIconID == 0 {
-	// 	updateMap["fav_icon_id"] = nil
-	// }
-
-	// if space.MobileIconID == 0 {
-	// 	updateMap["mobile_icon_id"] = nil
-	// }
-
-	// err = tx.Model(&result).Updates(&updateMap).Preload("Logo").Preload("LogoMobile").Preload("FavIcon").Preload("MobileIcon").First(&result).Error
-
-	// if err != nil {
-	// 	tx.Rollback()
-	// 	loggerx.Error(err)
-	// 	errorx.Render(w, errorx.Parser(errorx.DBError()))
-	// 	return
-	// }
+	spaceObjectforDega := model.Space{}
+	spaceObjectforDega.ID = spaceObjectfromKavach.ID
+	spaceObjectforDega.CreatedAt = spaceObjectfromKavach.CreatedAt
+	spaceObjectforDega.UpdatedAt = spaceObjectfromKavach.UpdatedAt
+	spaceObjectforDega.DeletedAt = spaceObjectfromKavach.DeletedAt
+	spaceObjectforDega.CreatedByID = spaceObjectfromKavach.CreatedByID
+	spaceObjectforDega.UpdatedByID = spaceObjectfromKavach.UpdatedByID
+	spaceObjectforDega.Name = spaceObjectfromKavach.Name
+	spaceObjectforDega.Slug = spaceObjectfromKavach.Slug
+	spaceObjectforDega.Description = spaceObjectfromKavach.Description
+	spaceObjectforDega.ApplicationID = spaceObjectfromKavach.ApplicationID
+	spaceObjectforDega.OrganisationID = int(spaceObjectfromKavach.OrganisationID)
+	err = json.Unmarshal(spaceObjectfromKavach.Metadata.RawMessage, &spaceObjectforDega)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.DBError()))
+		return
+	}
 
 	// Update into meili index
 	meiliObj := map[string]interface{}{
-		"id":              result.ID,
+		"id":              sID,
 		"kind":            "space",
-		"name":            result.Name,
-		"slug":            result.Slug,
-		"description":     result.Description,
-		"site_title":      result.SiteTitle,
-		"site_address":    result.SiteAddress,
-		"tag_line":        result.TagLine,
-		"organisation_id": result.OrganisationID,
-		"analytics":       result.Analytics,
+		"name":            spaceObjectforDega.Name,
+		"slug":            spaceObjectforDega.Slug,
+		"description":     spaceObjectforDega.Description,
+		"site_title":      spaceObjectforDega.SiteTitle,
+		"site_address":    spaceObjectforDega.SiteAddress,
+		"tag_line":        spaceObjectforDega.TagLine,
+		"organisation_id": spaceObjectforDega.OrganisationID,
+		"analytics":       spaceObjectforDega.Analytics,
 	}
 
 	if config.SearchEnabled() {
-		_ = meilisearchx.UpdateDocument("dega", meiliObj)
+		err = meilisearchx.UpdateDocument("dega", meiliObj)
+		if err != nil {
+			loggerx.Error(err)
+			errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+			return
+		}
 	}
 
 	//tx.Commit()
 
 	if util.CheckNats() {
-		if err = util.NC.Publish("space.updated", result); err != nil {
+		if err = util.NC.Publish("space.updated", spaceObjectforDega); err != nil {
 			loggerx.Error(err)
 			errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
 			return
 		}
 	}
 
-	renderx.JSON(w, http.StatusOK, result)
+	renderx.JSON(w, http.StatusOK, spaceObjectforDega)
 }
diff --git a/server/service/core/action/user/permission.go b/server/service/core/action/user/permission.go
index a9abc975c..9dc31151a 100644
--- a/server/service/core/action/user/permission.go
+++ b/server/service/core/action/user/permission.go
@@ -7,7 +7,6 @@ import (
 	"strings"
 
 	"github.com/factly/dega-server/util/arrays"
-	"github.com/jinzhu/gorm/dialects/postgres"
 
 	"github.com/factly/x/renderx"
 	"github.com/go-chi/chi"
@@ -33,13 +32,6 @@ import (
 // @Param user_id path string true "User ID"
 // @Success 200 {object} []model.Permission
 // @Router /core/users/{user_id}/permissions [get]
-type policyReq struct {
-	Name        string         `json:"name"`
-	Description string         `json:"description"`
-	Slug        string         `json:"slug"`
-	Permissions postgres.Jsonb `json:"permissions"`
-	Roles       []uint         `json:"roles"`
-}
 
 func userpermissions(w http.ResponseWriter, r *http.Request) {
 	uID, err := middlewarex.GetUser(r.Context())
@@ -71,12 +63,14 @@ func userpermissions(w http.ResponseWriter, r *http.Request) {
 		errorx.Render(w, errorx.Parser(errorx.InvalidID()))
 		return
 	}
-
+	isAdmin, err := util.CheckAdmin(uint(oID), uint(uID))
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InvalidID()))
+		return
+	}
 	var result []model.Permission
 
-	// check if the user is admin of organisation
-	isAdmin := util.CheckSpaceKetoPermission("all", uint(oID), uint(uID))
-
 	// fetch all the keto policies
 	policyList, err := policy.GetAllPolicies()
 	if err != nil {
@@ -85,15 +79,15 @@ func userpermissions(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if isAdmin == nil {
+	if isAdmin {
 		// logged user is admin and user_id is also admin's
 		if id == uID {
-			allPermission := []model.Permission{
+			allPermission := append([]model.Permission{},
 				model.Permission{
 					Resource: "admin",
 					Actions:  []string{"admin"},
-				},
-			}
+				})
+
 			renderx.JSON(w, http.StatusOK, allPermission)
 			return
 		}
diff --git a/server/service/core/model/category.go b/server/service/core/model/category.go
index a616485b3..10f9b9e63 100644
--- a/server/service/core/model/category.go
+++ b/server/service/core/model/category.go
@@ -24,7 +24,6 @@ type Category struct {
 	IsFeatured       bool           `gorm:"column:is_featured" json:"is_featured"`
 	SpaceID          uint           `gorm:"column:space_id" json:"space_id"`
 	Posts            []*Post        `gorm:"many2many:post_categories;" json:"posts"`
-	Space            *Space         `json:"space,omitempty"`
 	MetaFields       postgres.Jsonb `gorm:"column:meta_fields" json:"meta_fields" swaggertype:"primitive,string"`
 	Meta             postgres.Jsonb `gorm:"column:meta" json:"meta" swaggertype:"primitive,string"`
 	HeaderCode       string         `gorm:"column:header_code" json:"header_code"`
diff --git a/server/service/core/model/format.go b/server/service/core/model/format.go
index 6206ecbd2..63f2c94c1 100644
--- a/server/service/core/model/format.go
+++ b/server/service/core/model/format.go
@@ -19,7 +19,6 @@ type Format struct {
 	HeaderCode  string         `gorm:"column:header_code" json:"header_code"`
 	FooterCode  string         `gorm:"column:footer_code" json:"footer_code"`
 	SpaceID     uint           `gorm:"column:space_id" json:"space_id"`
-	Space       *Space         `json:"space,omitempty"`
 }
 
 var formatUser config.ContextKey = "format_user"
diff --git a/server/service/core/model/menu.go b/server/service/core/model/menu.go
index 555fb8097..d137f72df 100644
--- a/server/service/core/model/menu.go
+++ b/server/service/core/model/menu.go
@@ -14,7 +14,6 @@ type Menu struct {
 	Menu       postgres.Jsonb `gorm:"column:menu" json:"menu" swaggertype:"primitive,string"`
 	SpaceID    uint           `gorm:"column:space_id" json:"space_id"`
 	MetaFields postgres.Jsonb `gorm:"column:meta_fields" json:"meta_fields" swaggertype:"primitive,string"`
-	Space      *Space         `json:"space,omitempty"`
 }
 
 var menuUser config.ContextKey = "menu_user"
diff --git a/server/service/core/model/migration.go b/server/service/core/model/migration.go
index 33aa72442..26f582db6 100644
--- a/server/service/core/model/migration.go
+++ b/server/service/core/model/migration.go
@@ -8,7 +8,6 @@ func Migration() {
 		&Medium{},
 		&Category{},
 		&Tag{},
-		&Space{},
 		&Format{},
 		&Post{},
 		&PostAuthor{},
diff --git a/server/service/core/model/policy.go b/server/service/core/model/policy.go
index df2407895..2e6f52f96 100644
--- a/server/service/core/model/policy.go
+++ b/server/service/core/model/policy.go
@@ -1,5 +1,7 @@
 package model
 
+import "github.com/factly/dega-server/config"
+
 // KetoPolicy model
 type KetoPolicy struct {
 	ID          string   `json:"id"`
@@ -30,3 +32,12 @@ type Policy struct {
 	Permissions []Permission `json:"permissions"`
 	Users       []Author     `json:"users"`
 }
+
+type KavachPolicy struct {
+	config.Base
+	Name        string       `json:"name"`
+	Description string       `json:"description"`
+	Permissions []Permission `json:"permissions"`
+	Roles       []SpaceRole  `json:"roles"`
+	SpaceID     uint         `json:"space_id"`
+}
diff --git a/server/service/core/model/post.go b/server/service/core/model/post.go
index 4c5331f8e..f79800e3d 100644
--- a/server/service/core/model/post.go
+++ b/server/service/core/model/post.go
@@ -37,7 +37,6 @@ type Post struct {
 	MetaFields       postgres.Jsonb `gorm:"column:meta_fields" json:"meta_fields" swaggertype:"primitive,string"`
 	Tags             []Tag          `gorm:"many2many:post_tags;" json:"tags"`
 	Categories       []Category     `gorm:"many2many:post_categories;" json:"categories"`
-	Space            *Space         `json:"space,omitempty"`
 }
 
 // PostAuthor model
diff --git a/server/service/core/model/request.go b/server/service/core/model/request.go
index 54ff60935..f819883c6 100644
--- a/server/service/core/model/request.go
+++ b/server/service/core/model/request.go
@@ -31,7 +31,6 @@ type SpacePermissionRequest struct {
 	Podcast   bool   `gorm:"column:podcast" json:"podcast"`
 	FactCheck bool   `gorm:"column:fact_check" json:"fact_check"`
 	SpaceID   uint   `gorm:"column:space_id" json:"space_id"`
-	Space     *Space `gorm:"foreignKey:space_id" json:"space,omitempty"`
 }
 
 var spaceRequestUser config.ContextKey = "space_perm_user"
diff --git a/server/service/core/model/role.go b/server/service/core/model/role.go
index e6fdda76a..e5e081d95 100644
--- a/server/service/core/model/role.go
+++ b/server/service/core/model/role.go
@@ -7,27 +7,26 @@ import (
 
 type SpaceRole struct {
 	config.Base
-	Name        string `gorm:"column:name" json:"name"`
-	Description string `gorm:"column:description" json:"description"`
-	Slug        string `gorm:"column:slug" json:"slug"`
-	SpaceID     uint   `gorm:"column:space_id" json:"space_id"`
-	Space       *Space `gorm:"foreignKey:space_id" json:"space,omitempty"`
-	Users       []User `gorm:"many2many:space_roles_users;" json:"users"`
+	Name        string `json:"name"`
+	Description string `json:"description"`
+	Slug        string `json:"slug"`
+	SpaceID     uint   `json:"space_id"`
+	Users       []User `json:"users"`
 }
 
 type User struct {
 	config.Base
-	Email            string         `gorm:"column:email;uniqueIndex" json:"email"`
-	KID              string         `gorm:"column:kid;" json:"kid"`
-	FirstName        string         `gorm:"column:first_name" json:"first_name"`
-	LastName         string         `gorm:"column:last_name" json:"last_name"`
-	Slug             string         `gorm:"column:slug" json:"slug"`
-	DisplayName      string         `gorm:"column:display_name" json:"display_name"`
-	Gender           string         `gorm:"column:gender" json:"gender"`
-	FeaturedMediumID *uint          `gorm:"column:featured_medium_id;default:NULL" json:"featured_medium_id"`
-	Medium           *Medium        `gorm:"foreignKey:featured_medium_id" json:"medium"`
-	SocialMediaURLs  postgres.Jsonb `gorm:"column:social_media_urls" json:"social_media_urls" swaggertype:"primitive,string"`
-	Description      string         `gorm:"column:description" json:"description"`
-	Meta             postgres.Jsonb `gorm:"column:meta" json:"meta" swaggertype:"primitive,string"`
-	Organisations    []Organisation `gorm:"many2many:organisation_users;" json:"organisations"`
+	Email            string         `json:"email"`
+	KID              string         `json:"kid"`
+	FirstName        string         `json:"first_name"`
+	LastName         string         `json:"last_name"`
+	Slug             string         `json:"slug"`
+	DisplayName      string         `json:"display_name"`
+	Gender           string         `json:"gender"`
+	FeaturedMediumID *uint          `json:"featured_medium_id"`
+	Medium           *Medium        `json:"medium"`
+	SocialMediaURLs  postgres.Jsonb `json:"social_media_urls" swaggertype:"primitive,string"`
+	Description      string         `json:"description"`
+	Meta             postgres.Jsonb `json:"meta"`
+	Organisations    []Organisation `json:"organisations"`
 }
diff --git a/server/service/core/model/space.go b/server/service/core/model/space.go
index e4682f211..38a1fd3f6 100644
--- a/server/service/core/model/space.go
+++ b/server/service/core/model/space.go
@@ -34,6 +34,7 @@ type Space struct {
 	FooterCode        string         `gorm:"column:footer_code" json:"footer_code"`
 	MetaFields        postgres.Jsonb `gorm:"column:meta_fields" json:"meta_fields" swaggertype:"primitive,string"`
 	OrganisationID    int            `gorm:"column:organisation_id" json:"organisation_id"`
+	ApplicationID     uint           `gorm:"application_id" json:"application_id"`
 }
 
 // SpacePermission model
@@ -41,7 +42,6 @@ type SpacePermission struct {
 	config.Base
 	FactCheck bool   `gorm:"column:fact_check" json:"fact_check"`
 	SpaceID   uint   `gorm:"column:space_id" json:"space_id"`
-	Space     *Space `gorm:"foreignKey:space_id" json:"space,omitempty"`
 	Media     int64  `gorm:"column:media" json:"media"`
 	Posts     int64  `gorm:"column:posts" json:"posts"`
 	Podcast   bool   `gorm:"column:podcast" json:"podcast"`
@@ -49,6 +49,15 @@ type SpacePermission struct {
 	Videos    int64  `gorm:"column:videos" json:"videos"`
 }
 
+type KavachSpace struct {
+	config.Base
+	Name           string         `json:"name"`
+	Slug           string         `json:"slug"`
+	Description    string         `json:"description"`
+	ApplicationID  uint           `json:"application_id"`
+	OrganisationID uint           `json:"organisation_id"`
+	Metadata       postgres.Jsonb `json:"metadata"`
+}
 var spaceUser config.ContextKey = "space_user"
 var spacePermissionUser config.ContextKey = "space_perm_user"
 
diff --git a/server/service/core/model/tag.go b/server/service/core/model/tag.go
index 4971d3162..5a960a137 100644
--- a/server/service/core/model/tag.go
+++ b/server/service/core/model/tag.go
@@ -19,7 +19,6 @@ type Tag struct {
 	MediumID         *uint          `gorm:"column:medium_id;default:NULL" json:"medium_id"`
 	Medium           *Medium        `json:"medium"`
 	SpaceID          uint           `gorm:"column:space_id" json:"space_id"`
-	Space            *Space         `json:"space,omitempty"`
 	Posts            []*Post        `gorm:"many2many:post_tags;" json:"posts"`
 	Meta             postgres.Jsonb `gorm:"column:meta" json:"meta" swaggertype:"primitive,string"`
 	HeaderCode       string         `gorm:"column:header_code" json:"header_code"`
diff --git a/server/service/fact-check/action/google/list.go b/server/service/fact-check/action/google/list.go
index 78da1624d..6d1173378 100644
--- a/server/service/fact-check/action/google/list.go
+++ b/server/service/fact-check/action/google/list.go
@@ -6,9 +6,11 @@ import (
 	"io/ioutil"
 	"net/http"
 	"net/url"
+	"time"
 
 	"github.com/spf13/viper"
 
+	"github.com/factly/dega-server/util/timex"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
 	"github.com/factly/x/renderx"
@@ -72,7 +74,7 @@ func list(w http.ResponseWriter, r *http.Request) {
 
 	req.URL.RawQuery = q.Encode()
 
-	client := &http.Client{}
+	client := http.Client{Timeout: time.Minute * time.Duration(timex.HTTP_TIMEOUT)}
 	resp, err := client.Do(req)
 
 	if err != nil {
diff --git a/server/service/fact-check/model/claim.go b/server/service/fact-check/model/claim.go
index 798f866ce..74b123dbf 100644
--- a/server/service/fact-check/model/claim.go
+++ b/server/service/fact-check/model/claim.go
@@ -32,7 +32,6 @@ type Claim struct {
 	ReviewSources   postgres.Jsonb `gorm:"column:review_sources" json:"review_sources" swaggertype:"primitive,string"`
 	MetaFields      postgres.Jsonb `gorm:"column:meta_fields" json:"meta_fields" swaggertype:"primitive,string"`
 	SpaceID         uint           `gorm:"column:space_id" json:"space_id"`
-	Space           *model.Space   `json:"space,omitempty"`
 	VideoID         *uint          `gorm:"column:video_id" json:"video_id"`
 	Video           *Video         `json:"video"`
 	EndTime         int            `gorm:"column:end_time" json:"end_time"`
diff --git a/server/service/fact-check/model/claimant.go b/server/service/fact-check/model/claimant.go
index 462043551..24516865b 100644
--- a/server/service/fact-check/model/claimant.go
+++ b/server/service/fact-check/model/claimant.go
@@ -23,7 +23,6 @@ type Claimant struct {
 	Medium          *model.Medium  `json:"medium"`
 	MetaFields      postgres.Jsonb `gorm:"column:meta_fields" json:"meta_fields" swaggertype:"primitive,string"`
 	SpaceID         uint           `gorm:"column:space_id" json:"space_id"`
-	Space           *model.Space   `json:"space,omitempty"`
 	Meta            postgres.Jsonb `gorm:"column:meta" json:"meta" swaggertype:"primitive,string"`
 	HeaderCode      string         `gorm:"column:header_code" json:"header_code"`
 	FooterCode      string         `gorm:"column:footer_code" json:"footer_code"`
diff --git a/server/service/fact-check/model/rating.go b/server/service/fact-check/model/rating.go
index 178bf1b9c..1308edbcb 100644
--- a/server/service/fact-check/model/rating.go
+++ b/server/service/fact-check/model/rating.go
@@ -24,7 +24,6 @@ type Rating struct {
 	Medium           *model.Medium  `json:"medium"`
 	MetaFields       postgres.Jsonb `gorm:"column:meta_fields" json:"meta_fields" swaggertype:"primitive,string"`
 	SpaceID          uint           `gorm:"column:space_id" json:"space_id"`
-	Space            *model.Space   `json:"space,omitempty"`
 	Meta             postgres.Jsonb `gorm:"column:meta" json:"meta" swaggertype:"primitive,string"`
 	HeaderCode       string         `gorm:"column:header_code" json:"header_code"`
 	FooterCode       string         `gorm:"column:footer_code" json:"footer_code"`
diff --git a/server/service/podcast/model/episode.go b/server/service/podcast/model/episode.go
index 4c4b30199..0125c832d 100644
--- a/server/service/podcast/model/episode.go
+++ b/server/service/podcast/model/episode.go
@@ -30,7 +30,6 @@ type Episode struct {
 	HeaderCode      string         `gorm:"column:header_code" json:"header_code"`
 	FooterCode      string         `gorm:"column:footer_code" json:"footer_code"`
 	SpaceID         uint           `gorm:"column:space_id" json:"space_id"`
-	Space           *model.Space   `json:"space,omitempty"`
 }
 
 // EpisodeAuthor model
diff --git a/server/service/podcast/model/podcast.go b/server/service/podcast/model/podcast.go
index ddb56b978..4252425d9 100644
--- a/server/service/podcast/model/podcast.go
+++ b/server/service/podcast/model/podcast.go
@@ -27,7 +27,6 @@ type Podcast struct {
 	MetaFields        postgres.Jsonb   `gorm:"column:meta_fields" json:"meta_fields" swaggertype:"primitive,string"`
 	Meta              postgres.Jsonb   `gorm:"column:meta" json:"meta" swaggertype:"primitive,string"`
 	SpaceID           uint             `gorm:"column:space_id" json:"space_id"`
-	Space             *model.Space     `json:"space,omitempty"`
 }
 
 // BeforeSave - validation for medium
diff --git a/server/service/reindex/all.go b/server/service/reindex/all.go
index 0faa2e2a0..fc4f7a178 100644
--- a/server/service/reindex/all.go
+++ b/server/service/reindex/all.go
@@ -27,13 +27,18 @@ func all(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	err = util.CheckSpaceKetoPermission("create", uint(oID), uint(uID))
+	isAdmin, err := util.CheckAdmin(uint(oID), uint(uID))
 	if err != nil {
 		loggerx.Error(err)
-		errorx.Render(w, errorx.Parser(errorx.GetMessage(err.Error(), http.StatusUnauthorized)))
+		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
 		return
 	}
 
+	if !isAdmin {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
+		return
+	}
 	_, err = meilisearchx.Client.Index("dega").DeleteAllDocuments()
 	if err != nil {
 		loggerx.Error(err)
diff --git a/server/service/reindex/space.go b/server/service/reindex/space.go
index 081439e65..7ac3d212f 100644
--- a/server/service/reindex/space.go
+++ b/server/service/reindex/space.go
@@ -1,14 +1,17 @@
 package reindex
 
 import (
+	"encoding/json"
 	"fmt"
 	"log"
 	"net/http"
 	"strconv"
+	"time"
 
 	"github.com/factly/dega-server/config"
 	"github.com/factly/dega-server/service/core/model"
 	"github.com/factly/dega-server/util"
+	"github.com/factly/dega-server/util/timex"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
 	"github.com/factly/x/meilisearchx"
@@ -16,10 +19,10 @@ import (
 	"github.com/factly/x/renderx"
 	"github.com/go-chi/chi"
 	"github.com/meilisearch/meilisearch-go"
+	"github.com/spf13/viper"
 )
 
 func space(w http.ResponseWriter, r *http.Request) {
-
 	spaceID := chi.URLParam(r, "space_id")
 	sID, err := strconv.Atoi(spaceID)
 	if err != nil {
@@ -35,6 +38,30 @@ func space(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	req, err := http.NewRequest(http.MethodGet, viper.GetString("kavach_url")+fmt.Sprintf("/util/space/%d/getOrganisation", sID), nil)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+
+	req.Header.Set("X-User", fmt.Sprintf("%d", uID))
+	client := http.Client{Timeout: time.Minute * time.Duration(timex.HTTP_TIMEOUT)}
+	response, err := client.Do(req)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+	defer response.Body.Close()
+	responseBody := map[string]interface{}{}
+	err = json.NewDecoder(response.Body).Decode(&responseBody)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+	oID := int(responseBody["organisation_id"].(float64))
 	space := model.Space{}
 	space.ID = uint(sID)
 
@@ -45,24 +72,29 @@ func space(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	err = util.CheckSpaceKetoPermission("create", uint(space.OrganisationID), uint(uID))
+	isAdmin, err := util.CheckAdmin(uint(oID), uint(uID))
 	if err != nil {
 		loggerx.Error(err)
 		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
 		return
 	}
 
+	if !isAdmin {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
+		return
+	}
+
 	res, err := meilisearchx.Client.Index("dega").Search("", &meilisearch.SearchRequest{
 		Filter: "space_id=" + fmt.Sprint(sID),
-		Limit:   100000,
+		Limit:  100000,
 	})
 
 	if err != nil {
 		log.Println(err)
 	}
 
-	
-	if res!=nil{
+	if res != nil {
 		hits := res.Hits
 		if len(hits) > 0 {
 
diff --git a/server/service/route.go b/server/service/route.go
index 66396cc43..bf9653bdc 100644
--- a/server/service/route.go
+++ b/server/service/route.go
@@ -60,13 +60,22 @@ func RegisterRoutes() http.Handler {
 		"meilisearch": util.MeiliChecker,
 	})
 
+	//Earlier
+	// r.With(middlewarex.CheckUser, middlewarex.CheckSpace(1), util.GenerateOrganisation, middlewarex.CheckAccess("dega", 1, util.GetOrganisation)).Group(func(r chi.Router) {
+	// 	r.Mount("/core", core.Router())
+	// 	r.With(util.FactCheckPermission).Mount("/fact-check", factCheck.Router())
+	// 	r.With(util.PodcastPermission).Mount("/podcast", podcast.Router())
+	// 	r.Mount("/reindex", reindex.Router())
+	// })
+
+	// After Latest kavach changes
 	r.With(middlewarex.CheckUser, middlewarex.CheckSpace(1), util.GenerateOrganisation, middlewarex.CheckAccess("dega", 1, util.GetOrganisation)).Group(func(r chi.Router) {
 		r.Mount("/core", core.Router())
 		r.With(util.FactCheckPermission).Mount("/fact-check", factCheck.Router())
 		r.With(util.PodcastPermission).Mount("/podcast", podcast.Router())
 		r.Mount("/reindex", reindex.Router())
 	})
-
+	
 	r.With(middlewarex.CheckUser).Group(func(r chi.Router) {
 		r.Post("/core/requests/organisations", organisation.Create)
 		r.With(middlewarex.CheckSpace(1)).Post("/core/requests/spaces", space.Create)
diff --git a/server/service/user/route.go b/server/service/user/route.go
index 7400f6da2..cb913ed6c 100644
--- a/server/service/user/route.go
+++ b/server/service/user/route.go
@@ -3,7 +3,9 @@ package user
 import (
 	"encoding/json"
 	"net/http"
+	"time"
 
+	"github.com/factly/dega-server/util/timex"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/renderx"
 	"github.com/go-chi/chi"
@@ -45,7 +47,7 @@ func redirectToKavach(w http.ResponseWriter, r *http.Request) {
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("X-USer", header.Get("X-User"))
 
-	client := &http.Client{}
+	client := http.Client{Timeout: time.Minute * time.Duration(timex.HTTP_TIMEOUT)}
 	resp, err := client.Do(req)
 	if err != nil {
 		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
diff --git a/server/util/getservices.go b/server/util/getservices.go
index 5382fce8a..9205fa906 100644
--- a/server/util/getservices.go
+++ b/server/util/getservices.go
@@ -12,8 +12,10 @@ func GetAllowedServices(spaceID uint) ([]string, error) {
 		SpaceID: spaceID,
 	}).First(spacePermission).Error
 	if err != nil {
-		loggerx.Error(err)
-		return nil, err
+		if !(err.Error() == "record not found") {
+			loggerx.Error(err)
+			return nil, err
+		}
 	}
 
 	var serviceList []string
diff --git a/server/util/healthCheckers.go b/server/util/healthCheckers.go
index 7aa9b58be..e3594e57c 100644
--- a/server/util/healthCheckers.go
+++ b/server/util/healthCheckers.go
@@ -3,7 +3,9 @@ package util
 import (
 	"errors"
 	"net/http"
+	"time"
 
+	"github.com/factly/dega-server/util/timex"
 	"github.com/spf13/viper"
 )
 
@@ -36,7 +38,7 @@ func GetRequest(url string) error {
 	}
 	req.Header.Set("Content-Type", "application/json")
 
-	client := &http.Client{}
+	client := http.Client{Timeout: time.Minute * time.Duration(timex.HTTP_TIMEOUT)}
 	res, err := client.Do(req)
 	if err != nil {
 		return err
diff --git a/server/util/keto.go b/server/util/keto.go
index fc6f38aa0..0793e5285 100644
--- a/server/util/keto.go
+++ b/server/util/keto.go
@@ -2,7 +2,9 @@ package util
 
 import (
 	"net/http"
+	"time"
 
+	"github.com/factly/dega-server/util/timex"
 	"github.com/spf13/viper"
 )
 
@@ -14,7 +16,7 @@ func KetoGetRequest(path string) (*http.Response, error) {
 	}
 	req.Header.Set("Content-Type", "application/json")
 
-	client := &http.Client{}
+	client := http.Client{Timeout: time.Minute * time.Duration(timex.HTTP_TIMEOUT)}
 	resp, err := client.Do(req)
 	if err != nil {
 		return nil, err
diff --git a/server/util/organisation.go b/server/util/organisation.go
index 46c41c94a..d6f8f6a62 100644
--- a/server/util/organisation.go
+++ b/server/util/organisation.go
@@ -5,8 +5,10 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
+	"time"
 
 	"github.com/factly/dega-server/service/core/model"
+	"github.com/factly/dega-server/util/timex"
 	"github.com/spf13/viper"
 )
 
@@ -29,7 +31,7 @@ func GetAllOrganisationsMap(q string) (map[uint]model.Organisation, error) {
 	}
 	req.Header.Set("Content-Type", "application/json")
 
-	client := &http.Client{}
+	client := http.Client{Timeout: time.Minute * time.Duration(timex.HTTP_TIMEOUT)}
 	resp, err := client.Do(req)
 	if err != nil {
 		return nil, err
@@ -72,7 +74,7 @@ func CheckOwnerFromKavach(uID, oID int) (bool, error) {
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("X-User", fmt.Sprint(uID))
 
-	client := &http.Client{}
+	client := http.Client{Timeout: time.Minute * time.Duration(timex.HTTP_TIMEOUT)}
 	resp, err := client.Do(req)
 	if err != nil {
 		return false, err
diff --git a/server/util/organisationID.go b/server/util/organisationID.go
index a1cca5b2a..cb8a631ca 100644
--- a/server/util/organisationID.go
+++ b/server/util/organisationID.go
@@ -2,13 +2,20 @@ package util
 
 import (
 	"context"
+	"encoding/json"
 	"errors"
+	"fmt"
 	"net/http"
 	"strings"
+	"time"
 
 	//	"github.com/factly/dega-server/config"
-	"github.com/factly/dega-server/service/core/model"
+
+	"github.com/factly/dega-server/util/timex"
+	"github.com/factly/x/errorx"
+	"github.com/factly/x/loggerx"
 	"github.com/factly/x/middlewarex"
+	"github.com/spf13/viper"
 )
 
 type ctxKeyOrganisationID int
@@ -28,13 +35,23 @@ func GenerateOrganisation(h http.Handler) http.Handler {
 				w.WriteHeader(http.StatusUnauthorized)
 				return
 			}
+
+			userID, err := middlewarex.GetUser(r.Context())
+			if err != nil {
+				loggerx.Error(err)
+				errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+				return
+			}
+
 			//** need to make change in x-package if space id is given organisation should be returned
-			space := &model.Space{
-				OrganisationID: 1,
+			organisationID, err := GetOrganisationIDfromSpaceID(uint(sID), uint(userID))
+			if err != nil {
+				loggerx.Error(err)
+				errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+				return
 			}
-			space.ID = uint(sID)
 
-			ctx = context.WithValue(ctx, OrganisationIDKey, space.OrganisationID)
+			ctx = context.WithValue(ctx, OrganisationIDKey, organisationID)
 			h.ServeHTTP(w, r.WithContext(ctx))
 			return
 		}
@@ -53,3 +70,29 @@ func GetOrganisation(ctx context.Context) (int, error) {
 	}
 	return 0, errors.New("something went wrong")
 }
+
+func GetOrganisationIDfromSpaceID(spaceID, userID uint) (int, error) {
+	//** need to make change in x-package if space id is given organisation should be returned
+	req, err := http.NewRequest(http.MethodGet, viper.GetString("kavach_url")+fmt.Sprintf("/util/space/%d/getOrganisation", spaceID), nil)
+	if err != nil {
+		return 0, err
+	}
+	req.Header.Set("X-User", fmt.Sprintf("%d", userID))
+	client := http.Client{Timeout: time.Minute * time.Duration(timex.HTTP_TIMEOUT)}
+	response, err := client.Do(req)
+	if err != nil {
+		return 0, err
+	}
+	defer response.Body.Close()
+	responseBody := map[string]interface{}{}
+	err = json.NewDecoder(response.Body).Decode(&responseBody)
+	if err != nil {
+		return 0, err
+	}
+
+	if response.StatusCode != 200 {
+		return 0, errors.New("internal server error on kavach while getting space id from organisation id")
+	}
+	organisationID := int(responseBody["organisation_id"].(float64))
+	return organisationID, nil
+}
diff --git a/server/util/policy.go b/server/util/policy.go
index e7579ceb6..c0b2737ab 100644
--- a/server/util/policy.go
+++ b/server/util/policy.go
@@ -6,16 +6,19 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
+	"time"
 
+	"github.com/factly/dega-server/util/timex"
 	"github.com/factly/x/middlewarex"
 	"github.com/spf13/viper"
 )
 
 // KetoAllowed is request object to check permissions of user
 type KetoAllowed struct {
-	Subject  string `json:"subject"`
-	Action   string `json:"action"`
-	Resource string `json:"resource"`
+	Subject     string `json:"subject"`
+	Action      string `json:"action"`
+	Resource    string `json:"resource"`
+	SubjectType string `json:"subject_type"`
 }
 
 // CheckKetoPolicy returns middleware that checks the permissions of user from keto server
@@ -36,24 +39,18 @@ func CheckKetoPolicy(entity, action string) func(h http.Handler) http.Handler {
 				return
 			}
 			oID, err := GetOrganisation(ctx)
-
 			if err != nil {
 				w.WriteHeader(http.StatusUnauthorized)
 				return
 			}
 
-			commonString := fmt.Sprint(":org:", oID, ":app:dega:space:", sID, ":")
-
-			kresource := fmt.Sprint("resources", commonString, entity)
-			kaction := fmt.Sprint("actions", commonString, entity, ":", action)
-
 			result := KetoAllowed{}
 
-			result.Action = kaction
-			result.Resource = kresource
+			result.Action = action
+			result.Resource = entity
 			result.Subject = fmt.Sprint(uID)
-
-			resStatus, err := IsAllowed(result)
+			result.SubjectType = "id"
+			resStatus, err := IsAllowed(result, uint(oID), uint(sID), uint(uID))
 			if err != nil {
 				w.WriteHeader(http.StatusUnauthorized)
 				return
@@ -69,48 +66,66 @@ func CheckKetoPolicy(entity, action string) func(h http.Handler) http.Handler {
 	}
 }
 
-// CheckSpaceKetoPermission checks keto policy for operations on space
-func CheckSpaceKetoPermission(action string, oID, uID uint) error {
-	commonString := fmt.Sprint(":org:", oID, ":app:dega:spaces")
-
-	kresource := fmt.Sprint("resources", commonString)
-	kaction := fmt.Sprint("actions", commonString, ":", action)
-
-	result := KetoAllowed{}
+func CheckAdmin(orgID, uID uint) (bool, error) {
+	requestBody := map[string]interface{}{
+		"namespace":  "organisations",
+		"object":     fmt.Sprintf("org:%d", orgID),
+		"relation":   "owner",
+		"subject_id": fmt.Sprintf("%d", uID),
+	}
 
-	result.Action = kaction
-	result.Resource = kresource
-	result.Subject = fmt.Sprint(uID)
+	buf := new(bytes.Buffer)
+	err := json.NewEncoder(buf).Encode(&requestBody)
+	if err != nil {
+		return false, err
+	}
+	req, err := http.NewRequest("POST", viper.GetString("keto_url")+"/relation-tuples/check", buf)
+	if err != nil {
+		return false, err
+	}
 
-	resStatus, err := IsAllowed(result)
+	client := http.Client{Timeout: time.Minute * time.Duration(timex.HTTP_TIMEOUT)}
+	response, err := client.Do(req)
 	if err != nil {
-		return err
+		return false, err
+	}
+	defer response.Body.Close()
+	responseBody := make(map[string]interface{})
+	err = json.NewDecoder(response.Body).Decode(&responseBody)
+	if err != nil {
+		return false, err
 	}
 
-	if resStatus != 200 {
-		return errors.New("Permission not granted")
+	if !(response.StatusCode == 200 || response.StatusCode == 403) {
+		return false, errors.New("error in checking the authorization the relation tuple")
 	}
-	return nil
+	return responseBody["allowed"].(bool), nil
 }
 
 // IsAllowed checks if keto policy allows user to action on resource
-func IsAllowed(result KetoAllowed) (int, error) {
+func IsAllowed(result KetoAllowed, orgID, spaceID, userID uint) (int, error) {
+	isAdmin, err := CheckAdmin(orgID, userID)
+	if err != nil {
+		return 0, err
+	}
+	if isAdmin {
+		return http.StatusOK, nil
+	}
 	buf := new(bytes.Buffer)
-
-	err := json.NewEncoder(buf).Encode(&result)
+	err = json.NewEncoder(buf).Encode(&result)
 	if err != nil {
 		return 0, err
 	}
 
-	req, err := http.NewRequest("POST", viper.GetString("keto_url")+"/engines/acp/ory/regex/allowed", buf)
+	req, err := http.NewRequest("POST", viper.GetString("kavach_url")+fmt.Sprintf("/organisations/%d/applications/%s/spaces/%d/policy/allowed", orgID, viper.GetString("dega_application_id"), spaceID), buf)
 	if err != nil {
 		return 0, err
 	}
+	req.Header.Set("X-User", fmt.Sprintf("%d", userID))
 	req.Header.Set("Content-Type", "application/json")
 
-	client := &http.Client{}
+	client := http.Client{Timeout: time.Minute * time.Duration(timex.HTTP_TIMEOUT)}
 	resp, err := client.Do(req)
-
 	if err != nil {
 		return 0, err
 	}
diff --git a/server/util/space.go b/server/util/space.go
new file mode 100644
index 000000000..f9c45e3a8
--- /dev/null
+++ b/server/util/space.go
@@ -0,0 +1,52 @@
+package util
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"time"
+
+	"github.com/factly/dega-server/service/core/model"
+	"github.com/factly/dega-server/util/timex"
+	"github.com/spf13/viper"
+)
+
+func GetSpacefromKavach(userID, orgID, spaceID uint) (*model.Space, error) {
+	req, err := http.NewRequest("GET", viper.GetString("kavach_url")+fmt.Sprintf("/organisations/%d/applications/", orgID)+viper.GetString("dega_application_id")+"/spaces/"+fmt.Sprintf("%d", spaceID), nil)
+	if err != nil {
+		return nil, err
+	}
+
+	req.Header.Set("X-User", fmt.Sprintf("%d", userID))
+	req.Header.Set("Content-Type", "application/json")
+
+	client := http.Client{Timeout: time.Second * time.Duration(timex.HTTP_TIMEOUT)}
+	resp, err := client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	spaceObjectfromKavach := &model.KavachSpace{}
+	err = json.NewDecoder(resp.Body).Decode(spaceObjectfromKavach)
+	if err != nil {
+		return nil, err
+	}
+
+	spaceObjectforDega := &model.Space{}
+	spaceObjectforDega.ID = spaceObjectfromKavach.ID
+	spaceObjectforDega.CreatedAt = spaceObjectfromKavach.CreatedAt
+	spaceObjectforDega.UpdatedAt = spaceObjectfromKavach.UpdatedAt
+	spaceObjectforDega.DeletedAt = spaceObjectfromKavach.DeletedAt
+	spaceObjectforDega.CreatedByID = spaceObjectfromKavach.CreatedByID
+	spaceObjectforDega.UpdatedByID = spaceObjectfromKavach.UpdatedByID
+	spaceObjectforDega.Name = spaceObjectfromKavach.Name
+	spaceObjectforDega.Slug = spaceObjectfromKavach.Slug
+	spaceObjectforDega.Description = spaceObjectfromKavach.Description
+	spaceObjectforDega.ApplicationID = spaceObjectfromKavach.ApplicationID
+	spaceObjectforDega.OrganisationID = int(spaceObjectfromKavach.OrganisationID)
+	err = json.Unmarshal(spaceObjectfromKavach.Metadata.RawMessage, &spaceObjectforDega)
+	if err != nil {
+		return nil, err
+
+	}
+	return spaceObjectforDega, nil
+}
diff --git a/server/util/timex/time.go b/server/util/timex/time.go
new file mode 100644
index 000000000..7fef2c33d
--- /dev/null
+++ b/server/util/timex/time.go
@@ -0,0 +1,3 @@
+package timex
+
+var HTTP_TIMEOUT = 10
diff --git a/studio/src/actions/roles.js b/studio/src/actions/roles.js
index 380efd0aa..082b09a5d 100644
--- a/studio/src/actions/roles.js
+++ b/studio/src/actions/roles.js
@@ -11,46 +11,18 @@ import {
 import { addErrorNotification, addSuccessNotification } from './notifications';
 import getError from '../utils/getError';
 
-// action to fetch all roles
-// export const addDefaultRoles = (query) => {
-//   return (dispatch) => {
-//     dispatch(loadingRoles());
-//     return axios
-//       .post(ROLES_API + '/default')
-//       .then((response) => {
-//         dispatch(addRoles(response.data.nodes));
-//         dispatch(
-//           addRolesRequest({
-//             data: response.data.nodes.map((item) => item.id),
-//             query: query,
-//             total: response.data.total,
-//           }),
-//         );
-//       })
-//       .catch((error) => {
-//         dispatch(addErrorNotification(getError(error)));
-//       })
-//       .finally(() => dispatch(stopRolesLoading()));
-//   };
-// };
-
 // action to fetch all roles
 export const getRoles = (query) => {
   return (dispatch, getState) => {
     const currentSpaceID = getState().spaces?.selected;
-    const currentOrgID = getState().spaces?.details[currentSpaceID].organisation_id;
-    const params = new URLSearchParams();
-    params.append('organisation_id', currentOrgID);
     dispatch(loadingRoles());
     return axios
-      .get(ROLES_API(currentSpaceID), {
-        params: params,
-      })
+      .get(ROLES_API(currentSpaceID))
       .then((response) => {
-        dispatch(addRoles(response.data.nodes));
+        dispatch(addRoles(response.data));
         dispatch(
           addRolesRequest({
-            data: response.data.nodes.map((item) => item.id),
+            data: response.data.map((item) => item.id),
             query: query,
             total: response.data.total,
           }),
@@ -84,13 +56,12 @@ export const getRole = (id) => {
 export const createRole = (data) => {
   return (dispatch, getState) => {
     const currentSpaceID = getState().spaces?.selected;
-    const currentOrgID = getState().spaces?.details[currentSpaceID].organisation_id;
     dispatch(loadingRoles());
     return axios
-      .post(ROLES_API(currentSpaceID), { role: data, organisation_id: currentOrgID })
+      .post(ROLES_API(currentSpaceID), data)
       .then(() => {
         dispatch(resetRoles());
-        dispatch(addSuccessNotification('Roles created'));
+        dispatch(addSuccessNotification('Role created'));
       })
       .catch((error) => {
         dispatch(addErrorNotification(getError(error)));
@@ -119,16 +90,20 @@ export const updateRole = (data) => {
 
 // action to delete role by id
 export const deleteRole = (id) => {
-  return (dispatch) => {
+  return (dispatch, getState) => {
+    const currentSpaceID = getState().spaces?.selected;
     dispatch(loadingRoles());
     return axios
-      .delete(ROLES_API + '/' + id)
+      .delete(ROLES_API(currentSpaceID) + '/' + id)
       .then(() => {
         dispatch(resetRoles());
         dispatch(addSuccessNotification('Roles deleted'));
       })
       .catch((error) => {
         dispatch(addErrorNotification(getError(error)));
+      })
+      .finally(() => {
+        dispatch(stopRolesLoading());
       });
   };
 };
diff --git a/studio/src/components/GlobalNav/Sidebar.js b/studio/src/components/GlobalNav/Sidebar.js
index aef378727..ce9079e46 100644
--- a/studio/src/components/GlobalNav/Sidebar.js
+++ b/studio/src/components/GlobalNav/Sidebar.js
@@ -166,7 +166,7 @@ function Sidebar({ superOrg, permission, orgs, loading, applications, services,
               : permission.filter((each) => each.resource === 'admin').length > 0
               ? getSubMenuItems(menu, index, Icon)
               : null
-            : services.includes(maker(menu.title))
+            : services?.includes(maker(menu.title))
             ? getSubMenuItems(menu, index, Icon)
             : null;
         })}
diff --git a/studio/src/config/routesConfig.js b/studio/src/config/routesConfig.js
index 9c85ea584..952eae8ca 100644
--- a/studio/src/config/routesConfig.js
+++ b/studio/src/config/routesConfig.js
@@ -145,6 +145,7 @@ import Permissions from '../pages/permissions';
 //Reindex
 import Reindex from '../pages/spaces/Reindex';
 import { Component } from 'react';
+import ViewPolicy from '../pages/policies/components/ViewPolicy';
 
 const routes = {
   dashboard: {
@@ -426,6 +427,12 @@ const routes = {
       action: 'create',
     },
   },
+  ViewPolicy: {
+    path: '/members/policies/:policyID/view',
+    menuKey: '/members',
+    Component: ViewPolicy,
+    title: 'Policy',
+  },
   createRole: {
     path: '/members/roles/create',
     menuKey: '/members',
diff --git a/studio/src/pages/policies/CreatePolicy.js b/studio/src/pages/policies/CreatePolicy.js
index 542d4d323..d8859db7e 100644
--- a/studio/src/pages/policies/CreatePolicy.js
+++ b/studio/src/pages/policies/CreatePolicy.js
@@ -10,8 +10,8 @@ function CreatePolicy() {
 
   const dispatch = useDispatch();
   const onCreate = (values) => {
-    values.users = values.users.map((item) => item.toString());
-    values.permissions = values.permissions.filter(
+    console.log(values);
+    values.permissions = values.permissions?.filter(
       (item) => item && item.resource && item.actions.length > 0,
     );
     dispatch(createPolicy(values)).then(() => history.push('/members/policies'));
diff --git a/studio/src/pages/policies/components/PolicyForm.js b/studio/src/pages/policies/components/PolicyForm.js
index 824757903..cc07ddbaa 100644
--- a/studio/src/pages/policies/components/PolicyForm.js
+++ b/studio/src/pages/policies/components/PolicyForm.js
@@ -105,7 +105,6 @@ function PolicyForm({ data = {}, onCreate }) {
           permissions: Object.keys(values.permissions)
             .filter((key) => values.permissions[key] && values.permissions[key].length > 0)
             .map((key) => ({ resource: key, actions: values.permissions[key] })),
-          users: values.users.map((item) => item.toString()),
         })
       }
       onValuesChange={() => {
@@ -120,8 +119,8 @@ function PolicyForm({ data = {}, onCreate }) {
           </Form.Item>
         </Col>
         <Col span={12}>
-          <Form.Item name="users" label="Users">
-            <Selector mode="multiple" display={'display_name'} action="Authors" />
+          <Form.Item name="roles" label="Roles">
+            <Selector mode="multiple" display={'name'} action="Roles" />
           </Form.Item>
         </Col>
       </Row>
diff --git a/studio/src/pages/policies/components/PolicyList.js b/studio/src/pages/policies/components/PolicyList.js
index 3cfc693c5..52289eef0 100644
--- a/studio/src/pages/policies/components/PolicyList.js
+++ b/studio/src/pages/policies/components/PolicyList.js
@@ -4,7 +4,7 @@ import { Popconfirm, Button, Typography, Table, Avatar, Tooltip } from 'antd';
 import { useDispatch, useSelector } from 'react-redux';
 import { deletePolicy } from '../../../actions/policies';
 import { Link } from 'react-router-dom';
-import { DeleteOutlined } from '@ant-design/icons';
+import { DeleteOutlined, EyeOutlined } from '@ant-design/icons';
 
 function PolicyList({ actions, data, filters, setFilters, fetchPolicies }) {
   const dispatch = useDispatch();
@@ -32,52 +32,56 @@ function PolicyList({ actions, data, filters, setFilters, fetchPolicies }) {
       title: 'Description',
       dataIndex: 'description',
       key: 'description',
+      width: '40%',
       render: (_, record) => {
         return (
           <Typography.Paragraph ellipsis={{ rows: 2 }}>{record.description}</Typography.Paragraph>
         );
       },
     },
-    {
-      title: 'Members',
-      dataIndex: 'members',
-      key: 'members',
-      width: '25%',
-      render: (_, record) => {
-        const members = record.users.map((user, index) => (
-          <Tooltip
-            title={user.first_name + user.last_name}
-            placement="top"
-            key={index + '.' + user.first_name}
-          >
-            <Avatar key={index} style={{ float: 'right', margin: '1px' }}>
-              {user.email.charAt(0).toUpperCase()}
-            </Avatar>
-          </Tooltip>
-        ));
-
-        return <>{members}</>;
-      },
-    },
     {
       title: 'Action',
       dataIndex: 'operation',
       fixed: 'right',
       align: 'center',
-      width: 150,
+      width: '40%',
       render: (_, record) => {
         return (
-          <Popconfirm
-            title="Are you sure you want to delete this?"
-            onConfirm={() => dispatch(deletePolicy(record.id)).then(() => fetchPolicies())}
-            disabled={!(actions.includes('admin') || actions.includes('delete'))}
+          <div
+            style={{
+              display: 'flex',
+              gap: '8px',
+              justifyContent: 'center',
+            }}
           >
-            <Button
-              icon={<DeleteOutlined />}
+            <Link
+              to={{
+                pathname: `/members/policies/${record.id}/view`,
+              }}
+            >
+              <Button
+                icon={<EyeOutlined />}
+                style={{
+                  minWidth: 100,
+                }}
+              >
+                View
+              </Button>
+            </Link>
+            <Popconfirm
+              title="Are you sure you want to delete this?"
+              onConfirm={() => dispatch(deletePolicy(record.id)).then(() => fetchPolicies())}
               disabled={!(actions.includes('admin') || actions.includes('delete'))}
-              type="danger"
-            />
-          </Popconfirm>
+            >
+              <Button
+                icon={<DeleteOutlined />}
+                disabled={!(actions.includes('admin') || actions.includes('delete'))}
+                type="danger"
+              >
+                Delete
+              </Button>
+            </Popconfirm>
+          </div>
         );
       },
     },
diff --git a/studio/src/pages/policies/components/ViewPolicy.js b/studio/src/pages/policies/components/ViewPolicy.js
new file mode 100644
index 000000000..3de19114c
--- /dev/null
+++ b/studio/src/pages/policies/components/ViewPolicy.js
@@ -0,0 +1,75 @@
+import React from 'react';
+import { Descriptions, Tag, Table, Skeleton, Button, Divider } from 'antd';
+import { Link } from 'react-router-dom';
+
+export default function ViewPolicy({ policy }) {
+  // const span = 2;
+  // const nestedTableColumns = [
+  //   {
+  //     title: 'Resource',
+  //     dataIndex: 'resource',
+  //     key: 'resource',
+  //   },
+  //   {
+  //     title: 'Action',
+  //     dataIndex: 'action',
+  //     key: 'action',
+  //     render: (_, record) => {
+  //       return record.actions?.map((action) => {
+  //         return (
+  //           <Tag key={action} color="blue">
+  //             {action}
+  //           </Tag>
+  //         );
+  //       });
+  //     },
+  //   },
+  // ];
+
+  return (
+    <div
+      style={{
+        display: 'flex',
+        flexDirection: 'column',
+        gap: '20px',
+      }}
+    >
+      {/* <Link key="1" to={``}>
+      <Button type="primary">Back to Policies</Button>
+    </Link>
+    <h2> Policy Details </h2>
+    {loading ? (
+      <Skeleton />
+    ) : (
+      <Descriptions bordered>
+        <Descriptions.Item label="Name" span={span}>
+          {policy?.name}
+        </Descriptions.Item>
+        <br />
+        <Descriptions.Item label="Description" span={span}>
+          {policy?.description}
+        </Descriptions.Item>
+        <br />
+        <Descriptions.Item label="Roles" span={span}>
+          {policy?.roles.map((role) => {
+            return (
+              <Tag key={role.id} color="blue">
+                {role?.name}
+              </Tag>
+            );
+          })}
+        </Descriptions.Item>
+      </Descriptions>
+    )}
+    <Divider />
+    <h3> Permissions </h3>
+    <Table
+      bordered={true}
+      columns={nestedTableColumns}
+      dataSource={policy?.permissions}
+      rowKey={'id'}
+      pagination={true}
+    /> */}
+    </div>
+  );
+}
diff --git a/studio/src/pages/policies/index.js b/studio/src/pages/policies/index.js
index 7389566a5..05621d782 100644
--- a/studio/src/pages/policies/index.js
+++ b/studio/src/pages/policies/index.js
@@ -58,7 +58,6 @@ function Policies() {
           </Button>
         </Link>
       </Row>
-
       <PolicyList
         actions={actions}
         data={{ policies, total, loading }}
diff --git a/studio/src/pages/roles/CreateRole.js b/studio/src/pages/roles/CreateRole.js
index 1dc13fdcd..3fddf1429 100644
--- a/studio/src/pages/roles/CreateRole.js
+++ b/studio/src/pages/roles/CreateRole.js
@@ -10,11 +10,6 @@ function CreateRole() {
 
   const dispatch = useDispatch();
   const onCreate = (values) => {
-    console.log(values, 'onCreate');
-    // values.users = values.users.map((item) => item.toString());
-    // values.permissions = values.permissions.filter(
-    //   (item) => item && item.resource && item.actions.length > 0,
-    // );
     dispatch(createRole(values)).then(() => history.push('/members/roles'));
   };
 
diff --git a/studio/src/pages/roles/components/RoleForm.js b/studio/src/pages/roles/components/RoleForm.js
index db28f07e8..2f30d8f3d 100644
--- a/studio/src/pages/roles/components/RoleForm.js
+++ b/studio/src/pages/roles/components/RoleForm.js
@@ -19,22 +19,9 @@ function RoleForm({ data = {}, onCreate }) {
         layout="vertical"
         name="update-space-role"
         onFinish={(values) => {
-          console.log(values);
           onCreate(values);
-          //  console.log(onCreate,"onCreate")
-          //  console.log(onCreate,"function")
-          // console.log(something,"something")
-          // console.log("hello" )
-
-          // onReset();
         }}
-        //  initialValues={{
-        //    name: role.name,
-        //    slug: role.slug,
-        //    description: role.description,
-        //  }}
       >
-        {/* <h3> Space : {space?.name}</h3> */}
         <Form.Item
           name="name"
           label="Name"
diff --git a/studio/src/pages/roles/components/RoleList.js b/studio/src/pages/roles/components/RoleList.js
index 2896b0155..c5b193493 100644
--- a/studio/src/pages/roles/components/RoleList.js
+++ b/studio/src/pages/roles/components/RoleList.js
@@ -1,24 +1,15 @@
 import React from 'react';
 import { Popconfirm, Button, Table, Avatar, Tooltip, Space } from 'antd';
-import { useSelector, useDispatch } from 'react-redux';
-//import { deleteSpaceRole, getSpaceRoles } from '../../../../../../../actions/roles';
+import { useDispatch } from 'react-redux';
 import { Link } from 'react-router-dom';
 import { UserAddOutlined, DeleteOutlined } from '@ant-design/icons';
+import { deleteRole, getRoles } from '../../../actions/roles';
 
 function RoleList({ roles, total, loading }) {
-  //   const dispatch = useDispatch();
-  //   const { roles, loading } = useSelector((state) => {
-  //     var roleIDs = [];
-  //     roleIDs = state.spaces.details[spaceID]?.roleIDs || [];
-  //     return {
-  //       roles: roleIDs.map((id) => ({
-  //         ...state.roles.space[spaceID][id],
-  //         users:
-  //           state.roles.space[spaceID][id]?.users.map((userID) => state.users.details[userID]) || [],
-  //       })),
-  //       loading: state.roles.loading,
-  //     };
-  //   });
+  const dispatch = useDispatch();
+  const onDelete = (id) => {
+    dispatch(deleteRole(id)).then(() => dispatch(getRoles()));
+  };
 
   const columns = [
     {
@@ -29,21 +20,17 @@ function RoleList({ roles, total, loading }) {
       render: (_, record) => {
         return (
           <div key={record.id}>
-            {/* {role === 'owner' ? ( */}
             <Link
               key={record.id}
               style={{
                 marginRight: 8,
               }}
               to={{
-                pathname: ``,
+                pathname: `/members/roles/${record.id}/edit`,
               }}
             >
               {record?.name}
             </Link>
-            {/* ) : (
-              <h4 key={record.id}>{record?.name}</h4>
-            ) */}
           </div>
         );
       },
@@ -54,37 +41,6 @@ function RoleList({ roles, total, loading }) {
       key: 'description',
       width: '15%',
     },
-    {
-      title: 'Users',
-      dataIndex: 'users',
-      key: 'users',
-      width: '15%',
-      render: (_, record) => {
-        return (
-          <Avatar.Group
-            maxCount={3}
-            maxStyle={{ color: '#f56a00', backgroundColor: '#fde3cf' }}
-            key={record.id}
-          >
-            {record?.users?.map((user) => {
-              return (
-                <Tooltip title={user?.email} placement="top" key={'role-' + user?.id}>
-                  <Avatar
-                    key={user?.id}
-                    style={{
-                      backgroundColor:
-                        '#' + ((Math.random() * 0xffffff) << 0).toString(16).padStart(6, '0'),
-                    }}
-                  >
-                    {user?.email?.charAt(0)}
-                  </Avatar>
-                </Tooltip>
-              );
-            })}
-          </Avatar.Group>
-        );
-      },
-    },
     {
       title: 'Action',
       dataIndex: 'operation',
@@ -92,7 +48,6 @@ function RoleList({ roles, total, loading }) {
       render: (_, record) => {
         return (
           <span>
-            {/* {role === 'owner' ? ( */}
             <Space>
               <Link
                 to={{
@@ -103,46 +58,21 @@ function RoleList({ roles, total, loading }) {
                   Add users
                 </Button>
               </Link>
-              <Popconfirm title="Sure to Revoke?">
+              <Popconfirm title="Sure to Revoke?" onConfirm={() => onDelete(record.id)}>
                 <Button type="danger" icon={<DeleteOutlined />}>
-                  {' '}
-                  Delete{' '}
+                  Delete
                 </Button>
               </Popconfirm>
             </Space>
-            {/* ) */}
-            {/* // : null} */}
           </span>
         );
       },
     },
   ];
 
-  //   const fetchRoles = () => {
-  //     dispatch(getSpaceRoles(appID, spaceID));
-  //   };
-
-  //   const onDelete = (id) => {
-  //     dispatch(deleteSpaceRole(appID, spaceID, id)).then(() =>
-  //       dispatch(getSpaceRoles(appID, spaceID)),
-  //     );
-  //   };
-
-  //   React.useEffect(() => {
-  //     fetchRoles();
-  //     // eslint-disable-next-line
-  //   }, [dispatch, appID, spaceID]);
-
   return (
     <div>
-      <Table
-        bordered
-        columns={columns}
-        dataSource={roles}
-        rowKey={'id'}
-        loading={loading}
-        //  style={{ width: '78vw' }}
-      />
+      <Table bordered columns={columns} dataSource={roles} rowKey={'id'} loading={loading} />
     </div>
   );
 }
diff --git a/studio/src/pages/roles/index.js b/studio/src/pages/roles/index.js
index 931031c9a..003dc9c6a 100644
--- a/studio/src/pages/roles/index.js
+++ b/studio/src/pages/roles/index.js
@@ -14,35 +14,24 @@ function Roles() {
   const spaces = useSelector(({ spaces }) => spaces);
   const actions = getUserPermission({ resource: 'roles', action: 'get', spaces });
   const dispatch = useDispatch();
-  const query = new URLSearchParams(useLocation().search);
-  const [filters, setFilters] = React.useState({
-    page: 1,
-    limit: 20,
-  });
-  query.set('page', filters.page);
-  window.history.replaceState({}, '', `${window.PUBLIC_URL}${useLocation().pathname}?${query}`);
 
   const { roles, total, loading } = useSelector((state) => {
-    const node = state.roles.req.find((item) => {
-      return deepEqual(item.query, filters);
-    });
-
-    if (node)
-      return {
-        roles: node.data.map((element) => state.roles.details[element]),
-        total: node.total,
-        loading: state.roles.loading,
-      };
-    return { roles: [], total: 0, loading: state.roles.loading };
+    return {
+      roles: state.roles.req?.length
+        ? state.roles.req[0].data.map((id) => state.roles.details[id])
+        : [],
+      total: state.roles.req?.length,
+      loading: state.roles.loading,
+    };
   });
   React.useEffect(() => {
     fetchRoles();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [filters]);
+  }, []);
 
   const fetchRoles = () => {
-    dispatch(getRoles(filters));
+    dispatch(getRoles());
   };
+
   return loading ? (
     <Loader />
   ) : (
@@ -51,20 +40,14 @@ function Roles() {
       <Row gutter={16} justify="end">
         <Link to="/members/roles/create">
           <Button
-            //  disabled={!(actions.includes('admin') || actions.includes('create'))}
+            disabled={!(actions.includes('admin') || actions.includes('create'))}
             type="primary"
           >
             New Role
           </Button>
         </Link>
       </Row>
-      <RoleList
-        // actions={actions}
-        data={{ roles, total, loading }}
-        // filters={filters}
-        // setFilters={setFilters}
-        // fetchPolicies={fetchPolicies}
-      />
+      <RoleList roles={roles} total={total} loading={loading} />
     </Space>
   );
 }
diff --git a/studio/src/reducers/spacesReducer.js b/studio/src/reducers/spacesReducer.js
index fc742e42b..7158b292c 100644
--- a/studio/src/reducers/spacesReducer.js
+++ b/studio/src/reducers/spacesReducer.js
@@ -26,13 +26,11 @@ export default function spacesReducer(state = initialState, action = {}) {
       };
     case GET_SPACES_SUCCESS:
       let space_details = {};
-
       action.payload.forEach((element) => {
         element.spaces.forEach((s) => {
           space_details[s.id] = s;
         });
       });
-
       const spaceID = localStorage.getItem('space') ? localStorage.getItem('space') : 0;
 
       const defaultSpace =
@@ -48,7 +46,12 @@ export default function spacesReducer(state = initialState, action = {}) {
       return {
         ...state,
         orgs: action.payload.map((each) => {
-          return { ...each, spaces: each.spaces.map((e) => e.id) };
+          return {
+            ...each.organisation,
+            applications: each.applications,
+            permission: each.permission,
+            spaces: each.spaces.map((e) => e.id),
+          };
         }),
         details: space_details,
         loading: false,

From 45621bc6531d588844cfc7f681ce92b3926e66e0 Mon Sep 17 00:00:00 2001
From: vsumit89 <sumit.vishwakarma@factly.in>
Date: Sat, 27 Aug 2022 01:23:24 +0530
Subject: [PATCH 09/38] refactored the code for dega

---
 server/service/core/action/policy/default.go  |   2 -
 server/service/core/action/policy/details.go  |  23 ++--
 server/service/core/action/policy/list.go     |   7 +-
 server/service/core/action/policy/update.go   |  43 ++++--
 server/service/core/action/role/delete.go     |   2 +-
 server/service/core/action/role/route.go      |   2 +
 .../service/core/action/role/user/create.go   |  93 +++++++++++++
 .../service/core/action/role/user/delete.go   |  71 ++++++++++
 server/service/core/action/role/user/list.go  |  87 ++++++++++++
 server/service/core/action/role/user/route.go |  14 ++
 server/service/core/action/space/create.go    |   2 -
 server/service/core/action/space/route.go     |   1 +
 server/service/core/action/space/user.go      |  78 +++++++++++
 server/service/core/model/role.go             |   1 -
 studio/src/actions/policies.js                |   2 +
 studio/src/actions/roles.js                   |  35 +++++
 studio/src/actions/spaces.js                  |  24 ++++
 studio/src/config/routesConfig.js             |   8 ++
 studio/src/constants/spaces.js                |   2 +-
 studio/src/pages/policies/CreatePolicy.js     |   1 -
 studio/src/pages/policies/EditPolicy.js       |   8 +-
 .../pages/policies/components/PolicyForm.js   |   2 +-
 .../pages/policies/components/ViewPolicy.js   | 129 ++++++++++--------
 studio/src/pages/roles/components/RoleList.js |   8 +-
 .../roles/users/components/RoleUserList.js    |  51 +++++++
 studio/src/pages/roles/users/index.js         |  82 +++++++++++
 studio/src/reducers/spacesReducer.js          |  11 ++
 27 files changed, 686 insertions(+), 103 deletions(-)
 create mode 100644 server/service/core/action/role/user/create.go
 create mode 100644 server/service/core/action/role/user/delete.go
 create mode 100644 server/service/core/action/role/user/list.go
 create mode 100644 server/service/core/action/role/user/route.go
 create mode 100644 server/service/core/action/space/user.go
 create mode 100644 studio/src/pages/roles/users/components/RoleUserList.js
 create mode 100644 studio/src/pages/roles/users/index.js

diff --git a/server/service/core/action/policy/default.go b/server/service/core/action/policy/default.go
index a05a649d4..2dafa9541 100644
--- a/server/service/core/action/policy/default.go
+++ b/server/service/core/action/policy/default.go
@@ -142,7 +142,6 @@ func createRoleandPolicyonKavach(role roleReq, policy policyReq, orgID, spaceID,
 	if err != nil {
 		return nil, errors.New("unable to decode default space role response body")
 	}
-	fmt.Println("spacerole", spaceRole.ID, spaceRole.Name)
 	policyReqBody := map[string]interface{}{
 		"name":        policy.Name,
 		"description": policy.Description,
@@ -151,7 +150,6 @@ func createRoleandPolicyonKavach(role roleReq, policy policyReq, orgID, spaceID,
 		"roles":       append([]int{}, int(spaceRole.ID)),
 	}
 
-	fmt.Println("this is policy roles", policyReqBody["roles"])
 	err = json.NewEncoder(buf).Encode(&policyReqBody)
 	if err != nil {
 		return nil, err
diff --git a/server/service/core/action/policy/details.go b/server/service/core/action/policy/details.go
index 873e283fd..6da863f9a 100644
--- a/server/service/core/action/policy/details.go
+++ b/server/service/core/action/policy/details.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/factly/dega-server/service/core/action/author"
 	"github.com/factly/dega-server/service/core/model"
 	"github.com/factly/dega-server/util"
 	"github.com/factly/x/errorx"
@@ -55,14 +54,14 @@ func details(w http.ResponseWriter, r *http.Request) {
 
 	policyID := chi.URLParam(r, "policy_id")
 
-	ketoPolicyID := fmt.Sprint("id:org:", organisationID, ":app:dega:space:", spaceID, ":", policyID)
-
-	req, err := http.NewRequest("GET", viper.GetString("keto_url")+"/engines/acp/ory/regex/policies/"+ketoPolicyID, nil)
+	reqURL := viper.GetString("kavach_url") + fmt.Sprintf("/organisations/%d/applications/%d/spaces/%d/policy/%s", organisationID, viper.GetInt("dega_application_id"), spaceID, policyID)
+	req, err := http.NewRequest("GET", reqURL, nil)
 	if err != nil {
 		loggerx.Error(err)
 		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
 		return
 	}
+	req.Header.Set("X-User", fmt.Sprintf("%d", userID))
 	req.Header.Set("Content-Type", "application/json")
 
 	client := &http.Client{}
@@ -76,19 +75,19 @@ func details(w http.ResponseWriter, r *http.Request) {
 
 	defer resp.Body.Close()
 
-	ketoPolicy := model.KetoPolicy{}
-	err = json.NewDecoder(resp.Body).Decode(&ketoPolicy)
+	if resp.StatusCode != http.StatusOK {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
 
+	policy := model.KavachPolicy{}
+	err = json.NewDecoder(resp.Body).Decode(&policy)
 	if err != nil {
 		loggerx.Error(err)
 		errorx.Render(w, errorx.Parser(errorx.DecodeError()))
 		return
 	}
 
-	/* User req */
-	userMap := author.Mapper(organisationID, userID)
-
-	result := Mapper(ketoPolicy, userMap)
-
-	renderx.JSON(w, http.StatusOK, result)
+	renderx.JSON(w, http.StatusOK, policy)
 }
diff --git a/server/service/core/action/policy/list.go b/server/service/core/action/policy/list.go
index 9c2b36a5b..c57b253e0 100644
--- a/server/service/core/action/policy/list.go
+++ b/server/service/core/action/policy/list.go
@@ -65,7 +65,6 @@ func list(w http.ResponseWriter, r *http.Request) {
 
 	client := &http.Client{}
 	resp, err := client.Do(req)
-
 	if err != nil {
 		loggerx.Error(err)
 		errorx.Render(w, errorx.Parser(errorx.NetworkError()))
@@ -74,6 +73,12 @@ func list(w http.ResponseWriter, r *http.Request) {
 
 	defer resp.Body.Close()
 
+	if resp.StatusCode != http.StatusOK {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+
 	var polices []model.KavachPolicy
 
 	err = json.NewDecoder(resp.Body).Decode(&polices)
diff --git a/server/service/core/action/policy/update.go b/server/service/core/action/policy/update.go
index 26d662ba5..c55a42d47 100644
--- a/server/service/core/action/policy/update.go
+++ b/server/service/core/action/policy/update.go
@@ -1,11 +1,14 @@
 package policy
 
 import (
+	"bytes"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"net/http"
+	"strconv"
 
-	"github.com/factly/dega-server/service/core/action/author"
+	"github.com/factly/dega-server/service/core/model"
 	"github.com/factly/dega-server/util"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
@@ -51,29 +54,33 @@ func update(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	policyID := chi.URLParam(r, "policy_id")
 	/* create new policy */
-	policyReq := policyReq{}
-
+	policyReq := kavachPolicy{}
 	err = json.NewDecoder(r.Body).Decode(&policyReq)
-
 	if err != nil {
 		loggerx.Error(err)
 		errorx.Render(w, errorx.Parser(errorx.DecodeError()))
 		return
 	}
 
-	/* delete old policy */
-	commanPolicyString := fmt.Sprint(":org:", organisationID, ":app:dega:space:", spaceID, ":")
-	policyID := chi.URLParam(r, "policy_id")
-
-	policyID = "id" + commanPolicyString + policyID
+	buf := new(bytes.Buffer)
+	err = json.NewEncoder(buf).Encode(policyReq)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+		return
+	}
 
-	req, err := http.NewRequest("DELETE", viper.GetString("keto_url")+"/engines/acp/ory/regex/policies/"+policyID, nil)
+	requrl := viper.GetString("kavach_url") + "/organisations/" + fmt.Sprintf("%d", organisationID) + "/applications/" + viper.GetString("dega_application_id") + "/spaces/" + fmt.Sprintf("%d", spaceID) + "/policy/" + policyID
+	req, err := http.NewRequest(http.MethodPut, requrl, buf)
 	if err != nil {
 		loggerx.Error(err)
 		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
 		return
 	}
+
+	req.Header.Set("X-User", strconv.Itoa(userID))
 	req.Header.Set("Content-Type", "application/json")
 
 	client := &http.Client{}
@@ -84,11 +91,21 @@ func update(w http.ResponseWriter, r *http.Request) {
 		errorx.Render(w, errorx.Parser(errorx.NetworkError()))
 		return
 	}
-
 	defer resp.Body.Close()
 
-	/* User req */
-	result := Mapper(Composer(organisationID, spaceID, policyReq), author.Mapper(organisationID, userID))
+	if resp.StatusCode != http.StatusOK {
+		loggerx.Error(errors.New("internal server error on kavach server"))
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+
+	result := &model.KavachPolicy{}
+	err = json.NewDecoder(resp.Body).Decode(result)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
 
 	// Update into meili index
 	meiliObj := map[string]interface{}{
diff --git a/server/service/core/action/role/delete.go b/server/service/core/action/role/delete.go
index 843a6bf55..f29a17af6 100644
--- a/server/service/core/action/role/delete.go
+++ b/server/service/core/action/role/delete.go
@@ -31,7 +31,7 @@ func delete(w http.ResponseWriter, r *http.Request) {
 		errorx.Render(w, errorx.Parser(errorx.DecodeError()))
 		return
 	}
-	
+
 	roleID := chi.URLParam(r, "role_id")
 	orgID, err := util.GetOrganisationIDfromSpaceID(uint(sID), uint(uID))
 	if err != nil {
diff --git a/server/service/core/action/role/route.go b/server/service/core/action/role/route.go
index 63f3bda41..663503eca 100644
--- a/server/service/core/action/role/route.go
+++ b/server/service/core/action/role/route.go
@@ -1,6 +1,7 @@
 package role
 
 import (
+	"github.com/factly/dega-server/service/core/action/role/user"
 	"github.com/go-chi/chi"
 )
 
@@ -13,6 +14,7 @@ func Router() chi.Router {
 		r.Put("/", update)
 		r.Delete("/", delete)
 		r.Get("/", details)
+		r.Mount("/users", user.Router())
 	})
 
 	return r
diff --git a/server/service/core/action/role/user/create.go b/server/service/core/action/role/user/create.go
new file mode 100644
index 000000000..a9be31670
--- /dev/null
+++ b/server/service/core/action/role/user/create.go
@@ -0,0 +1,93 @@
+package user
+
+import (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"net/http"
+	"strconv"
+	"time"
+
+	"github.com/factly/dega-server/util"
+	"github.com/factly/dega-server/util/timex"
+	"github.com/factly/x/errorx"
+	"github.com/factly/x/loggerx"
+	"github.com/factly/x/middlewarex"
+	"github.com/factly/x/renderx"
+	"github.com/go-chi/chi"
+	"github.com/spf13/viper"
+)
+
+type requestModel struct {
+	UserID int `json:"user_id" validate:"required"`
+}
+
+func create(w http.ResponseWriter, r *http.Request) {
+	uID, err := middlewarex.GetUser(r.Context())
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
+		return
+	}
+
+	spaceID := chi.URLParam(r, "space_id")
+	sID, err := strconv.Atoi(spaceID)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+		return
+	}
+
+	orgID, err := util.GetOrganisationIDfromSpaceID(uint(sID), uint(uID))
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+		return
+	}
+
+	roleID := chi.URLParam(r, "role_id")
+
+	// decoding the requestBody
+	userReqModel := &requestModel{}
+	err = json.NewDecoder(r.Body).Decode(userReqModel)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+		return
+	}
+
+	buf := new(bytes.Buffer)
+	err = json.NewEncoder(buf).Encode(userReqModel)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+		return
+	}
+
+	reqURL := viper.GetString("kavach_url") + fmt.Sprintf("/organisations/%d/applications/%d/spaces/%s/roles/%s/users", orgID, viper.GetInt("dega_application_id"), spaceID, roleID)
+	req, err := http.NewRequest(http.MethodPost, reqURL, buf)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+	req.Header.Set("X-User", fmt.Sprintf("%d", uID))
+	req.Header.Set("Content-type", "application/json")
+	client := http.Client{Timeout: time.Minute * time.Duration(timex.HTTP_TIMEOUT)}
+
+	response, err := client.Do(req)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+	defer response.Body.Close()
+	if response.StatusCode != http.StatusOK {
+		loggerx.Error(errors.New("internal server error on kavach server"))
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+
+	renderx.JSON(w, http.StatusCreated, nil)
+}
diff --git a/server/service/core/action/role/user/delete.go b/server/service/core/action/role/user/delete.go
new file mode 100644
index 000000000..56a833242
--- /dev/null
+++ b/server/service/core/action/role/user/delete.go
@@ -0,0 +1,71 @@
+package user
+
+import (
+	"fmt"
+	"net/http"
+	"strconv"
+	"time"
+
+	"github.com/factly/dega-server/util"
+	"github.com/factly/dega-server/util/timex"
+	"github.com/factly/x/errorx"
+	"github.com/factly/x/loggerx"
+	"github.com/factly/x/middlewarex"
+	"github.com/factly/x/renderx"
+	"github.com/go-chi/chi"
+	"github.com/spf13/viper"
+)
+
+func delete(w http.ResponseWriter, r *http.Request) {
+	uID, err := middlewarex.GetUser(r.Context())
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
+		return
+	}
+
+	spaceID := chi.URLParam(r, "space_id")
+	sID, err := strconv.Atoi(spaceID)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+		return
+	}
+
+	orgID, err := util.GetOrganisationIDfromSpaceID(uint(sID), uint(uID))
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+		return
+	}
+
+	roleID := chi.URLParam(r, "role_id")
+	userID := chi.URLParam(r, "user_id")
+
+	reqURL := viper.GetString("kavach_url") + fmt.Sprintf("/organisations/%d/applications/%d/spaces/%s/roles/%s/users/%s", orgID, viper.GetInt("dega_application_id"), spaceID, roleID, userID)
+	client := http.Client{Timeout: time.Minute * time.Duration(timex.HTTP_TIMEOUT)}
+	req, err := http.NewRequest(http.MethodDelete, reqURL, nil)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+
+	req.Header.Set("X-User", fmt.Sprintf("%d", uID))
+	req.Header.Set("Content-type", "application/json")
+	response, err := client.Do(req)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+	defer response.Body.Close()
+	if response.StatusCode != 200 {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+
+	renderx.JSON(w, http.StatusOK, nil)
+
+}
diff --git a/server/service/core/action/role/user/list.go b/server/service/core/action/role/user/list.go
new file mode 100644
index 000000000..c18b06b2c
--- /dev/null
+++ b/server/service/core/action/role/user/list.go
@@ -0,0 +1,87 @@
+package user
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"strconv"
+	"time"
+
+	"github.com/factly/dega-server/service/core/model"
+	"github.com/factly/dega-server/util"
+	"github.com/factly/dega-server/util/timex"
+	"github.com/factly/x/errorx"
+	"github.com/factly/x/loggerx"
+	"github.com/factly/x/middlewarex"
+	"github.com/factly/x/renderx"
+	"github.com/go-chi/chi"
+	"github.com/spf13/viper"
+)
+
+func list(w http.ResponseWriter, r *http.Request) {
+	uID, err := middlewarex.GetUser(r.Context())
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
+		return
+	}
+
+	sID := chi.URLParam(r, "space_id")
+	spaceID, err := strconv.Atoi(sID)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InvalidID()))
+		return
+	}
+
+	orgID, err := util.GetOrganisationIDfromSpaceID(uint(spaceID), uint(uID))
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+
+	rID := chi.URLParam(r, "role_id")
+	roleID, err := strconv.Atoi(rID)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InvalidID()))
+		return
+	}
+
+	req, err := http.NewRequest("GET", viper.GetString("kavach_url")+fmt.Sprintf("/organisations/%d/applications/", orgID)+viper.GetString("dega_application_id")+"/spaces/"+fmt.Sprintf("%d", spaceID)+fmt.Sprintf("/roles/%d", roleID)+"/users", nil)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+	req.Header.Set("X-User", fmt.Sprintf("%d", uID))
+	req.Header.Set("Content-Type", "application/json")
+
+	client := http.Client{Timeout: time.Second * time.Duration(timex.HTTP_TIMEOUT)}
+	resp, err := client.Do(req)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+
+	if resp.StatusCode != 200 {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+
+	defer resp.Body.Close()
+
+	var users []model.User
+
+	err = json.NewDecoder(resp.Body).Decode(&users)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+		return
+	}
+
+	renderx.JSON(w, http.StatusOK, users)
+}
diff --git a/server/service/core/action/role/user/route.go b/server/service/core/action/role/user/route.go
new file mode 100644
index 000000000..b83faf869
--- /dev/null
+++ b/server/service/core/action/role/user/route.go
@@ -0,0 +1,14 @@
+package user
+
+import (
+	"github.com/go-chi/chi"
+)
+
+func Router() chi.Router {
+	r := chi.NewRouter()
+
+	r.Get("/", list)
+	r.Post("/", create)
+	r.Delete("/{user_id}", delete)
+	return r
+}
diff --git a/server/service/core/action/space/create.go b/server/service/core/action/space/create.go
index 93170b31d..e21398d04 100644
--- a/server/service/core/action/space/create.go
+++ b/server/service/core/action/space/create.go
@@ -178,7 +178,6 @@ func create(w http.ResponseWriter, r *http.Request) {
 	tx := config.DB.WithContext(context.WithValue(r.Context(), userContext, uID)).Begin()
 
 	if viper.GetBool("create_super_organisation") {
-		fmt.Println("here")
 		//Create SpacePermission for super organisation
 		var spacePermission model.SpacePermission
 		if superOrgID == space.OrganisationID {
@@ -202,7 +201,6 @@ func create(w http.ResponseWriter, r *http.Request) {
 				FactCheck: false,
 			}
 		}
-		fmt.Println("create permissions for space", spacePermission)
 		if err = tx.Model(&model.SpacePermission{}).Create(&spacePermission).Error; err != nil {
 			tx.Rollback()
 			loggerx.Error(err)
diff --git a/server/service/core/action/space/route.go b/server/service/core/action/space/route.go
index 058141cda..d92d4c325 100644
--- a/server/service/core/action/space/route.go
+++ b/server/service/core/action/space/route.go
@@ -42,6 +42,7 @@ func Router() chi.Router {
 		r.Put("/", update)
 		r.Mount("/roles", role.Router())
 		r.Delete("/", delete)
+		r.Get("/users", users)
 	})
 
 	return r
diff --git a/server/service/core/action/space/user.go b/server/service/core/action/space/user.go
new file mode 100644
index 000000000..36bbe2eee
--- /dev/null
+++ b/server/service/core/action/space/user.go
@@ -0,0 +1,78 @@
+package space
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"strconv"
+	"time"
+
+	"github.com/factly/dega-server/service/core/model"
+	"github.com/factly/dega-server/util"
+	"github.com/factly/dega-server/util/timex"
+	"github.com/factly/x/errorx"
+	"github.com/factly/x/loggerx"
+	"github.com/factly/x/middlewarex"
+	"github.com/factly/x/renderx"
+	"github.com/go-chi/chi"
+	"github.com/spf13/viper"
+)
+
+func users(w http.ResponseWriter, r *http.Request) {
+	uID, err := middlewarex.GetUser(r.Context())
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
+		return
+	}
+
+	sID := chi.URLParam(r, "space_id")
+	spaceID, err := strconv.Atoi(sID)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InvalidID()))
+		return
+	}
+
+	orgID, err := util.GetOrganisationIDfromSpaceID(uint(spaceID), uint(uID))
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+
+	req, err := http.NewRequest("GET", viper.GetString("kavach_url")+fmt.Sprintf("/organisations/%d/applications/", orgID)+viper.GetString("dega_application_id")+"/spaces/"+fmt.Sprintf("%d", spaceID)+"/users", nil)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+	req.Header.Set("X-User", fmt.Sprintf("%d", uID))
+	req.Header.Set("Content-Type", "application/json")
+	client := http.Client{Timeout: time.Second * time.Duration(timex.HTTP_TIMEOUT)}
+	resp, err := client.Do(req)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+
+	if resp.StatusCode != 200 {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+
+	defer resp.Body.Close()
+
+	var users []model.User
+
+	err = json.NewDecoder(resp.Body).Decode(&users)
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+		return
+	}
+
+	renderx.JSON(w, http.StatusOK, users)
+}
diff --git a/server/service/core/model/role.go b/server/service/core/model/role.go
index e5e081d95..ff3a3c82e 100644
--- a/server/service/core/model/role.go
+++ b/server/service/core/model/role.go
@@ -28,5 +28,4 @@ type User struct {
 	SocialMediaURLs  postgres.Jsonb `json:"social_media_urls" swaggertype:"primitive,string"`
 	Description      string         `json:"description"`
 	Meta             postgres.Jsonb `json:"meta"`
-	Organisations    []Organisation `json:"organisations"`
 }
diff --git a/studio/src/actions/policies.js b/studio/src/actions/policies.js
index fe55a3fa5..96cf1e19a 100644
--- a/studio/src/actions/policies.js
+++ b/studio/src/actions/policies.js
@@ -66,6 +66,7 @@ export const getPolicy = (id) => {
     return axios
       .get(POLICIES_API + '/' + id)
       .then((response) => {
+        console.log(response.data)
         dispatch(addPolicy(GET_POLICY, response.data));
       })
       .catch((error) => {
@@ -93,6 +94,7 @@ export const createPolicy = (data) => {
 
 // action to update policy by id
 export const updatePolicy = (data) => {
+  console.log({data})
   return (dispatch) => {
     dispatch(loadingPolicies());
     return axios
diff --git a/studio/src/actions/roles.js b/studio/src/actions/roles.js
index 082b09a5d..9b3307400 100644
--- a/studio/src/actions/roles.js
+++ b/studio/src/actions/roles.js
@@ -108,6 +108,41 @@ export const deleteRole = (id) => {
   };
 };
 
+export const addRoleUser = (roleID, data) => {
+  return (dispatch, getState) => {  
+    const currentSpaceID = getState().spaces?.selected;
+    dispatch(loadingRoles());
+    return axios
+      .post(`${ROLES_API(currentSpaceID)}/${roleID}/users`, data)
+      .then(() => {
+        dispatch(addSuccessNotification('User Added Succesfully'));
+      })
+      .catch((error) => {
+        dispatch(addErrorNotification(getError(error)));
+      })
+      .finally(() => {
+        dispatch(stopRolesLoading())
+      })
+  }
+}
+
+export const deleteRoleUser = (roleID, userID) => {
+  return (dispatch, getState) => {
+    const currentSpaceID = getState().spaces?.selected;
+    dispatch(loadingRoles());
+    return axios
+      .delete(`${ROLES_API(currentSpaceID)}/${roleID}/users/${userID}`)
+      .then(() => {
+        dispatch(addSuccessNotification('User Deleted Succesfully'));
+      })
+      .catch((error) => {
+        dispatch(addErrorNotification(getError(error)));
+      })
+      .finally(() => {
+        dispatch(stopRolesLoading())
+      })   
+  }
+}
 export const loadingRoles = () => ({
   type: SET_ROLES_LOADING,
   payload: true,
diff --git a/studio/src/actions/spaces.js b/studio/src/actions/spaces.js
index 67585178a..dd1fa4b71 100644
--- a/studio/src/actions/spaces.js
+++ b/studio/src/actions/spaces.js
@@ -10,6 +10,7 @@ import {
   SET_SELECTED_SPACE,
   DELETE_SPACE_SUCCESS,
   UPDATE_SPACE_SUCCESS,
+  ADD_SPACE_USERS,
 } from '../constants/spaces';
 import { addErrorNotification, addSuccessNotification } from './notifications';
 import getError from '../utils/getError';
@@ -84,6 +85,20 @@ export const updateSpace = (data) => {
   };
 };
 
+export const getSpaceUsers = () => {
+  return (dispatch, getState) => {
+    const currentSpaceID = getState().spaces?.selected;
+    dispatch(loadingSpaces());
+    return axios.
+      get(`/core/spaces/${currentSpaceID}/users`)
+      .then((response) => {
+        dispatch(addSpaceUsers(currentSpaceID, response.data))
+      })
+      .catch((error) => {
+        dispatch(addErrorNotification(getError(error)));
+      })
+  }
+} 
 export const loadingSpaces = () => ({
   type: LOADING_SPACES,
 });
@@ -107,3 +122,12 @@ export const deleteSpaceSuccess = (id) => ({
   type: DELETE_SPACE_SUCCESS,
   payload: id,
 });
+
+export const addSpaceUsers = (id, data) => ({
+  type: ADD_SPACE_USERS,
+  payload: {
+    id,
+    data
+  }
+})
+
diff --git a/studio/src/config/routesConfig.js b/studio/src/config/routesConfig.js
index 952eae8ca..f31188c6a 100644
--- a/studio/src/config/routesConfig.js
+++ b/studio/src/config/routesConfig.js
@@ -146,6 +146,7 @@ import Permissions from '../pages/permissions';
 import Reindex from '../pages/spaces/Reindex';
 import { Component } from 'react';
 import ViewPolicy from '../pages/policies/components/ViewPolicy';
+import RoleUsers from '../pages/roles/users';
 
 const routes = {
   dashboard: {
@@ -417,6 +418,13 @@ const routes = {
     Component: Roles,
     title: 'Roles',
   },
+
+  roleUsers: {
+    path: '/members/roles/:roleID/users',
+    menuKey: '/members',
+    Component: RoleUsers,
+    title: 'Role Users'
+  },
   createPolicy: {
     path: '/members/policies/create',
     menuKey: '/members',
diff --git a/studio/src/constants/spaces.js b/studio/src/constants/spaces.js
index ebba0dc53..df7669d7e 100644
--- a/studio/src/constants/spaces.js
+++ b/studio/src/constants/spaces.js
@@ -9,7 +9,7 @@ export const ADD_SPACE_SUCCESS = 'ADD_SPACE_SUCCESS';
 export const ADD_SPACE_FAILURE = 'ADD_SPACE_SUCCESS';
 export const DELETE_SPACE_SUCCESS = 'DELETE_SPACE_SUCCESS';
 export const DELETE_SPACE_FAILURE = 'DELETE_SPACE_SUCCESS';
-
+export const ADD_SPACE_USERS = 'ADD_SPACE_USERS';
 //API
 export const API_GET_SPACES = '/core/spaces';
 export const API_ADD_SPACE = '/core/spaces';
diff --git a/studio/src/pages/policies/CreatePolicy.js b/studio/src/pages/policies/CreatePolicy.js
index d8859db7e..eefcc9328 100644
--- a/studio/src/pages/policies/CreatePolicy.js
+++ b/studio/src/pages/policies/CreatePolicy.js
@@ -10,7 +10,6 @@ function CreatePolicy() {
 
   const dispatch = useDispatch();
   const onCreate = (values) => {
-    console.log(values);
     values.permissions = values.permissions?.filter(
       (item) => item && item.resource && item.actions.length > 0,
     );
diff --git a/studio/src/pages/policies/EditPolicy.js b/studio/src/pages/policies/EditPolicy.js
index 5d1bc056b..4952a67cd 100644
--- a/studio/src/pages/policies/EditPolicy.js
+++ b/studio/src/pages/policies/EditPolicy.js
@@ -28,8 +28,8 @@ function EditPolicy() {
           (obj, item) => Object.assign(obj, { [item.resource]: item.actions }),
           {},
         ),
-        users: state.policies.details[id].users
-          ? state.policies.details[id].users.map((item) => parseInt(item.id))
+        roles: state.policies.details[id].roles?.length 
+          ? state.policies.details[id].roles.map((item) => item.id)
           : [],
       },
       loading: state.policies.loading,
@@ -48,13 +48,13 @@ function EditPolicy() {
 
   const onUpdate = (values) => {
     dispatch(updatePolicy({ ...policy, ...values })).then(() =>
-      history.push(`/members/policies/${id}/edit`),
+      history.push(`/members/policies/`),
     );
   };
 
   return (
     <>
-      <Helmet title={`${policy?.name} - Edit Policy`} />
+      <Helmet title={`${policy.name} - Edit Policy`} />
       <PolicyEditForm data={policy} onCreate={onUpdate} />
     </>
   );
diff --git a/studio/src/pages/policies/components/PolicyForm.js b/studio/src/pages/policies/components/PolicyForm.js
index cc07ddbaa..c5fd07505 100644
--- a/studio/src/pages/policies/components/PolicyForm.js
+++ b/studio/src/pages/policies/components/PolicyForm.js
@@ -119,7 +119,7 @@ function PolicyForm({ data = {}, onCreate }) {
           </Form.Item>
         </Col>
         <Col span={12}>
-          <Form.Item name="roles" label="Roles">
+          <Form.Item name="roles" label="Roles" required={true}>
             <Selector mode="multiple" display={'name'} action="Roles" />
           </Form.Item>
         </Col>
diff --git a/studio/src/pages/policies/components/ViewPolicy.js b/studio/src/pages/policies/components/ViewPolicy.js
index 3de19114c..3e5182968 100644
--- a/studio/src/pages/policies/components/ViewPolicy.js
+++ b/studio/src/pages/policies/components/ViewPolicy.js
@@ -1,30 +1,39 @@
 import React from 'react';
 import { Descriptions, Tag, Table, Skeleton, Button, Divider } from 'antd';
-import { Link } from 'react-router-dom';
+import { Link, useParams } from 'react-router-dom';
+import { useSelector } from 'react-redux';
 
-export default function ViewPolicy({ policy }) {
-  // const span = 2;
-  // const nestedTableColumns = [
-  //   {
-  //     title: 'Resource',
-  //     dataIndex: 'resource',
-  //     key: 'resource',
-  //   },
-  //   {
-  //     title: 'Action',
-  //     dataIndex: 'action',
-  //     key: 'action',
-  //     render: (_, record) => {
-  //       return record.actions?.map((action) => {
-  //         return (
-  //           <Tag key={action} color="blue">
-  //             {action}
-  //           </Tag>
-  //         );
-  //       });
-  //     },
-  //   },
-  // ];
+export default function ViewPolicy() {
+  const { policyID } = useParams()
+  const span = 2;
+  const nestedTableColumns = [
+    {
+      title: 'Resource',
+      dataIndex: 'resource',
+      key: 'resource',
+    },
+    {
+      title: 'Action',
+      dataIndex: 'action',
+      key: 'action',
+      render: (_, record) => {
+        return record.actions?.map((action) => {
+          return (
+            <Tag key={action} color="blue">
+              {action}
+            </Tag>
+          );
+        });
+      },
+    },
+  ];
+
+  const { policy, loading } = useSelector((state) => {
+    return {
+      policy:  state.policies.details?.[policyID],
+      loading: state.policies.loading
+    }
+  })
 
   return (
     <div
@@ -34,42 +43,42 @@ export default function ViewPolicy({ policy }) {
         gap: '20px',
       }}
     >
-      {/* <Link key="1" to={``}>
-      <Button type="primary">Back to Policies</Button>
-    </Link>
-    <h2> Policy Details </h2>
-    {loading ? (
-      <Skeleton />
-    ) : (
-      <Descriptions bordered>
-        <Descriptions.Item label="Name" span={span}>
-          {policy?.name}
-        </Descriptions.Item>
-        <br />
-        <Descriptions.Item label="Description" span={span}>
-          {policy?.description}
-        </Descriptions.Item>
-        <br />
-        <Descriptions.Item label="Roles" span={span}>
-          {policy?.roles.map((role) => {
-            return (
-              <Tag key={role.id} color="blue">
-                {role?.name}
-              </Tag>
-            );
-          })}
-        </Descriptions.Item>
-      </Descriptions>
-    )}
-    <Divider />
-    <h3> Permissions </h3>
-    <Table
-      bordered={true}
-      columns={nestedTableColumns}
-      dataSource={policy?.permissions}
-      rowKey={'id'}
-      pagination={true}
-    /> */}
+      <Link key="1" to={`/members/policies`}>
+        <Button type="primary">Back to Policies</Button>
+      </Link>
+      <h2> Policy Details </h2>
+      {loading ? (
+        <Skeleton />
+      ) : (
+        <Descriptions bordered>
+          <Descriptions.Item label="Name" span={span}>
+            {policy?.name}
+          </Descriptions.Item>
+          <br />
+          <Descriptions.Item label="Description" span={span}>
+            {policy?.description}
+          </Descriptions.Item>
+          <br />
+          <Descriptions.Item label="Roles" span={span}>
+            {policy?.roles.map((role) => {
+              return (
+                <Tag key={role.id} color="blue">
+                  {role?.name}
+                </Tag>
+              );
+            })}
+          </Descriptions.Item>
+        </Descriptions>
+      )}
+      <Divider />
+      <h3> Permissions </h3>
+      <Table
+        bordered={true}
+        columns={nestedTableColumns}
+        dataSource={policy?.permissions}
+        rowKey={'id'}
+        pagination={true}
+      />
     </div>
   );
 }
diff --git a/studio/src/pages/roles/components/RoleList.js b/studio/src/pages/roles/components/RoleList.js
index c5b193493..11e51b996 100644
--- a/studio/src/pages/roles/components/RoleList.js
+++ b/studio/src/pages/roles/components/RoleList.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { Popconfirm, Button, Table, Avatar, Tooltip, Space } from 'antd';
 import { useDispatch } from 'react-redux';
 import { Link } from 'react-router-dom';
-import { UserAddOutlined, DeleteOutlined } from '@ant-design/icons';
+import { UserOutlined, DeleteOutlined } from '@ant-design/icons';
 import { deleteRole, getRoles } from '../../../actions/roles';
 
 function RoleList({ roles, total, loading }) {
@@ -51,11 +51,11 @@ function RoleList({ roles, total, loading }) {
             <Space>
               <Link
                 to={{
-                  pathname: ``,
+                  pathname: `/members/roles/${record.id}/users`,
                 }}
               >
-                <Button icon={<UserAddOutlined />} primary="true">
-                  Add users
+                <Button icon={<UserOutlined />} primary="true">
+                  Users
                 </Button>
               </Link>
               <Popconfirm title="Sure to Revoke?" onConfirm={() => onDelete(record.id)}>
diff --git a/studio/src/pages/roles/users/components/RoleUserList.js b/studio/src/pages/roles/users/components/RoleUserList.js
new file mode 100644
index 000000000..69bf4e2d7
--- /dev/null
+++ b/studio/src/pages/roles/users/components/RoleUserList.js
@@ -0,0 +1,51 @@
+import React from 'react';
+import { Popconfirm, Button, Table } from 'antd';
+import { useDispatch } from 'react-redux';
+import { DeleteOutlined } from '@ant-design/icons';
+import { deleteRoleUser, getRoles } from '../../../../actions/roles';
+
+export default function UserList({ users, roleID }) {
+  const dispatch = useDispatch();
+  const columns = [
+    { title: 'First Name', dataIndex: 'first_name', key: 'name' },
+    { title: 'Last Name', dataIndex: 'last_name', key: 'last_name' },
+    {
+      title: 'Display Name',
+      dataIndex: 'display_name',
+      key: 'display_name',
+      ellipsis: true,
+    },
+    { title: 'E-mail', dataIndex: 'email', key: 'email' },
+
+    {
+      title: 'Action',
+      dataIndex: 'operation',
+      width: '30%',
+      render: (_, record) => {
+        return (
+          <span>
+            <Popconfirm
+              title="Sure to Delete?"
+              onConfirm={() => {
+                deleteUser(record.id);
+              }}
+            >
+              <Button type="danger">
+                <DeleteOutlined />
+              </Button>
+            </Popconfirm>
+          </span>
+        );
+      },
+    },
+  ];
+
+  const deleteUser = (id) => {
+    dispatch(deleteRoleUser(roleID, id)).then(() =>
+      dispatch(getRoles())
+    );
+  };
+
+  return <Table bordered columns={columns} dataSource={users} rowKey={'id'} />;
+
+}
\ No newline at end of file
diff --git a/studio/src/pages/roles/users/index.js b/studio/src/pages/roles/users/index.js
new file mode 100644
index 000000000..696077067
--- /dev/null
+++ b/studio/src/pages/roles/users/index.js
@@ -0,0 +1,82 @@
+
+import React from 'react';
+import { Space, Form, Button, Select, Skeleton } from 'antd';
+import { Link, useParams } from 'react-router-dom';
+import { useDispatch, useSelector } from 'react-redux';
+import UserList from './components/RoleUserList';
+import { getSpaceUsers } from '../../../actions/spaces';
+import { addRoleUser, deleteRoleUser, getRoles } from '../../../actions/roles';
+
+export default function RoleUsers() {
+  const [form] = Form.useForm();
+  const dispatch = useDispatch();
+  const {roleID} = useParams();
+  const {remainingSpaceUsers, loading, roleUsers, loadingUserRole } = useSelector((state) =>  {
+    const spaceUsers = state.spaces?.details?.[state.spaces?.selected]?.users?.length ? state.spaces?.details?.[state.spaces?.selected]?.users : []
+    const roleUsers = state.roles.details?.[roleID]?.users
+    var remainingSpaceUsers = []
+    if (spaceUsers?.length) {
+      remainingSpaceUsers = spaceUsers.filter((spaceUser) => roleUsers.every((roleUser) => !(spaceUser.id === roleUser.id)))
+    }
+    return {
+      remainingSpaceUsers: remainingSpaceUsers,
+      loading: state.spaces?.loading,
+      roleUsers,
+      loadingRoles: state.roles.loading
+    }
+  })
+
+  React.useEffect(() => {
+    dispatch(getSpaceUsers())
+    dispatch(getRoles())
+  }, [roleID])
+
+  const onSubmit = (data) => {
+    dispatch(addRoleUser(roleID, data)).then(() => dispatch(getRoles()))
+    form.resetFields()
+  }
+
+  return (
+    <div
+      style={{
+        display: 'flex',
+        flexDirection: 'column',
+        gap: '20px',
+      }}
+    >
+      <Link key="1" to={`/members/roles`}>
+        <Button type="primary">Back to Roles</Button>
+      </Link>
+      {loading && loadingUserRole ? (
+        <Skeleton />
+      ) : (
+        <Space direction="vertical">
+            <Form
+              form={form}
+              name="add-space-role-user"
+              layout="inline"
+              onFinish={(values) => {
+                onSubmit(values);
+              }}
+            >
+              <Form.Item name="user_id" label="Users">
+                <Select bordered listHeight={128} style={{ width: 200 }} placeholder="select user">
+                  {remainingSpaceUsers.map((user, index) => (
+                    <Select.Option value={user.id} key={index}>
+                      {user.email}
+                    </Select.Option>
+                  ))}
+                </Select>
+              </Form.Item>
+              <Form.Item>
+                <Button type="primary" htmlType="submit" form="add-space-role-user">
+                  Add Users
+                </Button>
+              </Form.Item>
+            </Form>
+          <UserList  roleID={roleID} users={roleUsers} />
+        </Space>
+      )}
+    </div>
+  )
+}
\ No newline at end of file
diff --git a/studio/src/reducers/spacesReducer.js b/studio/src/reducers/spacesReducer.js
index 7158b292c..080dc2db0 100644
--- a/studio/src/reducers/spacesReducer.js
+++ b/studio/src/reducers/spacesReducer.js
@@ -5,6 +5,7 @@ import {
   LOADING_SPACES,
   DELETE_SPACE_SUCCESS,
   UPDATE_SPACE_SUCCESS,
+  ADD_SPACE_USERS,
 } from '../constants/spaces';
 
 const initialState = {
@@ -95,6 +96,16 @@ export default function spacesReducer(state = initialState, action = {}) {
       };
     case DELETE_SPACE_SUCCESS:
       return initialState;
+    case ADD_SPACE_USERS:
+      return {
+        ...state,
+        details: {
+          [action.payload.id]: {
+            ...state.details[action.payload.id],
+            users: action.payload.data
+          }
+        }
+      }
     default:
       return state;
   }

From 5af04e50a040f73adbad47d5c4a6cbc29ea53c8c Mon Sep 17 00:00:00 2001
From: vsumit89 <sumit.vishwakarma@factly.in>
Date: Sat, 27 Aug 2022 17:08:50 +0530
Subject: [PATCH 10/38] added organisation permissions env variable

---
 docker-compose.yml                            |   8 +-
 server/config/vars.go                         |   3 +
 server/service/core/action/author/feed.go     |  24 +-
 server/service/core/action/category/feed.go   |  35 ++-
 server/service/core/action/format/feed.go     |  26 +-
 server/service/core/action/policy/create.go   |   9 +-
 server/service/core/action/policy/default.go  |  10 +-
 server/service/core/action/policy/delete.go   |   9 +-
 server/service/core/action/policy/details.go  |   9 +-
 server/service/core/action/policy/list.go     |   9 +-
 server/service/core/action/policy/update.go   |   9 +-
 server/service/core/action/post/update.go     |  14 +-
 server/service/core/action/role/create.go     |  10 +-
 server/service/core/action/role/delete.go     |  10 +-
 server/service/core/action/role/details.go    |  11 +-
 server/service/core/action/role/list.go       |  10 +-
 server/service/core/action/role/update.go     |   9 +-
 .../service/core/action/role/user/create.go   |   9 +-
 .../service/core/action/role/user/delete.go   |   9 +-
 server/service/core/action/role/user/list.go  |   9 +-
 server/service/core/action/space/create.go    |  85 ++---
 server/service/core/action/space/delete.go    |   9 +-
 server/service/core/action/space/my.go        |  21 +-
 server/service/core/action/space/update.go    |   9 +-
 server/service/core/action/space/user.go      |   9 +-
 server/service/core/action/user/list.go       | 296 +++++++++---------
 server/service/core/action/user/route.go      |   2 +-
 .../service/fact-check/action/rating/list.go  |   1 -
 .../service/fact-check/action/rating/route.go |   2 +-
 server/service/route.go                       |   2 +-
 server/util/applicationID.go                  |  39 +++
 server/util/fact_check_permission.go          |   1 -
 server/util/getPermission.go                  | 130 ++++++++
 server/util/organisationID.go                 |   2 +-
 server/util/policy.go                         |  23 +-
 server/util/space.go                          |   6 +-
 studio/src/actions/policies.js                |   4 +-
 studio/src/actions/roles.js                   |  18 +-
 studio/src/actions/spaces.js                  |  19 +-
 studio/src/config/routesConfig.js             |   2 +-
 studio/src/layouts/basic.js                   |  14 +-
 studio/src/pages/policies/EditPolicy.js       |   6 +-
 .../pages/policies/components/ViewPolicy.js   |  10 +-
 .../roles/users/components/RoleUserList.js    |   7 +-
 studio/src/pages/roles/users/index.js         |  87 ++---
 studio/src/pages/users/index.js               |  46 +--
 studio/src/reducers/spacesReducer.js          |   8 +-
 47 files changed, 703 insertions(+), 397 deletions(-)
 create mode 100644 server/util/applicationID.go
 create mode 100644 server/util/getPermission.go

diff --git a/docker-compose.yml b/docker-compose.yml
index 0f372c957..fe2d6fb5c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,11 +18,9 @@ services:
     networks:
       - dega
 
-# networks:
-#   dega:
-  ##########################################################################
-  ######                        MINIO                                #######
-  ##########################################################################
+  #########################################################################
+  #####                        MINIO                                #######
+  #########################################################################
   minio:
     image: minio/minio
     ports:
diff --git a/server/config/vars.go b/server/config/vars.go
index cecfc9b42..25e1df9d1 100644
--- a/server/config/vars.go
+++ b/server/config/vars.go
@@ -59,6 +59,9 @@ func SetupVars() {
 		log.Fatal("please provide create_super_organisation (bool) config param")
 	}
 
+	if !viper.IsSet("organisation_permission_enabled") {
+		log.Fatal("please provide organisation permission enabled bool config param")
+	}
 	if viper.GetBool("create_super_organisation") {
 		if !viper.IsSet("kratos_public_url") {
 			log.Fatal("please provide kratos_public_url config param")
diff --git a/server/service/core/action/author/feed.go b/server/service/core/action/author/feed.go
index 6aff3d3c5..a906da9af 100644
--- a/server/service/core/action/author/feed.go
+++ b/server/service/core/action/author/feed.go
@@ -10,14 +10,22 @@ import (
 
 	"github.com/factly/dega-server/config"
 	"github.com/factly/dega-server/service/core/model"
+	"github.com/factly/dega-server/util"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
+	"github.com/factly/x/middlewarex"
 	"github.com/factly/x/paginationx"
 	"github.com/go-chi/chi"
 	"github.com/gorilla/feeds"
 )
 
 func Feeds(w http.ResponseWriter, r *http.Request) {
+	uID, err := middlewarex.GetUser(r.Context())
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
+		return
+	}
 	spaceID := chi.URLParam(r, "space_id")
 	sID, err := strconv.Atoi(spaceID)
 	if err != nil {
@@ -26,6 +34,13 @@ func Feeds(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	orgID, err := util.GetOrganisationIDfromSpaceID(uint(sID), uint(uID))
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
+		return
+	}
+
 	offset, limit := paginationx.Parse(r.URL.Query())
 	sort := r.URL.Query().Get("sort")
 	if sort != "asc" {
@@ -41,14 +56,13 @@ func Feeds(w http.ResponseWriter, r *http.Request) {
 		slugMap[each] = true
 	}
 
-	space := model.Space{}
-	space.ID = uint(sID)
-	if err := config.DB.Preload("Logo").First(&space).Error; err != nil {
+	space, err := util.GetSpacefromKavach(uint(uID), uint(orgID), uint(sID))
+	if err != nil {
 		loggerx.Error(err)
-		errorx.Render(w, errorx.Parser(errorx.RecordNotFound()))
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
 		return
 	}
-
+	
 	now := time.Now()
 	feed := &feeds.Feed{
 		Id:          fmt.Sprint(space.ID),
diff --git a/server/service/core/action/category/feed.go b/server/service/core/action/category/feed.go
index fcfa1eccd..19b9152e9 100644
--- a/server/service/core/action/category/feed.go
+++ b/server/service/core/action/category/feed.go
@@ -8,13 +8,22 @@ import (
 	"github.com/factly/dega-server/config"
 	"github.com/factly/dega-server/service/core/action/post"
 	"github.com/factly/dega-server/service/core/model"
+	"github.com/factly/dega-server/util"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
+	"github.com/factly/x/middlewarex"
 	"github.com/factly/x/paginationx"
 	"github.com/go-chi/chi"
 )
 
 func Feeds(w http.ResponseWriter, r *http.Request) {
+	uID, err := middlewarex.GetUser(r.Context())
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
+		return
+	}
+
 	spaceID := chi.URLParam(r, "space_id")
 	sID, err := strconv.Atoi(spaceID)
 	if err != nil {
@@ -23,6 +32,20 @@ func Feeds(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	orgID, err := util.GetOrganisationIDfromSpaceID(uint(sID), uint(uID))
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
+		return
+	}
+
+	space, err := util.GetSpacefromKavach(uint(uID), uint(orgID), uint(sID))
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+
 	offset, limit := paginationx.Parse(r.URL.Query())
 	sort := r.URL.Query().Get("sort")
 	if sort != "asc" {
@@ -32,14 +55,6 @@ func Feeds(w http.ResponseWriter, r *http.Request) {
 	slugs := chi.URLParam(r, "slugs")
 	categorySlugs := strings.Split(slugs, ",")
 
-	space := model.Space{}
-	space.ID = uint(sID)
-	if err := config.DB.Preload("Logo").First(&space).Error; err != nil {
-		loggerx.Error(err)
-		errorx.Render(w, errorx.Parser(errorx.RecordNotFound()))
-		return
-	}
-
 	categoryIDs := make([]uint, 0)
 	categoryList := make([]model.Category, 0)
 	config.DB.Model(&model.Category{}).Where("slug IN (?)", categorySlugs).Find(&categoryList)
@@ -47,7 +62,7 @@ func Feeds(w http.ResponseWriter, r *http.Request) {
 		categoryIDs = append(categoryIDs, each.ID)
 	}
 
-	feed := post.GetFeed(space)
+	feed := post.GetFeed(*space)
 
 	postList := make([]model.Post, 0)
 	config.DB.Model(&model.Post{}).Joins("JOIN post_categories ON posts.id = post_categories.post_id").Where(&model.Post{
@@ -55,7 +70,7 @@ func Feeds(w http.ResponseWriter, r *http.Request) {
 		SpaceID: uint(sID),
 	}).Where("is_page = ?", false).Where("category_id IN (?)", categoryIDs).Order("created_at " + sort).Offset(offset).Limit(limit).Find(&postList)
 
-	feed.Items = post.GetItemsList(postList, space)
+	feed.Items = post.GetItemsList(postList, *space)
 
 	if err := feed.WriteRss(w); err != nil {
 		loggerx.Error(err)
diff --git a/server/service/core/action/format/feed.go b/server/service/core/action/format/feed.go
index a3ae44ec2..46780294c 100644
--- a/server/service/core/action/format/feed.go
+++ b/server/service/core/action/format/feed.go
@@ -8,13 +8,21 @@ import (
 	"github.com/factly/dega-server/config"
 	"github.com/factly/dega-server/service/core/action/post"
 	"github.com/factly/dega-server/service/core/model"
+	"github.com/factly/dega-server/util"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
+	"github.com/factly/x/middlewarex"
 	"github.com/factly/x/paginationx"
 	"github.com/go-chi/chi"
 )
 
 func Feeds(w http.ResponseWriter, r *http.Request) {
+	uID, err := middlewarex.GetUser(r.Context())
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
+		return
+	}
 	spaceID := chi.URLParam(r, "space_id")
 	sID, err := strconv.Atoi(spaceID)
 	if err != nil {
@@ -23,6 +31,13 @@ func Feeds(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	orgID, err := util.GetOrganisationIDfromSpaceID(uint(sID), uint(uID))
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
+		return
+	}
+
 	offset, limit := paginationx.Parse(r.URL.Query())
 	sort := r.URL.Query().Get("sort")
 	if sort != "asc" {
@@ -32,11 +47,10 @@ func Feeds(w http.ResponseWriter, r *http.Request) {
 	slugs := chi.URLParam(r, "slugs")
 	formatSlugs := strings.Split(slugs, ",")
 
-	space := model.Space{}
-	space.ID = uint(sID)
-	if err := config.DB.Preload("Logo").First(&space).Error; err != nil {
+	space, err := util.GetSpacefromKavach(uint(uID), uint(orgID), uint(sID))
+	if err != nil {
 		loggerx.Error(err)
-		errorx.Render(w, errorx.Parser(errorx.RecordNotFound()))
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
 		return
 	}
 
@@ -47,7 +61,7 @@ func Feeds(w http.ResponseWriter, r *http.Request) {
 		formatIDs = append(formatIDs, each.ID)
 	}
 
-	feed := post.GetFeed(space)
+	feed := post.GetFeed(*space)
 
 	postList := make([]model.Post, 0)
 	config.DB.Model(&model.Post{}).Where(&model.Post{
@@ -55,7 +69,7 @@ func Feeds(w http.ResponseWriter, r *http.Request) {
 		SpaceID: uint(sID),
 	}).Where("is_page = ?", false).Where("format_id IN (?)", formatIDs).Order("created_at " + sort).Offset(offset).Limit(limit).Find(&postList)
 
-	feed.Items = post.GetItemsList(postList, space)
+	feed.Items = post.GetItemsList(postList, *space)
 
 	if err := feed.WriteRss(w); err != nil {
 		loggerx.Error(err)
diff --git a/server/service/core/action/policy/create.go b/server/service/core/action/policy/create.go
index 0e8a12f98..9c012e35a 100644
--- a/server/service/core/action/policy/create.go
+++ b/server/service/core/action/policy/create.go
@@ -57,6 +57,13 @@ func create(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	applicationID, err := util.GetApplicationID(uint(userID), "dega")
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
+		return
+	}
+
 	policyReq := kavachPolicy{}
 
 	err = json.NewDecoder(r.Body).Decode(&policyReq)
@@ -74,7 +81,7 @@ func create(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	requrl := viper.GetString("kavach_url") + "/organisations/" + fmt.Sprintf("%d", organisationID) + "/applications/" + viper.GetString("dega_application_id") + "/spaces/" + fmt.Sprintf("%d", spaceID) + "/policy"
+	requrl := viper.GetString("kavach_url") + "/organisations/" + fmt.Sprintf("%d", organisationID) + "/applications/" + fmt.Sprintf("%d", applicationID) + "/spaces/" + fmt.Sprintf("%d", spaceID) + "/policy"
 	req, err := http.NewRequest(http.MethodPost, requrl, buf)
 	if err != nil {
 		loggerx.Error(err)
diff --git a/server/service/core/action/policy/default.go b/server/service/core/action/policy/default.go
index 2dafa9541..d029d39b3 100644
--- a/server/service/core/action/policy/default.go
+++ b/server/service/core/action/policy/default.go
@@ -121,8 +121,14 @@ func createRoleandPolicyonKavach(role roleReq, policy policyReq, orgID, spaceID,
 	if err != nil {
 		return nil, err
 	}
+
+	applicationID, err := util.GetApplicationID(uint(userID), "dega")
+	if err != nil {
+		return nil, err
+	}
+
 	client := http.Client{Timeout: time.Second * time.Duration(timex.HTTP_TIMEOUT)}
-	req, err := http.NewRequest(http.MethodPost, viper.GetString("kavach_url")+"/organisations/"+fmt.Sprintf("%d", orgID)+"/applications/"+viper.GetString("dega_application_id")+"/spaces/"+fmt.Sprintf("%d", spaceID)+"/roles", buf)
+	req, err := http.NewRequest(http.MethodPost, viper.GetString("kavach_url")+"/organisations/"+fmt.Sprintf("%d", orgID)+"/applications/"+fmt.Sprintf("%d", applicationID)+"/spaces/"+fmt.Sprintf("%d", spaceID)+"/roles", buf)
 	if err != nil {
 		return nil, err
 	}
@@ -155,7 +161,7 @@ func createRoleandPolicyonKavach(role roleReq, policy policyReq, orgID, spaceID,
 		return nil, err
 	}
 
-	req, err = http.NewRequest(http.MethodPost, viper.GetString("kavach_url")+"/organisations/"+fmt.Sprintf("%d", orgID)+"/applications/"+viper.GetString("dega_application_id")+"/spaces/"+fmt.Sprintf("%d", spaceID)+"/policy", buf)
+	req, err = http.NewRequest(http.MethodPost, viper.GetString("kavach_url")+"/organisations/"+fmt.Sprintf("%d", orgID)+"/applications/"+fmt.Sprintf("%d", applicationID)+"/spaces/"+fmt.Sprintf("%d", spaceID)+"/policy", buf)
 	if err != nil {
 		return nil, err
 	}
diff --git a/server/service/core/action/policy/delete.go b/server/service/core/action/policy/delete.go
index df42ca4fa..be469d114 100644
--- a/server/service/core/action/policy/delete.go
+++ b/server/service/core/action/policy/delete.go
@@ -51,10 +51,17 @@ func delete(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	applicationID, err := util.GetApplicationID(uint(userID), "dega")
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+
 	/* delete old policy */
 	policyId := chi.URLParam(r, "policy_id")
 
-	reqURL := viper.GetString("kavach_url") + fmt.Sprintf("/organisations/%d/applications/%d/spaces/%d/policy/%s", organisationID, viper.GetInt("dega_application_id"), spaceID, policyId)
+	reqURL := viper.GetString("kavach_url") + fmt.Sprintf("/organisations/%d/applications/%d/spaces/%d/policy/%s", organisationID, applicationID, spaceID, policyId)
 	req, err := http.NewRequest(http.MethodDelete, reqURL, nil)
 	if err != nil {
 		loggerx.Error(err)
diff --git a/server/service/core/action/policy/details.go b/server/service/core/action/policy/details.go
index 6da863f9a..ccf25d4d6 100644
--- a/server/service/core/action/policy/details.go
+++ b/server/service/core/action/policy/details.go
@@ -52,9 +52,16 @@ func details(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	applicationID, err := util.GetApplicationID(uint(userID), "dega")
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
+		return
+	}
+
 	policyID := chi.URLParam(r, "policy_id")
 
-	reqURL := viper.GetString("kavach_url") + fmt.Sprintf("/organisations/%d/applications/%d/spaces/%d/policy/%s", organisationID, viper.GetInt("dega_application_id"), spaceID, policyID)
+	reqURL := viper.GetString("kavach_url") + fmt.Sprintf("/organisations/%d/applications/%d/spaces/%d/policy/%s", organisationID, applicationID, spaceID, policyID)
 	req, err := http.NewRequest("GET", reqURL, nil)
 	if err != nil {
 		loggerx.Error(err)
diff --git a/server/service/core/action/policy/list.go b/server/service/core/action/policy/list.go
index c57b253e0..abe007766 100644
--- a/server/service/core/action/policy/list.go
+++ b/server/service/core/action/policy/list.go
@@ -53,7 +53,14 @@ func list(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	reqURL := viper.GetString("kavach_url") + fmt.Sprintf("/organisations/%d/applications/%d/spaces/%d/policy", organisationID, viper.GetInt("dega_application_id"), spaceID)
+	applicationID, err := util.GetApplicationID(uint(userID), "dega")
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
+		return
+	}
+
+	reqURL := viper.GetString("kavach_url") + fmt.Sprintf("/organisations/%d/applications/%d/spaces/%d/policy", organisationID, applicationID, spaceID)
 	req, err := http.NewRequest("GET", reqURL, nil)
 	if err != nil {
 		loggerx.Error(err)
diff --git a/server/service/core/action/policy/update.go b/server/service/core/action/policy/update.go
index c55a42d47..7a9a161ce 100644
--- a/server/service/core/action/policy/update.go
+++ b/server/service/core/action/policy/update.go
@@ -54,6 +54,13 @@ func update(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	applicationID, err := util.GetApplicationID(uint(userID), "dega")
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
+		return
+	}
+
 	policyID := chi.URLParam(r, "policy_id")
 	/* create new policy */
 	policyReq := kavachPolicy{}
@@ -72,7 +79,7 @@ func update(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	requrl := viper.GetString("kavach_url") + "/organisations/" + fmt.Sprintf("%d", organisationID) + "/applications/" + viper.GetString("dega_application_id") + "/spaces/" + fmt.Sprintf("%d", spaceID) + "/policy/" + policyID
+	requrl := viper.GetString("kavach_url") + "/organisations/" + fmt.Sprintf("%d", organisationID) + "/applications/" + fmt.Sprintf("%d", applicationID) + "/spaces/" + fmt.Sprintf("%d", spaceID) + "/policy/" + policyID
 	req, err := http.NewRequest(http.MethodPut, requrl, buf)
 	if err != nil {
 		loggerx.Error(err)
diff --git a/server/service/core/action/post/update.go b/server/service/core/action/post/update.go
index 083aecaf1..e3814c340 100644
--- a/server/service/core/action/post/update.go
+++ b/server/service/core/action/post/update.go
@@ -252,7 +252,7 @@ func update(w http.ResponseWriter, r *http.Request) {
 		updateMap["status"] = "draft"
 	}
 
-	err = tx.Model(&result.Post).Updates(&updateMap).Preload("Medium").Preload("Format").Preload("Tags").Preload("Categories").Preload("Space.Logo").First(&result.Post).Error
+	err = tx.Model(&result.Post).Updates(&updateMap).Preload("Medium").Preload("Format").Preload("Tags").Preload("Categories").First(&result.Post).Error
 
 	if err != nil {
 		tx.Rollback()
@@ -478,18 +478,8 @@ func update(w http.ResponseWriter, r *http.Request) {
 }
 
 func getPublishPermissions(oID, sID, uID int) (int, error) {
-	commonString := fmt.Sprint(":org:", oID, ":app:dega:space:", sID, ":")
 
-	kresource := fmt.Sprint("resources", commonString, "posts")
-	kaction := fmt.Sprint("actions", commonString, "posts:publish")
-
-	result := util.KetoAllowed{}
-
-	result.Action = kaction
-	result.Resource = kresource
-	result.Subject = fmt.Sprint(uID)
-
-	resStatus, err := util.IsAllowed(result, uint(oID), uint(sID), uint(uID))
+	resStatus, err := util.IsAllowed("posts", "publish", uint(oID), uint(sID), uint(uID))
 	if err != nil {
 		return 0, err
 	}
diff --git a/server/service/core/action/role/create.go b/server/service/core/action/role/create.go
index 95613b105..dcff9f357 100644
--- a/server/service/core/action/role/create.go
+++ b/server/service/core/action/role/create.go
@@ -50,6 +50,14 @@ func create(w http.ResponseWriter, r *http.Request) {
 		errorx.Render(w, errorx.Parser(errorx.DecodeError()))
 		return
 	}
+
+	applicationID, err := util.GetApplicationID(uint(uID), "dega")
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
+		return
+	}
+
 	buf := new(bytes.Buffer)
 	err = json.NewEncoder(buf).Encode(spaceRole)
 	if err != nil {
@@ -58,7 +66,7 @@ func create(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	requrl := viper.GetString("kavach_url") + "/organisations/" + fmt.Sprintf("%d", orgID) + "/applications/" + viper.GetString("dega_application_id") + "/spaces/" + spaceID + "/roles"
+	requrl := viper.GetString("kavach_url") + "/organisations/" + fmt.Sprintf("%d", orgID) + "/applications/" + fmt.Sprintf("%d", applicationID) + "/spaces/" + spaceID + "/roles"
 	req, err := http.NewRequest("POST", requrl, buf)
 	if err != nil {
 		loggerx.Error(err)
diff --git a/server/service/core/action/role/delete.go b/server/service/core/action/role/delete.go
index f29a17af6..df7c2668a 100644
--- a/server/service/core/action/role/delete.go
+++ b/server/service/core/action/role/delete.go
@@ -39,7 +39,15 @@ func delete(w http.ResponseWriter, r *http.Request) {
 		errorx.Render(w, errorx.Parser(errorx.DecodeError()))
 		return
 	}
-	reqURL := viper.GetString("kavach_url") + fmt.Sprintf("/organisations/%d/applications/%d/spaces/%s/roles/%s", orgID, viper.GetInt("dega_application_id"), spaceID, roleID)
+
+	applicationID, err := util.GetApplicationID(uint(uID), "dega")
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
+		return
+	}
+
+	reqURL := viper.GetString("kavach_url") + fmt.Sprintf("/organisations/%d/applications/%d/spaces/%s/roles/%s", orgID, applicationID, spaceID, roleID)
 	client := http.Client{Timeout: time.Minute * time.Duration(timex.HTTP_TIMEOUT)}
 
 	req, err := http.NewRequest(http.MethodDelete, reqURL, nil)
diff --git a/server/service/core/action/role/details.go b/server/service/core/action/role/details.go
index 92ba91d0f..c6d8c5b3c 100644
--- a/server/service/core/action/role/details.go
+++ b/server/service/core/action/role/details.go
@@ -40,10 +40,17 @@ func details(w http.ResponseWriter, r *http.Request) {
 		errorx.Render(w, errorx.Parser(errorx.DecodeError()))
 		return
 	}
-	
+
+	applicationID, err := util.GetApplicationID(uint(uID), "dega")
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
+		return
+	}
+
 	roleID := chi.URLParam(r, "role_id")
 
-	reqURL := viper.GetString("kavach_url") + fmt.Sprintf("/organisations/%d/applications/%d/spaces/%s/roles/%s", orgID, viper.GetInt("dega_application_id"), spaceID, roleID)
+	reqURL := viper.GetString("kavach_url") + fmt.Sprintf("/organisations/%d/applications/%d/spaces/%s/roles/%s", orgID, applicationID, spaceID, roleID)
 	client := http.Client{Timeout: time.Minute * time.Duration(timex.HTTP_TIMEOUT)}
 
 	req, err := http.NewRequest(http.MethodGet, reqURL, nil)
diff --git a/server/service/core/action/role/list.go b/server/service/core/action/role/list.go
index b165a848f..8051ed029 100644
--- a/server/service/core/action/role/list.go
+++ b/server/service/core/action/role/list.go
@@ -40,7 +40,15 @@ func list(w http.ResponseWriter, r *http.Request) {
 		errorx.Render(w, errorx.Parser(errorx.DecodeError()))
 		return
 	}
-	req, err := http.NewRequest("GET", viper.GetString("kavach_url")+"/organisations/"+fmt.Sprintf("%d", orgID)+"/applications/"+viper.GetString("dega_application_id")+"/spaces/"+spaceID+"/roles", nil)
+
+	applicationID, err := util.GetApplicationID(uint(uID), "dega")
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
+		return
+	}
+
+	req, err := http.NewRequest("GET", viper.GetString("kavach_url")+"/organisations/"+fmt.Sprintf("%d", orgID)+"/applications/"+fmt.Sprintf("%d", applicationID)+"/spaces/"+spaceID+"/roles", nil)
 	if err != nil {
 		loggerx.Error(err)
 		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
diff --git a/server/service/core/action/role/update.go b/server/service/core/action/role/update.go
index a443b6ad6..3b7d5331d 100644
--- a/server/service/core/action/role/update.go
+++ b/server/service/core/action/role/update.go
@@ -44,6 +44,13 @@ func update(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	applicationID, err := util.GetApplicationID(uint(uID), "dega")
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
+		return
+	}
+
 	roleID := chi.URLParam(r, "role_id")
 	spaceRole := new(model.SpaceRole)
 	err = json.NewDecoder(r.Body).Decode(spaceRole)
@@ -61,7 +68,7 @@ func update(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	requrl := viper.GetString("kavach_url") + "/organisations/" + fmt.Sprintf("%d", orgID) + "/applications/" + viper.GetString("dega_application_id") + "/spaces/" + spaceID + "/roles/" + roleID
+	requrl := viper.GetString("kavach_url") + "/organisations/" + fmt.Sprintf("%d", orgID) + "/applications/" + fmt.Sprintf("%d", applicationID) + "/spaces/" + spaceID + "/roles/" + roleID
 	req, err := http.NewRequest(http.MethodPut, requrl, buf)
 	if err != nil {
 		loggerx.Error(err)
diff --git a/server/service/core/action/role/user/create.go b/server/service/core/action/role/user/create.go
index a9be31670..f714089d4 100644
--- a/server/service/core/action/role/user/create.go
+++ b/server/service/core/action/role/user/create.go
@@ -46,6 +46,13 @@ func create(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	applicationID, err := util.GetApplicationID(uint(uID), "dega")
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
+		return
+	}
+
 	roleID := chi.URLParam(r, "role_id")
 
 	// decoding the requestBody
@@ -65,7 +72,7 @@ func create(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	reqURL := viper.GetString("kavach_url") + fmt.Sprintf("/organisations/%d/applications/%d/spaces/%s/roles/%s/users", orgID, viper.GetInt("dega_application_id"), spaceID, roleID)
+	reqURL := viper.GetString("kavach_url") + fmt.Sprintf("/organisations/%d/applications/%d/spaces/%s/roles/%s/users", orgID, applicationID, spaceID, roleID)
 	req, err := http.NewRequest(http.MethodPost, reqURL, buf)
 	if err != nil {
 		loggerx.Error(err)
diff --git a/server/service/core/action/role/user/delete.go b/server/service/core/action/role/user/delete.go
index 56a833242..3d8cc9172 100644
--- a/server/service/core/action/role/user/delete.go
+++ b/server/service/core/action/role/user/delete.go
@@ -39,10 +39,17 @@ func delete(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	applicationID, err := util.GetApplicationID(uint(uID), "dega")
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
+		return
+	}
+
 	roleID := chi.URLParam(r, "role_id")
 	userID := chi.URLParam(r, "user_id")
 
-	reqURL := viper.GetString("kavach_url") + fmt.Sprintf("/organisations/%d/applications/%d/spaces/%s/roles/%s/users/%s", orgID, viper.GetInt("dega_application_id"), spaceID, roleID, userID)
+	reqURL := viper.GetString("kavach_url") + fmt.Sprintf("/organisations/%d/applications/%d/spaces/%s/roles/%s/users/%s", orgID, applicationID, spaceID, roleID, userID)
 	client := http.Client{Timeout: time.Minute * time.Duration(timex.HTTP_TIMEOUT)}
 	req, err := http.NewRequest(http.MethodDelete, reqURL, nil)
 	if err != nil {
diff --git a/server/service/core/action/role/user/list.go b/server/service/core/action/role/user/list.go
index c18b06b2c..b31d64402 100644
--- a/server/service/core/action/role/user/list.go
+++ b/server/service/core/action/role/user/list.go
@@ -41,6 +41,13 @@ func list(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	applicationID, err := util.GetApplicationID(uint(uID), "dega")
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
+		return
+	}
+
 	rID := chi.URLParam(r, "role_id")
 	roleID, err := strconv.Atoi(rID)
 	if err != nil {
@@ -49,7 +56,7 @@ func list(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	req, err := http.NewRequest("GET", viper.GetString("kavach_url")+fmt.Sprintf("/organisations/%d/applications/", orgID)+viper.GetString("dega_application_id")+"/spaces/"+fmt.Sprintf("%d", spaceID)+fmt.Sprintf("/roles/%d", roleID)+"/users", nil)
+	req, err := http.NewRequest("GET", viper.GetString("kavach_url")+fmt.Sprintf("/organisations/%d/applications/", orgID)+fmt.Sprintf("%d", applicationID)+"/spaces/"+fmt.Sprintf("%d", spaceID)+fmt.Sprintf("/roles/%d", roleID)+"/users", nil)
 	if err != nil {
 		loggerx.Error(err)
 		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
diff --git a/server/service/core/action/space/create.go b/server/service/core/action/space/create.go
index e21398d04..c82909851 100644
--- a/server/service/core/action/space/create.go
+++ b/server/service/core/action/space/create.go
@@ -43,6 +43,13 @@ func create(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	applicationID, err := util.GetApplicationID(uint(uID), "dega")
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
+		return
+	}
+
 	space := space{}
 	err = json.NewDecoder(r.Body).Decode(&space)
 	if err != nil {
@@ -85,7 +92,45 @@ func create(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	req, err := http.NewRequest("POST", viper.GetString("kavach_url")+"/organisations/"+fmt.Sprintf("%d", space.OrganisationID)+"/applications/"+viper.GetString("dega_application_id")+"/spaces", buf)
+	var superOrgID int
+	superOrgID, err = middlewarex.GetSuperOrganisationID("Kavach")
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		return
+	}
+	if viper.GetBool("create_super_organisation") && viper.GetBool("organisation_permission_enabled") {
+		// Fetch organisation permissions
+		permission := model.OrganisationPermission{}
+		err = config.DB.Model(&model.OrganisationPermission{}).Where(&model.OrganisationPermission{
+			OrganisationID: uint(space.OrganisationID),
+		}).First(&permission).Error
+
+		if err != nil && space.OrganisationID != superOrgID {
+			loggerx.Error(err)
+			errorx.Render(w, errorx.Parser(errorx.GetMessage("cannot create more spaces", http.StatusUnprocessableEntity)))
+			return
+		}
+
+		// if err == nil {
+		// 	// Fetch total number of spaces in organisation
+		// 	// var totSpaces int64
+		// 	// err = config.DB.Model(&model.Space{}).Where(&model.Space{
+		// 	// 	OrganisationID: space.OrganisationID,
+		// 	// }).Count(&totSpaces).Error
+		// 	// if err != nil {
+		// 	// 	loggerx.Error(err)
+		// 	// 	errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+		// 	// 	return
+		// 	// }
+		// 	// if totSpaces >= permission.Spaces && permission.Spaces > 0 {
+		// 	// 	errorx.Render(w, errorx.Parser(errorx.GetMessage("cannot create more spaces", http.StatusUnprocessableEntity)))
+		// 	// 	return
+		// 	// }
+		// }
+	}
+
+	req, err := http.NewRequest("POST", viper.GetString("kavach_url")+"/organisations/"+fmt.Sprintf("%d", space.OrganisationID)+"/applications/"+fmt.Sprintf("%d", applicationID)+"/spaces", buf)
 	if err != nil {
 		loggerx.Error(err)
 		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
@@ -137,44 +182,6 @@ func create(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	var superOrgID int
-	if viper.GetBool("create_super_organisation") {
-		superOrgID, err = middlewarex.GetSuperOrganisationID("Kavach")
-		if err != nil {
-			loggerx.Error(err)
-			errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
-			return
-		}
-		// Fetch organisation permissions
-		permission := model.OrganisationPermission{}
-		err = config.DB.Model(&model.OrganisationPermission{}).Where(&model.OrganisationPermission{
-			OrganisationID: uint(space.OrganisationID),
-		}).First(&permission).Error
-
-		if err != nil && space.OrganisationID != superOrgID {
-			loggerx.Error(err)
-			errorx.Render(w, errorx.Parser(errorx.GetMessage("cannot create more spaces", http.StatusUnprocessableEntity)))
-			return
-		}
-
-		// if err == nil {
-		// 	// Fetch total number of spaces in organisation
-		// 	var totSpaces int64
-		// 	err = config.DB.Model(&model.Space{}).Where(&model.Space{
-		// 		OrganisationID: space.OrganisationID,
-		// 	}).Count(&totSpaces).Error
-		// 	if err != nil {
-		// 		loggerx.Error(err)
-		// 		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
-		// 		return
-		// 	}
-		// 	if totSpaces >= permission.Spaces && permission.Spaces > 0 {
-		// 		errorx.Render(w, errorx.Parser(errorx.GetMessage("cannot create more spaces", http.StatusUnprocessableEntity)))
-		// 		return
-		// 	}
-		// }
-	}
-
 	tx := config.DB.WithContext(context.WithValue(r.Context(), userContext, uID)).Begin()
 
 	if viper.GetBool("create_super_organisation") {
diff --git a/server/service/core/action/space/delete.go b/server/service/core/action/space/delete.go
index 585ff8963..cfed2f4a0 100644
--- a/server/service/core/action/space/delete.go
+++ b/server/service/core/action/space/delete.go
@@ -54,6 +54,13 @@ func delete(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	applicationID, err := util.GetApplicationID(uint(uID), "dega")
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
+		return
+	}
+
 	spaceObjectforDega, err := util.GetSpacefromKavach(uint(uID), uint(orgID), uint(sID))
 	if err != nil {
 		loggerx.Error(err)
@@ -62,7 +69,7 @@ func delete(w http.ResponseWriter, r *http.Request) {
 	}
 	// getting the details for the space to be deleted
 	client := http.Client{}
-	req, err := http.NewRequest("DELETE", viper.GetString("kavach_url")+fmt.Sprintf("/organisations/%d/applications/", orgID)+viper.GetString("dega_application_id")+"/spaces/"+spaceID, nil)
+	req, err := http.NewRequest("DELETE", viper.GetString("kavach_url")+fmt.Sprintf("/organisations/%d/applications/", orgID)+fmt.Sprintf("%d", applicationID)+"/spaces/"+spaceID, nil)
 	if err != nil {
 		loggerx.Error(err)
 		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
diff --git a/server/service/core/action/space/my.go b/server/service/core/action/space/my.go
index e7a89ecb5..6d13d468a 100644
--- a/server/service/core/action/space/my.go
+++ b/server/service/core/action/space/my.go
@@ -2,6 +2,7 @@ package space
 
 import (
 	"encoding/json"
+	"fmt"
 	"io/ioutil"
 	"net/http"
 	"strconv"
@@ -70,6 +71,14 @@ func my(w http.ResponseWriter, r *http.Request) {
 		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
 		return
 	}
+
+	applicationID, err := util.GetApplicationID(uint(uID), "dega")
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
+		return
+	}
+
 	// Fetched all organisations of the user
 	req, err := http.NewRequest(http.MethodGet, viper.GetString("kavach_url")+"/organisations/my", nil)
 	if err != nil {
@@ -106,7 +115,7 @@ func my(w http.ResponseWriter, r *http.Request) {
 	}
 
 	for index, organisation := range allOrg {
-		req, err := http.NewRequest("GET", viper.GetString("kavach_url")+"/organisations/"+strconv.Itoa(int(organisation.Organisation.ID))+"/applications/"+viper.GetString("dega_application_id")+"/spaces/", nil)
+		req, err := http.NewRequest("GET", viper.GetString("kavach_url")+"/organisations/"+strconv.Itoa(int(organisation.Organisation.ID))+"/applications/"+fmt.Sprintf("%d", applicationID)+"/spaces/", nil)
 		req.Header.Set("X-User", strconv.Itoa(uID))
 		if err != nil {
 			loggerx.Error(err)
@@ -121,7 +130,8 @@ func my(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 		defer resp.Body.Close()
-		organisationSpacesfromKavach := []model.KavachSpace{}
+
+		organisationSpacesfromKavach := make([]model.KavachSpace, 0)
 		err = json.NewDecoder(resp.Body).Decode(&organisationSpacesfromKavach)
 		if err != nil {
 			loggerx.Error(err)
@@ -155,7 +165,12 @@ func my(w http.ResponseWriter, r *http.Request) {
 				}
 				spaceWithPerm.Permissions = append(spaceWithPerm.Permissions, adminPerm)
 			} else {
-				spaceWithPerm.Permissions = []model.Permission{}
+				spaceWithPerm.Permissions, err = util.GetPermissions(organisation.Organisation.ID, eachSpace.ApplicationID, eachSpace.ID, uint(uID))
+				if err != nil {
+					loggerx.Error(err)
+					errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+					return
+				}
 			}
 
 			spaceWithPerm.AllowedServices, err = util.GetAllowedServices(eachSpace.ID)
diff --git a/server/service/core/action/space/update.go b/server/service/core/action/space/update.go
index 673e9eabb..3b20cc612 100644
--- a/server/service/core/action/space/update.go
+++ b/server/service/core/action/space/update.go
@@ -53,6 +53,13 @@ func update(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	applicationID, err := util.GetApplicationID(uint(uID), "dega")
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
+		return
+	}
+
 	space := &model.Space{}
 	err = json.NewDecoder(r.Body).Decode(&space)
 	if err != nil {
@@ -99,7 +106,7 @@ func update(w http.ResponseWriter, r *http.Request) {
 	}
 
 	client := http.Client{Timeout: time.Second * time.Duration(timex.HTTP_TIMEOUT)}
-	req, err := http.NewRequest("PUT", viper.GetString("kavach_url")+"/organisations/"+fmt.Sprintf("%d", space.OrganisationID)+"/applications/"+viper.GetString("dega_application_id")+"/spaces/"+fmt.Sprintf("%d", spaceID), buf)
+	req, err := http.NewRequest("PUT", viper.GetString("kavach_url")+"/organisations/"+fmt.Sprintf("%d", space.OrganisationID)+"/applications/"+fmt.Sprintf("%d", applicationID)+"/spaces/"+fmt.Sprintf("%d", spaceID), buf)
 	if err != nil {
 		loggerx.Error(err)
 		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
diff --git a/server/service/core/action/space/user.go b/server/service/core/action/space/user.go
index 36bbe2eee..6a1117b48 100644
--- a/server/service/core/action/space/user.go
+++ b/server/service/core/action/space/user.go
@@ -26,6 +26,13 @@ func users(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	applicationID, err := util.GetApplicationID(uint(uID), "dega")
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
+		return
+	}
+
 	sID := chi.URLParam(r, "space_id")
 	spaceID, err := strconv.Atoi(sID)
 	if err != nil {
@@ -41,7 +48,7 @@ func users(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	req, err := http.NewRequest("GET", viper.GetString("kavach_url")+fmt.Sprintf("/organisations/%d/applications/", orgID)+viper.GetString("dega_application_id")+"/spaces/"+fmt.Sprintf("%d", spaceID)+"/users", nil)
+	req, err := http.NewRequest("GET", viper.GetString("kavach_url")+fmt.Sprintf("/organisations/%d/applications/", orgID)+fmt.Sprintf("%d", applicationID)+"/spaces/"+fmt.Sprintf("%d", spaceID)+"/users", nil)
 	if err != nil {
 		loggerx.Error(err)
 		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
diff --git a/server/service/core/action/user/list.go b/server/service/core/action/user/list.go
index 438bc64a8..af47c0b95 100644
--- a/server/service/core/action/user/list.go
+++ b/server/service/core/action/user/list.go
@@ -1,156 +1,144 @@
 package user
 
-import (
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"strconv"
-	"strings"
-
-	"github.com/factly/dega-server/service/core/action/author"
-	"github.com/factly/dega-server/service/core/action/policy"
-
-	"github.com/factly/dega-server/service/core/model"
-	"github.com/factly/dega-server/util"
-	"github.com/factly/x/middlewarex"
-
-	"github.com/factly/x/errorx"
-	"github.com/factly/x/loggerx"
-	"github.com/factly/x/renderx"
-)
-
-// list response
-type paging struct {
-	Total int          `json:"total"`
-	Nodes []userPolicy `json:"nodes"`
-}
-
-type userPolicy struct {
-	model.Author
-	Policies []policyRes `json:"policies"`
-}
-
-type policyRes struct {
-	ID          string `json:"id"`
-	Name        string `json:"name"`
-	Description string `json:"description"`
-}
-
-// list - Get users with space access
-// @Summary Get users with space access
-// @Description Get users with space access
-// @Tags Users
-// @ID get-space-users
-// @Consume json
-// @Produce json
-// @Param X-User header string true "User ID"
-// @Param X-Space header string true "Space ID"
-// @Success 200 {object} paging
-// @Router /core/users [get]
-func list(w http.ResponseWriter, r *http.Request) {
-	sID, err := middlewarex.GetSpace(r.Context())
-	if err != nil {
-		loggerx.Error(err)
-		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
-		return
-	}
-
-	oID, err := util.GetOrganisation(r.Context())
-	if err != nil {
-		loggerx.Error(err)
-		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
-		return
-	}
-
-	userIDsMap := make(map[uint][]policyRes)
-
-	// get all the admins of the organisation
-	adminRoleID := fmt.Sprint("roles:org:", oID, ":admin")
-
-	resp, err := util.KetoGetRequest("/engines/acp/ory/regex/roles/" + adminRoleID)
-	if err != nil {
-		loggerx.Error(err)
-		errorx.Render(w, errorx.Parser(errorx.NetworkError()))
-		return
-	}
-
-	defer resp.Body.Close()
-
-	adminRole := model.KetoRole{}
-	err = json.NewDecoder(resp.Body).Decode(&adminRole)
-	if err != nil {
-		loggerx.Error(err)
-		errorx.Render(w, errorx.Parser(errorx.DecodeError()))
-		return
-	}
-
-	for _, member := range adminRole.Members {
-		memid, _ := strconv.Atoi(member)
-		userIDsMap[uint(memid)] = []policyRes{
-			policyRes{
-				ID:   "admin",
-				Name: "admin",
-			},
-		}
-	}
-
-	// Get all policies
-	policyList, err := policy.GetAllPolicies()
-	if err != nil {
-		loggerx.Error(err)
-		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
-		return
-	}
-
-	prefixName := fmt.Sprint("id:org:", oID, ":app:dega:space:", sID, ":")
-
-	// append subjects whose id has prefix for our space
-	for _, policy := range policyList {
-		if strings.HasPrefix(policy.ID, prefixName) {
-			policyNameTokens := strings.Split(policy.ID, ":")
-			policyID := policyNameTokens[len(policyNameTokens)-1]
-
-			for _, subject := range policy.Subjects {
-				subid, _ := strconv.Atoi(subject)
-
-				if _, found := userIDsMap[uint(subid)]; !found {
-					userIDsMap[uint(subid)] = make([]policyRes, 0)
-				}
-				polRes := policyRes{
-					ID:          policyID,
-					Name:        policyID,
-					Description: policy.Description,
-				}
-				userIDsMap[uint(subid)] = append(userIDsMap[uint(subid)], polRes)
-			}
-		}
-	}
-
-	// Fetch all the users
-	userMap, err := author.All(r.Context())
-	if err != nil {
-		loggerx.Error(err)
-		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
-		return
-	}
-
-	result := paging{}
-
-	userlist := make([]userPolicy, 0)
-
-	for usrID, pol := range userIDsMap {
-		userIDStr := fmt.Sprint(usrID)
-		if user, found := userMap[userIDStr]; found {
-			usrpol := userPolicy{
-				Policies: pol,
-				Author:   user,
-			}
-			userlist = append(userlist, usrpol)
-		}
-	}
-
-	result.Nodes = userlist
-	result.Total = len(userlist)
-
-	renderx.JSON(w, http.StatusOK, result)
-}
+// import (
+// 	"encoding/json"
+// 	"fmt"
+// 	"net/http"
+// 	"strconv"
+// 	"strings"
+
+// 	"github.com/factly/dega-server/service/core/action/author"
+// 	"github.com/factly/dega-server/service/core/action/policy"
+
+// 	"github.com/factly/dega-server/service/core/model"
+// 	"github.com/factly/dega-server/util"
+// 	"github.com/factly/x/middlewarex"
+
+// 	"github.com/factly/x/errorx"
+// 	"github.com/factly/x/loggerx"
+// 	"github.com/factly/x/renderx"
+// )
+
+// // list response
+// type paging struct {
+// 	Total int          `json:"total"`
+// 	Nodes []userPolicy `json:"nodes"`
+// }
+
+// type userPolicy struct {
+// 	model.Author
+// 	Policies []policyRes `json:"policies"`
+// }
+
+// type policyRes struct {
+// 	ID          string `json:"id"`
+// 	Name        string `json:"name"`
+// 	Description string `json:"description"`
+// }
+
+// // list - Get users with space access
+// // @Summary Get users with space access
+// // @Description Get users with space access
+// // @Tags Users
+// // @ID get-space-users
+// // @Consume json
+// // @Produce json
+// // @Param X-User header string true "User ID"
+// // @Param X-Space header string true "Space ID"
+// // @Success 200 {object} paging
+// // @Router /core/users [get]
+// func list(w http.ResponseWriter, r *http.Request) {
+// 	sID, err := middlewarex.GetSpace(r.Context())
+// 	if err != nil {
+// 		loggerx.Error(err)
+// 		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
+// 		return
+// 	}
+
+// 	oID, err := util.GetOrganisation(r.Context())
+// 	if err != nil {
+// 		loggerx.Error(err)
+// 		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
+// 		return
+// 	}
+
+// 	// defer resp.Body.Close()
+
+// 	// adminRole := model.User{}
+// 	// err = json.NewDecoder(resp.Body).Decode(&adminRole)
+// 	// if err != nil {
+// 	// 	loggerx.Error(err)
+// 	// 	errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+// 	// 	return
+// 	// }
+
+// 	// for _, member := range adminRole.Members {
+// 	// 	memid, _ := strconv.Atoi(member)
+// 	// 	userIDsMap[uint(memid)] = []policyRes{
+// 	// 		policyRes{
+// 	// 			ID:   "admin",
+// 	// 			Name: "admin",
+// 	// 		},
+// 	// 	}
+// 	// }
+
+// 	// Get all policies
+// 	policyList, err := policy.GetAllPolicies()
+// 	if err != nil {
+// 		loggerx.Error(err)
+// 		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+// 		return
+// 	}
+
+// 	prefixName := fmt.Sprint("id:org:", oID, ":app:dega:space:", sID, ":")
+
+// 	// append subjects whose id has prefix for our space
+// 	for _, policy := range policyList {
+// 		if strings.HasPrefix(policy.ID, prefixName) {
+// 			policyNameTokens := strings.Split(policy.ID, ":")
+// 			policyID := policyNameTokens[len(policyNameTokens)-1]
+
+// 			for _, subject := range policy.Subjects {
+// 				subid, _ := strconv.Atoi(subject)
+
+// 				if _, found := userIDsMap[uint(subid)]; !found {
+// 					userIDsMap[uint(subid)] = make([]policyRes, 0)
+// 				}
+// 				polRes := policyRes{
+// 					ID:          policyID,
+// 					Name:        policyID,
+// 					Description: policy.Description,
+// 				}
+// 				userIDsMap[uint(subid)] = append(userIDsMap[uint(subid)], polRes)
+// 			}
+// 		}
+// 	}
+
+// 	// Fetch all the users
+// 	userMap, err := author.All(r.Context())
+// 	if err != nil {
+// 		loggerx.Error(err)
+// 		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+// 		return
+// 	}
+
+// 	result := paging{}
+
+// 	userlist := make([]userPolicy, 0)
+
+// 	for usrID, pol := range userIDsMap {
+// 		userIDStr := fmt.Sprint(usrID)
+// 		if user, found := userMap[userIDStr]; found {
+// 			usrpol := userPolicy{
+// 				Policies: pol,
+// 				Author:   user,
+// 			}
+// 			userlist = append(userlist, usrpol)
+// 		}
+// 	}
+
+// 	result.Nodes = userlist
+// 	result.Total = len(userlist)
+
+// 	renderx.JSON(w, http.StatusOK, result)
+// }
diff --git a/server/service/core/action/user/route.go b/server/service/core/action/user/route.go
index abf115df6..5441828ab 100644
--- a/server/service/core/action/user/route.go
+++ b/server/service/core/action/user/route.go
@@ -6,7 +6,7 @@ import "github.com/go-chi/chi"
 func Router() chi.Router {
 	r := chi.NewRouter()
 
-	r.Get("/", list)
+	// r.Get("/", list)
 	r.Get("/{user_id}/permissions", userpermissions)
 
 	return r
diff --git a/server/service/fact-check/action/rating/list.go b/server/service/fact-check/action/rating/list.go
index 7e4dc1047..e4332c2df 100644
--- a/server/service/fact-check/action/rating/list.go
+++ b/server/service/fact-check/action/rating/list.go
@@ -32,7 +32,6 @@ type paging struct {
 // @Success 200 {object} paging
 // @Router /fact-check/ratings [get]
 func list(w http.ResponseWriter, r *http.Request) {
-
 	sID, err := middlewarex.GetSpace(r.Context())
 	if err != nil {
 		loggerx.Error(err)
diff --git a/server/service/fact-check/action/rating/route.go b/server/service/fact-check/action/rating/route.go
index 3966f9753..9b0fc9479 100644
--- a/server/service/fact-check/action/rating/route.go
+++ b/server/service/fact-check/action/rating/route.go
@@ -38,7 +38,7 @@ func Router() chi.Router {
 		r.With(util.CheckKetoPolicy(entity, "get")).Get("/", details)
 		r.With(util.CheckKetoPolicy(entity, "update")).Put("/", update)
 		r.With(util.CheckKetoPolicy(entity, "delete")).Delete("/", delete)
-	})
+	})	
 
 	return r
 
diff --git a/server/service/route.go b/server/service/route.go
index bf9653bdc..d8f6e8393 100644
--- a/server/service/route.go
+++ b/server/service/route.go
@@ -75,7 +75,7 @@ func RegisterRoutes() http.Handler {
 		r.With(util.PodcastPermission).Mount("/podcast", podcast.Router())
 		r.Mount("/reindex", reindex.Router())
 	})
-	
+
 	r.With(middlewarex.CheckUser).Group(func(r chi.Router) {
 		r.Post("/core/requests/organisations", organisation.Create)
 		r.With(middlewarex.CheckSpace(1)).Post("/core/requests/spaces", space.Create)
diff --git a/server/util/applicationID.go b/server/util/applicationID.go
new file mode 100644
index 000000000..b88f28a5b
--- /dev/null
+++ b/server/util/applicationID.go
@@ -0,0 +1,39 @@
+package util
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"net/http"
+	"time"
+
+	"github.com/factly/dega-server/util/timex"
+	"github.com/spf13/viper"
+)
+
+func GetApplicationID(userID uint, appSlug string) (uint, error) {
+	req, err := http.NewRequest(http.MethodGet, viper.GetString("kavach_url")+fmt.Sprintf("/util/application/%s", appSlug), nil)
+	if err != nil {
+		return 0, err
+	}
+
+	req.Header.Set("X-User", fmt.Sprintf("%d", userID))
+	client := http.Client{Timeout: time.Minute * time.Duration(timex.HTTP_TIMEOUT)}
+	response, err := client.Do(req)
+	if err != nil {
+		return 0, err
+	}
+
+	defer response.Body.Close()
+	responseBody := map[string]interface{}{}
+	err = json.NewDecoder(response.Body).Decode(&responseBody)
+	if err != nil {
+		return 0, err
+	}
+
+	if response.StatusCode != 200 {
+		return 0, errors.New("internal server error on kavach while getting application id from space id")
+	}
+	appID := int(responseBody["application_id"].(float64))
+	return uint(appID), nil
+}
diff --git a/server/util/fact_check_permission.go b/server/util/fact_check_permission.go
index 18d9b88a2..77a12720a 100644
--- a/server/util/fact_check_permission.go
+++ b/server/util/fact_check_permission.go
@@ -18,7 +18,6 @@ func FactCheckPermission(h http.Handler) http.Handler {
 				w.WriteHeader(http.StatusUnauthorized)
 				return
 			}
-
 			permission := model.SpacePermission{}
 			err = config.DB.Model(&model.SpacePermission{}).Where(&model.SpacePermission{
 				SpaceID: uint(sID),
diff --git a/server/util/getPermission.go b/server/util/getPermission.go
new file mode 100644
index 000000000..f951c836e
--- /dev/null
+++ b/server/util/getPermission.go
@@ -0,0 +1,130 @@
+package util
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"strings"
+	"time"
+
+	"github.com/factly/dega-server/service/core/model"
+	"github.com/factly/dega-server/util/timex"
+	"github.com/factly/x/loggerx"
+	"github.com/spf13/viper"
+)
+
+type RelationTuplesWithSubjectID struct {
+	Tuples []TupleWithSubjectID `json:"relation_tuples"`
+}
+
+type RelationTuplesWithSubjectSet struct {
+	Tuples []TupleWithSubjectSet `json:"relation_tuples"`
+}
+
+type SubjectSet struct {
+	Namespace string `json:"namespace"`
+	Object    string `json:"object"`
+	Relation  string `json:"relation"`
+}
+type TupleWithSubjectID struct {
+	SubjectSet
+	SubjectID string `json:"subject_id"`
+}
+
+type TupleWithSubjectSet struct {
+	SubjectSet
+	TuplesSubjectSet SubjectSet `json:"subject_set"`
+}
+
+const namespace string = "spaces"
+
+func GetPermissions(orgID, appID, spaceID, uID uint) ([]model.Permission, error) {
+	client := http.Client{Timeout: time.Minute * time.Duration(timex.HTTP_TIMEOUT)}
+	roleObject := fmt.Sprintf("roles:org:%d:app:%d:space:%d", orgID, appID, spaceID)
+	requestURL := viper.GetString("keto_url") + "/relation-tuples?namespace=spaces&" + fmt.Sprintf("subject_id=%d&object=%s", uID, roleObject)
+	req, err := http.NewRequest("GET", requestURL, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	response, err := client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+
+	if response.StatusCode != 200 {
+		return nil, err
+	}
+
+	tuples := RelationTuplesWithSubjectID{}
+	err = json.NewDecoder(response.Body).Decode(&tuples)
+	if err != nil {
+		return nil, err
+	}
+	var permissions []model.Permission
+	var ketoResponse = make(map[string][]string)
+	for _, tuple := range tuples.Tuples {
+		if strings.HasPrefix(tuple.Object, "roles") {
+			requestURL = viper.GetString("keto_url") + "/relation-tuples?" + fmt.Sprintf("namespace=%s&subject_set.namespace=%s&subject_set.object=%s&subject_set.relation=%s", namespace, namespace, roleObject, tuple.Relation)
+			req, err = http.NewRequest("GET", requestURL, nil)
+			if err != nil {
+				return nil, err
+			}
+			response, err = client.Do(req)
+			if err != nil {
+				return nil, err
+			}
+
+			if response.StatusCode != 200 {
+				return nil, err
+			}
+
+			resourceTuples := RelationTuplesWithSubjectSet{}
+			err = json.NewDecoder(response.Body).Decode(&resourceTuples)
+			if err != nil {
+				return nil, err
+			}
+
+			for _, resourceTuple := range resourceTuples.Tuples {
+				splittedObject := strings.Split(resourceTuple.Object, ":")
+				var entity string
+				if len(splittedObject) > 0 {
+					entity = splittedObject[len(splittedObject)-1]
+				}
+				actions, ok := ketoResponse[entity]
+				if ok {
+					if !contains(actions, resourceTuple.Relation) {
+						ketoResponse[entity] = append(actions, resourceTuple.Relation)
+					}
+				} else {
+					ketoResponse[entity] = append([]string{}, resourceTuple.Relation)
+				}
+			}
+		}
+	}
+
+	_, err = json.Marshal(ketoResponse)
+	if err != nil {
+		fmt.Print("here")
+		loggerx.Error(err)
+		return nil, err
+	}
+
+	for resource, action := range ketoResponse {
+		var permission model.Permission
+		permission.Resource = resource
+		permission.Actions = action
+		permissions = append(permissions, permission)
+	}
+
+	return permissions, nil
+}
+
+func contains(s []string, e string) bool {
+	for _, a := range s {
+		if a == e {
+			return true
+		}
+	}
+	return false
+}
diff --git a/server/util/organisationID.go b/server/util/organisationID.go
index cb8a631ca..8b08d4187 100644
--- a/server/util/organisationID.go
+++ b/server/util/organisationID.go
@@ -91,7 +91,7 @@ func GetOrganisationIDfromSpaceID(spaceID, userID uint) (int, error) {
 	}
 
 	if response.StatusCode != 200 {
-		return 0, errors.New("internal server error on kavach while getting space id from organisation id")
+		return 0, errors.New("internal server error on kavach while getting organisation id from space id")
 	}
 	organisationID := int(responseBody["organisation_id"].(float64))
 	return organisationID, nil
diff --git a/server/util/policy.go b/server/util/policy.go
index c0b2737ab..4a63d0061 100644
--- a/server/util/policy.go
+++ b/server/util/policy.go
@@ -44,23 +44,16 @@ func CheckKetoPolicy(entity, action string) func(h http.Handler) http.Handler {
 				return
 			}
 
-			result := KetoAllowed{}
-
-			result.Action = action
-			result.Resource = entity
-			result.Subject = fmt.Sprint(uID)
-			result.SubjectType = "id"
-			resStatus, err := IsAllowed(result, uint(oID), uint(sID), uint(uID))
+			resStatus, err := IsAllowed(entity, action, uint(oID), uint(sID), uint(uID))
 			if err != nil {
 				w.WriteHeader(http.StatusUnauthorized)
 				return
 			}
 
-			if resStatus != 200 {
+			if resStatus != http.StatusOK {
 				w.WriteHeader(http.StatusUnauthorized)
 				return
 			}
-
 			h.ServeHTTP(w, r)
 		})
 	}
@@ -103,7 +96,7 @@ func CheckAdmin(orgID, uID uint) (bool, error) {
 }
 
 // IsAllowed checks if keto policy allows user to action on resource
-func IsAllowed(result KetoAllowed, orgID, spaceID, userID uint) (int, error) {
+func IsAllowed(entity, action string, orgID, spaceID, userID uint) (int, error) {
 	isAdmin, err := CheckAdmin(orgID, userID)
 	if err != nil {
 		return 0, err
@@ -111,19 +104,19 @@ func IsAllowed(result KetoAllowed, orgID, spaceID, userID uint) (int, error) {
 	if isAdmin {
 		return http.StatusOK, nil
 	}
-	buf := new(bytes.Buffer)
-	err = json.NewEncoder(buf).Encode(&result)
+
+	applicationID, err := GetApplicationID(uint(userID), "dega")
 	if err != nil {
 		return 0, err
 	}
 
-	req, err := http.NewRequest("POST", viper.GetString("kavach_url")+fmt.Sprintf("/organisations/%d/applications/%s/spaces/%d/policy/allowed", orgID, viper.GetString("dega_application_id"), spaceID), buf)
+	object := fmt.Sprintf("resource:org:%d:app:%d:space:%d:%s", orgID, applicationID, spaceID, entity)
+	reqURL := viper.GetString("keto_url") + "/relation-tuples/check?" + fmt.Sprintf("namespace=%s&object=%s&relation=%s&subject_id=%d", namespace, object, action, userID)
+	req, err := http.NewRequest(http.MethodGet, reqURL, nil)
 	if err != nil {
 		return 0, err
 	}
-	req.Header.Set("X-User", fmt.Sprintf("%d", userID))
 	req.Header.Set("Content-Type", "application/json")
-
 	client := http.Client{Timeout: time.Minute * time.Duration(timex.HTTP_TIMEOUT)}
 	resp, err := client.Do(req)
 	if err != nil {
diff --git a/server/util/space.go b/server/util/space.go
index f9c45e3a8..a7609f880 100644
--- a/server/util/space.go
+++ b/server/util/space.go
@@ -12,7 +12,11 @@ import (
 )
 
 func GetSpacefromKavach(userID, orgID, spaceID uint) (*model.Space, error) {
-	req, err := http.NewRequest("GET", viper.GetString("kavach_url")+fmt.Sprintf("/organisations/%d/applications/", orgID)+viper.GetString("dega_application_id")+"/spaces/"+fmt.Sprintf("%d", spaceID), nil)
+	applicationID, err := GetApplicationID(uint(userID), "dega")
+	if err != nil {
+		return nil, err
+	}
+	req, err := http.NewRequest("GET", viper.GetString("kavach_url")+fmt.Sprintf("/organisations/%d/applications/", orgID)+fmt.Sprintf("%d", applicationID)+"/spaces/"+fmt.Sprintf("%d", spaceID), nil)
 	if err != nil {
 		return nil, err
 	}
diff --git a/studio/src/actions/policies.js b/studio/src/actions/policies.js
index 96cf1e19a..5038ad2e1 100644
--- a/studio/src/actions/policies.js
+++ b/studio/src/actions/policies.js
@@ -66,7 +66,7 @@ export const getPolicy = (id) => {
     return axios
       .get(POLICIES_API + '/' + id)
       .then((response) => {
-        console.log(response.data)
+        console.log(response.data);
         dispatch(addPolicy(GET_POLICY, response.data));
       })
       .catch((error) => {
@@ -94,7 +94,7 @@ export const createPolicy = (data) => {
 
 // action to update policy by id
 export const updatePolicy = (data) => {
-  console.log({data})
+  console.log({ data });
   return (dispatch) => {
     dispatch(loadingPolicies());
     return axios
diff --git a/studio/src/actions/roles.js b/studio/src/actions/roles.js
index 9b3307400..7913f2f11 100644
--- a/studio/src/actions/roles.js
+++ b/studio/src/actions/roles.js
@@ -109,7 +109,7 @@ export const deleteRole = (id) => {
 };
 
 export const addRoleUser = (roleID, data) => {
-  return (dispatch, getState) => {  
+  return (dispatch, getState) => {
     const currentSpaceID = getState().spaces?.selected;
     dispatch(loadingRoles());
     return axios
@@ -121,10 +121,10 @@ export const addRoleUser = (roleID, data) => {
         dispatch(addErrorNotification(getError(error)));
       })
       .finally(() => {
-        dispatch(stopRolesLoading())
-      })
-  }
-}
+        dispatch(stopRolesLoading());
+      });
+  };
+};
 
 export const deleteRoleUser = (roleID, userID) => {
   return (dispatch, getState) => {
@@ -139,10 +139,10 @@ export const deleteRoleUser = (roleID, userID) => {
         dispatch(addErrorNotification(getError(error)));
       })
       .finally(() => {
-        dispatch(stopRolesLoading())
-      })   
-  }
-}
+        dispatch(stopRolesLoading());
+      });
+  };
+};
 export const loadingRoles = () => ({
   type: SET_ROLES_LOADING,
   payload: true,
diff --git a/studio/src/actions/spaces.js b/studio/src/actions/spaces.js
index dd1fa4b71..745cb00fa 100644
--- a/studio/src/actions/spaces.js
+++ b/studio/src/actions/spaces.js
@@ -89,16 +89,16 @@ export const getSpaceUsers = () => {
   return (dispatch, getState) => {
     const currentSpaceID = getState().spaces?.selected;
     dispatch(loadingSpaces());
-    return axios.
-      get(`/core/spaces/${currentSpaceID}/users`)
+    return axios
+      .get(`/core/spaces/${currentSpaceID}/users`)
       .then((response) => {
-        dispatch(addSpaceUsers(currentSpaceID, response.data))
+        dispatch(addSpaceUsers(currentSpaceID, response.data));
       })
       .catch((error) => {
         dispatch(addErrorNotification(getError(error)));
-      })
-  }
-} 
+      });
+  };
+};
 export const loadingSpaces = () => ({
   type: LOADING_SPACES,
 });
@@ -127,7 +127,6 @@ export const addSpaceUsers = (id, data) => ({
   type: ADD_SPACE_USERS,
   payload: {
     id,
-    data
-  }
-})
-
+    data,
+  },
+});
diff --git a/studio/src/config/routesConfig.js b/studio/src/config/routesConfig.js
index f31188c6a..d270f457d 100644
--- a/studio/src/config/routesConfig.js
+++ b/studio/src/config/routesConfig.js
@@ -423,7 +423,7 @@ const routes = {
     path: '/members/roles/:roleID/users',
     menuKey: '/members',
     Component: RoleUsers,
-    title: 'Role Users'
+    title: 'Role Users',
   },
   createPolicy: {
     path: '/members/policies/create',
diff --git a/studio/src/layouts/basic.js b/studio/src/layouts/basic.js
index be9a6e466..59f792d3f 100644
--- a/studio/src/layouts/basic.js
+++ b/studio/src/layouts/basic.js
@@ -78,9 +78,11 @@ function BasicLayout(props) {
   });
 
   React.useEffect(() => {
-    dispatch(getSpaces()).then((org) => {
-      if (org && org.length > 0) dispatch(getSuperOrganisation(org[0].id));
-    });
+    dispatch(getSpaces());
+    // .then((org) => {
+    // if (org && org.length > 0) dispatch(getSuperOrganisation(org[0].id));
+    // }
+    // );
   }, [dispatch, selected]);
 
   React.useEffect(() => {
@@ -94,9 +96,9 @@ function BasicLayout(props) {
   }, [time, description]);
 
   React.useEffect(() => {
-    // if (redirect?.code === 307) {
-    //   window.location.href = window.REACT_APP_KAVACH_PUBLIC_URL;
-    // }
+    if (redirect?.code === 307) {
+      window.location.href = window.REACT_APP_KAVACH_PUBLIC_URL;
+    }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [redirect]);
 
diff --git a/studio/src/pages/policies/EditPolicy.js b/studio/src/pages/policies/EditPolicy.js
index 4952a67cd..38ac68706 100644
--- a/studio/src/pages/policies/EditPolicy.js
+++ b/studio/src/pages/policies/EditPolicy.js
@@ -28,7 +28,7 @@ function EditPolicy() {
           (obj, item) => Object.assign(obj, { [item.resource]: item.actions }),
           {},
         ),
-        roles: state.policies.details[id].roles?.length 
+        roles: state.policies.details[id].roles?.length
           ? state.policies.details[id].roles.map((item) => item.id)
           : [],
       },
@@ -47,9 +47,7 @@ function EditPolicy() {
   }
 
   const onUpdate = (values) => {
-    dispatch(updatePolicy({ ...policy, ...values })).then(() =>
-      history.push(`/members/policies/`),
-    );
+    dispatch(updatePolicy({ ...policy, ...values })).then(() => history.push(`/members/policies/`));
   };
 
   return (
diff --git a/studio/src/pages/policies/components/ViewPolicy.js b/studio/src/pages/policies/components/ViewPolicy.js
index 3e5182968..30bfc5c4f 100644
--- a/studio/src/pages/policies/components/ViewPolicy.js
+++ b/studio/src/pages/policies/components/ViewPolicy.js
@@ -4,7 +4,7 @@ import { Link, useParams } from 'react-router-dom';
 import { useSelector } from 'react-redux';
 
 export default function ViewPolicy() {
-  const { policyID } = useParams()
+  const { policyID } = useParams();
   const span = 2;
   const nestedTableColumns = [
     {
@@ -30,10 +30,10 @@ export default function ViewPolicy() {
 
   const { policy, loading } = useSelector((state) => {
     return {
-      policy:  state.policies.details?.[policyID],
-      loading: state.policies.loading
-    }
-  })
+      policy: state.policies.details?.[policyID],
+      loading: state.policies.loading,
+    };
+  });
 
   return (
     <div
diff --git a/studio/src/pages/roles/users/components/RoleUserList.js b/studio/src/pages/roles/users/components/RoleUserList.js
index 69bf4e2d7..1f8b5df01 100644
--- a/studio/src/pages/roles/users/components/RoleUserList.js
+++ b/studio/src/pages/roles/users/components/RoleUserList.js
@@ -41,11 +41,8 @@ export default function UserList({ users, roleID }) {
   ];
 
   const deleteUser = (id) => {
-    dispatch(deleteRoleUser(roleID, id)).then(() =>
-      dispatch(getRoles())
-    );
+    dispatch(deleteRoleUser(roleID, id)).then(() => dispatch(getRoles()));
   };
 
   return <Table bordered columns={columns} dataSource={users} rowKey={'id'} />;
-
-}
\ No newline at end of file
+}
diff --git a/studio/src/pages/roles/users/index.js b/studio/src/pages/roles/users/index.js
index 696077067..75b97952f 100644
--- a/studio/src/pages/roles/users/index.js
+++ b/studio/src/pages/roles/users/index.js
@@ -1,4 +1,3 @@
-
 import React from 'react';
 import { Space, Form, Button, Select, Skeleton } from 'antd';
 import { Link, useParams } from 'react-router-dom';
@@ -10,31 +9,35 @@ import { addRoleUser, deleteRoleUser, getRoles } from '../../../actions/roles';
 export default function RoleUsers() {
   const [form] = Form.useForm();
   const dispatch = useDispatch();
-  const {roleID} = useParams();
-  const {remainingSpaceUsers, loading, roleUsers, loadingUserRole } = useSelector((state) =>  {
-    const spaceUsers = state.spaces?.details?.[state.spaces?.selected]?.users?.length ? state.spaces?.details?.[state.spaces?.selected]?.users : []
-    const roleUsers = state.roles.details?.[roleID]?.users
-    var remainingSpaceUsers = []
+  const { roleID } = useParams();
+  const { remainingSpaceUsers, loading, roleUsers, loadingUserRole } = useSelector((state) => {
+    const spaceUsers = state.spaces?.details?.[state.spaces?.selected]?.users?.length
+      ? state.spaces?.details?.[state.spaces?.selected]?.users
+      : [];
+    const roleUsers = state.roles.details?.[roleID]?.users;
+    var remainingSpaceUsers = [];
     if (spaceUsers?.length) {
-      remainingSpaceUsers = spaceUsers.filter((spaceUser) => roleUsers.every((roleUser) => !(spaceUser.id === roleUser.id)))
+      remainingSpaceUsers = spaceUsers.filter((spaceUser) =>
+        roleUsers.every((roleUser) => !(spaceUser.id === roleUser.id)),
+      );
     }
     return {
       remainingSpaceUsers: remainingSpaceUsers,
       loading: state.spaces?.loading,
       roleUsers,
-      loadingRoles: state.roles.loading
-    }
-  })
+      loadingRoles: state.roles.loading,
+    };
+  });
 
   React.useEffect(() => {
-    dispatch(getSpaceUsers())
-    dispatch(getRoles())
-  }, [roleID])
+    dispatch(getSpaceUsers());
+    dispatch(getRoles());
+  }, [roleID]);
 
   const onSubmit = (data) => {
-    dispatch(addRoleUser(roleID, data)).then(() => dispatch(getRoles()))
-    form.resetFields()
-  }
+    dispatch(addRoleUser(roleID, data)).then(() => dispatch(getRoles()));
+    form.resetFields();
+  };
 
   return (
     <div
@@ -51,32 +54,32 @@ export default function RoleUsers() {
         <Skeleton />
       ) : (
         <Space direction="vertical">
-            <Form
-              form={form}
-              name="add-space-role-user"
-              layout="inline"
-              onFinish={(values) => {
-                onSubmit(values);
-              }}
-            >
-              <Form.Item name="user_id" label="Users">
-                <Select bordered listHeight={128} style={{ width: 200 }} placeholder="select user">
-                  {remainingSpaceUsers.map((user, index) => (
-                    <Select.Option value={user.id} key={index}>
-                      {user.email}
-                    </Select.Option>
-                  ))}
-                </Select>
-              </Form.Item>
-              <Form.Item>
-                <Button type="primary" htmlType="submit" form="add-space-role-user">
-                  Add Users
-                </Button>
-              </Form.Item>
-            </Form>
-          <UserList  roleID={roleID} users={roleUsers} />
+          <Form
+            form={form}
+            name="add-space-role-user"
+            layout="inline"
+            onFinish={(values) => {
+              onSubmit(values);
+            }}
+          >
+            <Form.Item name="user_id" label="Users">
+              <Select bordered listHeight={128} style={{ width: 200 }} placeholder="select user">
+                {remainingSpaceUsers.map((user, index) => (
+                  <Select.Option value={user.id} key={index}>
+                    {user.email}
+                  </Select.Option>
+                ))}
+              </Select>
+            </Form.Item>
+            <Form.Item>
+              <Button type="primary" htmlType="submit" form="add-space-role-user">
+                Add Users
+              </Button>
+            </Form.Item>
+          </Form>
+          <UserList roleID={roleID} users={roleUsers} />
         </Space>
       )}
     </div>
-  )
-}
\ No newline at end of file
+  );
+}
diff --git a/studio/src/pages/users/index.js b/studio/src/pages/users/index.js
index 076c96c74..27010ffdc 100644
--- a/studio/src/pages/users/index.js
+++ b/studio/src/pages/users/index.js
@@ -1,23 +1,30 @@
 import React from 'react';
 import { Space, Typography, Table, Tag } from 'antd';
-import { getUsers } from '../../actions/users';
 import { useDispatch, useSelector } from 'react-redux';
 import { Link } from 'react-router-dom';
 import Loader from '../../components/Loader';
 import { Helmet } from 'react-helmet';
+import { getSpaceUsers } from '../../actions/spaces';
 
 function Users() {
   const dispatch = useDispatch();
 
-  const { details, loading } = useSelector((state) => state.users);
-
+  const { spaceUsers, loading } = useSelector((state) => {
+    const spaceUsers = state.spaces?.details?.[state.spaces?.selected]?.users?.length
+      ? state.spaces?.details?.[state.spaces?.selected]?.users
+      : [];
+    return {
+      spaceUsers: spaceUsers,
+      loading: state.spaces?.loading,
+    };
+  });
   React.useEffect(() => {
     fetchUsers();
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
   const fetchUsers = () => {
-    dispatch(getUsers());
+    dispatch(getSpaceUsers());
   };
 
   const columns = [
@@ -25,41 +32,12 @@ function Users() {
       title: 'Name',
       dataIndex: 'name',
       key: 'name',
-      render: (_, record) => {
-        return (
-          <Typography key={record.id}>
-            {record.policies[0].id !== 'admin' ? (
-              <Link to={`/members/users/${record.id}/permissions`}>
-                {record.first_name + ' ' + record.last_name}
-              </Link>
-            ) : (
-              record.first_name + ' ' + record.last_name
-            )}
-          </Typography>
-        );
-      },
     },
     {
       title: 'E-mail',
       dataIndex: 'email',
       key: 'email',
     },
-    {
-      title: 'Policies',
-      dataIndex: 'policies',
-      key: 'policies',
-      render: (_, record) => {
-        return record.policies.map((policy, index) => (
-          <Tag key={record.id + policy.id}>
-            {policy.id !== 'admin' ? (
-              <Link to={`/members/policies/${policy.id}/edit`}> {policy.name}</Link>
-            ) : (
-              policy.name
-            )}
-          </Tag>
-        ));
-      },
-    },
   ];
 
   return loading ? (
@@ -70,7 +48,7 @@ function Users() {
       <Table
         bordered
         columns={columns}
-        dataSource={details}
+        dataSource={spaceUsers}
         loading={loading}
         rowKey={['record', 'user', 'id']}
       />
diff --git a/studio/src/reducers/spacesReducer.js b/studio/src/reducers/spacesReducer.js
index 080dc2db0..360949b42 100644
--- a/studio/src/reducers/spacesReducer.js
+++ b/studio/src/reducers/spacesReducer.js
@@ -102,10 +102,10 @@ export default function spacesReducer(state = initialState, action = {}) {
         details: {
           [action.payload.id]: {
             ...state.details[action.payload.id],
-            users: action.payload.data
-          }
-        }
-      }
+            users: action.payload.data,
+          },
+        },
+      };
     default:
       return state;
   }

From a20de1ecac808be57bbcfd69fafd31eaae3d7406 Mon Sep 17 00:00:00 2001
From: vsumit89 <sumit.vishwakarma@factly.in>
Date: Sat, 27 Aug 2022 17:20:52 +0530
Subject: [PATCH 11/38] added example envs

---
 config.env.example        | 50 +++++++++++++++++++++++++++++++++++++++
 kavach-config.env.example | 30 +++++++++++++++++++++++
 2 files changed, 80 insertions(+)
 create mode 100644 config.env.example
 create mode 100644 kavach-config.env.example

diff --git a/config.env.example b/config.env.example
new file mode 100644
index 000000000..3848b7215
--- /dev/null
+++ b/config.env.example
@@ -0,0 +1,50 @@
+MODE=development
+
+# dependencies services
+KAVACH_URL=http://kavach-server:8000
+IMAGEPROXY_URL=http://127.0.0.1:7001
+KETO_URL=http://keto:4466
+NATS_URL=http://nats:4222
+KRATOS_PUBLIC_URL=http://kratos:4433
+IFRAMELY_URL=http://iframely:8061
+OATHKEEPER_HOST=oathkeeper:4455
+
+GOOGLE_KEY=GOOGLE_KEY       # for google fact checks search
+
+# database params
+DATABASE_HOST=postgres
+DATABASE_USER=postgres
+DATABASE_PASSWORD=postgres
+DATABASE_NAME=dega 
+DATABASE_PORT=5432 
+DATABASE_SSL_MODE=disable
+
+# set this to true if want to use sqlite db
+USE_SQLITE=false
+SQLITE_DB_PATH=dega.db
+
+TEMPLATES_PATH=web/templates/*
+
+DEFAULT_NUMBER_OF_MEDIA=10
+DEFAULT_NUMBER_OF_SPACES=2
+DEFAULT_NUMBER_OF_POSTS=10
+
+CREATE_SUPER_ORGANISATION=true      # give SUPER_ORGANISATION_TITLE, DEFAULT_USER_EMAIL & DEFAULT_USER_PASSWORD
+SUPER_ORGANISATION_TITLE='Dega Administration'
+DEFAULT_USER_EMAIL=admin@dega.in
+DEFAULT_USER_PASSWORD=degapassword
+
+ENABLE_HUKZ=true        # include hukz in docker-compose and give HUKZ_URL, NATS_URL, NATS_USER_NAME & NATS_USER_PASSWORD
+ENABLE_FEEDS=true
+ENABLE_SEARCH_INDEXING=true     # include meilisearch in docker-compost and give MEILI_KEY & MEILI_URL
+
+MEILI_URL=http://meilisearch:7700
+MEILI_KEY=password
+
+NATS_URL=nats://nats:4222
+NATS_USER_NAME=natsuser
+NATS_USER_PASSWORD=natspassword
+HUKZ_URL=http://hukz:8000
+
+DEGA_APPLICATION_ID=1
+ORGANISATION_PERMISSION_ENABLED=false
\ No newline at end of file
diff --git a/kavach-config.env.example b/kavach-config.env.example
new file mode 100644
index 000000000..99e8c58a3
--- /dev/null
+++ b/kavach-config.env.example
@@ -0,0 +1,30 @@
+DATABASE_HOST=postgres 
+DATABASE_USER=postgres
+DATABASE_PASSWORD=postgres
+DATABASE_NAME=kavach 
+DATABASE_PORT=5432 
+DATABASE_SSL_MODE=disable
+KETO_URL=http://keto:4466
+KETO_WRITE_API_URL=http://keto:4467
+KETO_READ_API_URL=http://keto:4466
+KRATOS_ADMIN_URL=http://kratos:4434
+KRATOS_PUBLIC_URL=http://kratos:4433  
+MODE=development
+IMAGEPROXY_URL=http://127.0.0.1:7001
+USE_SQLITE=false
+SQLITE_DB_PATH=kavach.db
+SENDGRID_API_KEY=API-KEY
+DOMAIN_NAME=http://127.0.0.1:4455/.factly/kavach/web # development mode
+DYNAMIC_FROM_EMAIL='kavach'
+MANDE_HOST=http://mande.factly.in
+DYNAMIC_MANDE_TEMPLATE_ID=1
+DYNAMIC_SENDGRID_API_KEY=API-KEY
+ENABLE_MULTITENANCY=true
+DISABLE_REGISTRATION=false
+SUPER_USER_EMAIL=kavach-develop@factly.in
+APPLICATION_NAME=Kavach
+DEFAULT_USER_EMAIL=vsumit01@gmail.com
+DEFAULT_USER_PASSWORD=Cristiano123$$
+DEFAULT_ORGANISATION_NAME=FACTLYADMIN
+
+

From be2405fcc680bba772bb0ba2ca66fa9b2dad5001 Mon Sep 17 00:00:00 2001
From: vsumit89 <sumit.vishwakarma@factly.in>
Date: Sat, 27 Aug 2022 19:23:24 +0530
Subject: [PATCH 12/38] added a fix for the edit category page

---
 studio/src/pages/categories/components/CategoryForm.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/studio/src/pages/categories/components/CategoryForm.js b/studio/src/pages/categories/components/CategoryForm.js
index 15ec3d8d3..cea74da36 100644
--- a/studio/src/pages/categories/components/CategoryForm.js
+++ b/studio/src/pages/categories/components/CategoryForm.js
@@ -13,7 +13,7 @@ const CategoryForm = ({ onCreate, data = {} }) => {
   const siteAddress = useSelector(
     ({ spaces: { details, selected } }) => details[selected].site_address,
   );
-  const setLoading = onCreate.name === 'onCreate' ? true : false;
+  const setLoading = data.id ? false : true;
   if (data && data.meta_fields) {
     if (typeof data.meta_fields !== 'string') {
       data.meta_fields = JSON.stringify(data.meta_fields);

From 11085bde9c1da3b464ca8b7b082275395a584a7e Mon Sep 17 00:00:00 2001
From: vsumit89 <sumit.vishwakarma@factly.in>
Date: Sat, 27 Aug 2022 19:33:53 +0530
Subject: [PATCH 13/38] added a null safety check

---
 studio/src/pages/categories/components/CategoryForm.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/studio/src/pages/categories/components/CategoryForm.js b/studio/src/pages/categories/components/CategoryForm.js
index cea74da36..2ec0c0196 100644
--- a/studio/src/pages/categories/components/CategoryForm.js
+++ b/studio/src/pages/categories/components/CategoryForm.js
@@ -13,7 +13,7 @@ const CategoryForm = ({ onCreate, data = {} }) => {
   const siteAddress = useSelector(
     ({ spaces: { details, selected } }) => details[selected].site_address,
   );
-  const setLoading = data.id ? false : true;
+  const setLoading = data?.id ? false : true;
   if (data && data.meta_fields) {
     if (typeof data.meta_fields !== 'string') {
       data.meta_fields = JSON.stringify(data.meta_fields);

From ab822556fb5e4056a40097229a90c3073f241da8 Mon Sep 17 00:00:00 2001
From: vsumit89 <sumit.vishwakarma@factly.in>
Date: Mon, 29 Aug 2022 16:37:13 +0530
Subject: [PATCH 14/38] updated the code for http client

---
 api/graph/loaders/dataloader.go               |  3 ++-
 api/graph/resolvers/sitemap.go                |  3 ++-
 config.env.example                            |  2 +-
 docker-compose.yml                            | 19 ++++++-------------
 server/config/organisation.go                 | 13 ++++++-------
 server/service/core/action/author/list.go     |  5 ++---
 server/service/core/action/author/mapper.go   |  4 ++--
 server/service/core/action/policy/composer.go |  7 +++----
 server/service/core/action/policy/create.go   |  5 ++---
 server/service/core/action/policy/default.go  |  5 ++---
 server/service/core/action/policy/delete.go   |  3 ++-
 server/service/core/action/policy/details.go  |  3 ++-
 server/service/core/action/policy/list.go     |  3 ++-
 server/service/core/action/policy/update.go   |  3 ++-
 server/service/core/action/role/create.go     |  8 +++-----
 server/service/core/action/role/delete.go     |  6 ++----
 server/service/core/action/role/details.go    |  6 ++----
 server/service/core/action/role/list.go       |  3 ++-
 server/service/core/action/role/update.go     |  5 ++---
 .../service/core/action/role/user/create.go   |  6 ++----
 .../service/core/action/role/user/delete.go   |  5 ++---
 server/service/core/action/role/user/list.go  |  5 ++---
 server/service/core/action/space/create.go    |  3 ++-
 server/service/core/action/space/delete.go    |  3 ++-
 server/service/core/action/space/my.go        |  7 +++----
 server/service/core/action/space/update.go    |  5 ++---
 server/service/core/action/space/user.go      |  5 ++---
 .../service/fact-check/action/google/list.go  |  9 +++------
 server/service/reindex/space.go               |  5 ++---
 server/service/user/route.go                  |  6 ++----
 server/util/applicationID.go                  |  5 ++---
 server/util/getPermission.go                  |  5 ++---
 server/util/healthCheckers.go                 |  5 ++---
 server/util/http/client.go                    | 12 ++++++++++++
 server/util/keto.go                           |  5 ++---
 server/util/organisation.go                   |  7 +++----
 server/util/organisationID.go                 |  5 ++---
 server/util/policy.go                         |  7 +++----
 server/util/space.go                          |  5 ++---
 39 files changed, 101 insertions(+), 120 deletions(-)
 create mode 100644 server/util/http/client.go

diff --git a/api/graph/loaders/dataloader.go b/api/graph/loaders/dataloader.go
index fe3f54120..21cf4be96 100644
--- a/api/graph/loaders/dataloader.go
+++ b/api/graph/loaders/dataloader.go
@@ -12,6 +12,7 @@ import (
 	"github.com/factly/dega-api/graph/logger"
 	"github.com/factly/dega-api/graph/models"
 	"github.com/factly/dega-api/graph/validator"
+	httpx "github.com/factly/dega-server/util/http"
 	"github.com/factly/dega-api/util"
 	"github.com/spf13/viper"
 )
@@ -323,7 +324,7 @@ func DataloaderMiddleware(next http.Handler) http.Handler {
 				}
 				req.Header.Set("Content-Type", "application/json")
 				req.Header.Set("X-User", fmt.Sprint(keys[0]))
-				client := &http.Client{}
+				client := httpx.CustomHttpClient()
 				resp, err := client.Do(req)
 
 				if err != nil {
diff --git a/api/graph/resolvers/sitemap.go b/api/graph/resolvers/sitemap.go
index 4d50ddba1..c1fd43177 100644
--- a/api/graph/resolvers/sitemap.go
+++ b/api/graph/resolvers/sitemap.go
@@ -10,6 +10,7 @@ import (
 	"github.com/factly/dega-api/graph/generated"
 	"github.com/factly/dega-api/graph/models"
 	"github.com/factly/dega-api/graph/validator"
+	httpx "github.com/factly/dega-server/util/http"
 	"github.com/spf13/viper"
 )
 
@@ -101,7 +102,7 @@ func (r *sitemapsResolver) Users(ctx context.Context, obj *models.Sitemaps) ([]*
 
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("X-User", fmt.Sprint(postAuthor.AuthorID))
-	client := &http.Client{}
+	client := httpx.CustomHttpClient()
 	resp, err := client.Do(req)
 
 	if err != nil {
diff --git a/config.env.example b/config.env.example
index 3848b7215..cedfc5063 100644
--- a/config.env.example
+++ b/config.env.example
@@ -32,7 +32,7 @@ DEFAULT_NUMBER_OF_POSTS=10
 CREATE_SUPER_ORGANISATION=true      # give SUPER_ORGANISATION_TITLE, DEFAULT_USER_EMAIL & DEFAULT_USER_PASSWORD
 SUPER_ORGANISATION_TITLE='Dega Administration'
 DEFAULT_USER_EMAIL=admin@dega.in
-DEFAULT_USER_PASSWORD=degapassword
+DEFAULT_USER_PASSWORD=2ssad32sadADSd@!@4
 
 ENABLE_HUKZ=true        # include hukz in docker-compose and give HUKZ_URL, NATS_URL, NATS_USER_NAME & NATS_USER_PASSWORD
 ENABLE_FEEDS=true
diff --git a/docker-compose.yml b/docker-compose.yml
index fe2d6fb5c..ded36955e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -44,14 +44,7 @@ services:
     networks:
       - dega
     entrypoint: >
-      /bin/sh -c "
-      apk add --no-cache bash;
-      wait-for-it.sh minio:9000 -- echo 'Minio is up. Creating the bucket!!';
-      /usr/bin/mc config host add myminio http://minio:9000 miniokey miniosecret;
-      /usr/bin/mc mb myminio/dega;
-      /usr/bin/mc policy set download myminio/dega;
-      exit 0;
-      "
+      /bin/sh -c " apk add --no-cache bash; wait-for-it.sh minio:9000 -- echo 'Minio is up. Creating the bucket!!'; /usr/bin/mc config host add myminio http://minio:9000 miniokey miniosecret; /usr/bin/mc mb myminio/dega; /usr/bin/mc policy set download myminio/dega; exit 0; "
 
   ###########################################################################
   #######                         IFRAMELY                            #######
@@ -179,7 +172,7 @@ services:
       - type: bind
         source: ./keto
         target: /etc/config/keto
-    command: serve -c "/etc/config/keto/keto.yml" 
+    command: serve -c "/etc/config/keto/keto.yml"
     networks:
       - dega
 
@@ -293,14 +286,14 @@ services:
       - KAVACH_SENDGRID_API_KEY=SENDGRID_API_KEY
       - KAVACH_ENABLE_MULTITENANCY=true
     volumes:
-     - type: bind
-       source: ./kavach-config.env
-       target: /app/config.env
+      - type: bind
+        source: ./kavach-config.env
+        target: /app/config.env
     networks:
       - dega
 
   kavach-web:
-    image: factly/kavach-web 
+    image: factly/kavach-web
     volumes:
       - type: bind
         source: ./volumes/kavach-web/config.js
diff --git a/server/config/organisation.go b/server/config/organisation.go
index 24584d866..04241e16e 100644
--- a/server/config/organisation.go
+++ b/server/config/organisation.go
@@ -8,7 +8,7 @@ import (
 	"net/http"
 	"regexp"
 	"strings"
-
+	"github.com/factly/dega-server/util/http"
 	"github.com/spf13/viper"
 )
 
@@ -51,8 +51,7 @@ func CheckSuperOrganisation() bool {
 	// check if policy is present in keto
 	req, _ := http.NewRequest("GET", viper.GetString("keto_url")+ketoPolicyPath+"/app:dega:superorg", nil)
 	req.Header.Set("Content-Type", "application/json")
-
-	client := &http.Client{}
+	client := httpx.CustomHttpClient()
 	resp, err := client.Do(req)
 	if err != nil {
 		return false
@@ -176,7 +175,7 @@ func createKratosUser() (*http.Response, error) {
 	req, _ := http.NewRequest("GET", viper.GetString("kratos_public_url")+"/self-service/registration/api", nil)
 	req.Header.Set("Content-Type", "application/json")
 
-	client := &http.Client{}
+	client := httpx.CustomHttpClient()
 	resp, err := client.Do(req)
 	if err != nil {
 		return nil, err
@@ -230,7 +229,7 @@ func createKavachUser(kavachUserCheckers map[string]interface{}) (*http.Response
 	req, _ := http.NewRequest("POST", viper.GetString("kavach_url")+"/users/checker", buf)
 	req.Header.Set("Content-Type", "application/json")
 
-	client := &http.Client{}
+	client := httpx.CustomHttpClient()
 	resp, err := client.Do(req)
 	if err != nil {
 		return nil, err
@@ -261,7 +260,7 @@ func createKavachOrganisation(userID string) (*http.Response, error) {
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("X-User", userID)
 
-	client := &http.Client{}
+	client := httpx.CustomHttpClient()
 	resp, err := client.Do(req)
 
 	if err != nil {
@@ -301,7 +300,7 @@ func createKetoPolicy(organisationID uint) (*http.Response, error) {
 	req, _ := http.NewRequest("PUT", viper.GetString("keto_url")+ketoPolicyPath, buf)
 	req.Header.Set("Content-Type", "application/json")
 
-	client := &http.Client{}
+	client := httpx.CustomHttpClient()
 	resp, err := client.Do(req)
 
 	if err != nil {
diff --git a/server/service/core/action/author/list.go b/server/service/core/action/author/list.go
index 98c9c941b..5daf736eb 100644
--- a/server/service/core/action/author/list.go
+++ b/server/service/core/action/author/list.go
@@ -5,14 +5,13 @@ import (
 	"fmt"
 	"net/http"
 	"strconv"
-	"time"
 
 	"github.com/factly/x/loggerx"
 	"github.com/spf13/viper"
 
 	"github.com/factly/dega-server/service/core/model"
 	"github.com/factly/dega-server/util"
-	"github.com/factly/dega-server/util/timex"
+	httpx "github.com/factly/dega-server/util/http"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/middlewarex"
 	"github.com/factly/x/paginationx"
@@ -68,7 +67,7 @@ func list(w http.ResponseWriter, r *http.Request) {
 
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("X-User", strconv.Itoa(uID))
-	client := http.Client{Timeout: time.Second * time.Duration(timex.HTTP_TIMEOUT)}
+	client := httpx.CustomHttpClient()
 	resp, err := client.Do(req)
 
 	if err != nil {
diff --git a/server/service/core/action/author/mapper.go b/server/service/core/action/author/mapper.go
index b7e983bb7..9bb85bf99 100644
--- a/server/service/core/action/author/mapper.go
+++ b/server/service/core/action/author/mapper.go
@@ -6,6 +6,7 @@ import (
 	"net/http"
 
 	"github.com/factly/dega-server/service/core/model"
+	httpx "github.com/factly/dega-server/util/http"
 	"github.com/factly/x/loggerx"
 	"github.com/spf13/viper"
 )
@@ -22,9 +23,8 @@ func Mapper(oID int, uID int) map[string]model.Author {
 	}
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("X-User", fmt.Sprint(uID))
-	client := &http.Client{}
+	client := httpx.CustomHttpClient()
 	resp, err := client.Do(req)
-
 	if err != nil {
 		return userMap
 	}
diff --git a/server/service/core/action/policy/composer.go b/server/service/core/action/policy/composer.go
index 5e4188337..e70417abf 100644
--- a/server/service/core/action/policy/composer.go
+++ b/server/service/core/action/policy/composer.go
@@ -6,10 +6,10 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/spf13/viper"
-
 	"github.com/factly/dega-server/service/core/model"
+	httpx "github.com/factly/dega-server/util/http"
 	"github.com/factly/x/loggerx"
+	"github.com/spf13/viper"
 )
 
 func contains(s []string, e string) bool {
@@ -60,8 +60,7 @@ func Composer(oID int, sID int, inputPolicy policyReq) model.KetoPolicy {
 		loggerx.Error(err)
 	}
 	req.Header.Set("Content-Type", "application/json")
-
-	client := &http.Client{}
+	client := httpx.CustomHttpClient()
 	resp, err := client.Do(req)
 
 	if err != nil {
diff --git a/server/service/core/action/policy/create.go b/server/service/core/action/policy/create.go
index 9c012e35a..323d9f25d 100644
--- a/server/service/core/action/policy/create.go
+++ b/server/service/core/action/policy/create.go
@@ -7,11 +7,10 @@ import (
 	"fmt"
 	"net/http"
 	"strconv"
-	"time"
 
 	"github.com/factly/dega-server/service/core/model"
 	"github.com/factly/dega-server/util"
-	"github.com/factly/dega-server/util/timex"
+	httpx "github.com/factly/dega-server/util/http"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
 	"github.com/factly/x/meilisearchx"
@@ -92,7 +91,7 @@ func create(w http.ResponseWriter, r *http.Request) {
 	req.Header.Set("X-User", strconv.Itoa(userID))
 	req.Header.Set("Content-Type", "application/json")
 
-	client := &http.Client{Timeout: time.Duration(timex.HTTP_TIMEOUT) * time.Second}
+	client := httpx.CustomHttpClient()
 	resp, err := client.Do(req)
 	if err != nil {
 		loggerx.Error(err)
diff --git a/server/service/core/action/policy/default.go b/server/service/core/action/policy/default.go
index d029d39b3..5277aeeb1 100644
--- a/server/service/core/action/policy/default.go
+++ b/server/service/core/action/policy/default.go
@@ -8,11 +8,10 @@ import (
 	"io/ioutil"
 	"net/http"
 	"os"
-	"time"
 
 	"github.com/factly/dega-server/service/core/model"
 	"github.com/factly/dega-server/util"
-	"github.com/factly/dega-server/util/timex"
+	httpx "github.com/factly/dega-server/util/http"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
 	"github.com/factly/x/middlewarex"
@@ -127,7 +126,7 @@ func createRoleandPolicyonKavach(role roleReq, policy policyReq, orgID, spaceID,
 		return nil, err
 	}
 
-	client := http.Client{Timeout: time.Second * time.Duration(timex.HTTP_TIMEOUT)}
+	client := httpx.CustomHttpClient()
 	req, err := http.NewRequest(http.MethodPost, viper.GetString("kavach_url")+"/organisations/"+fmt.Sprintf("%d", orgID)+"/applications/"+fmt.Sprintf("%d", applicationID)+"/spaces/"+fmt.Sprintf("%d", spaceID)+"/roles", buf)
 	if err != nil {
 		return nil, err
diff --git a/server/service/core/action/policy/delete.go b/server/service/core/action/policy/delete.go
index be469d114..c5ff0465f 100644
--- a/server/service/core/action/policy/delete.go
+++ b/server/service/core/action/policy/delete.go
@@ -6,6 +6,7 @@ import (
 	"net/http"
 
 	"github.com/factly/dega-server/util"
+	httpx "github.com/factly/dega-server/util/http"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
 	meilisearchx "github.com/factly/x/meilisearchx"
@@ -71,7 +72,7 @@ func delete(w http.ResponseWriter, r *http.Request) {
 	req.Header.Set("X-User", fmt.Sprintf("%d", userID))
 	req.Header.Set("Content-Type", "application/json")
 
-	client := &http.Client{}
+	client := httpx.CustomHttpClient()
 	resp, err := client.Do(req)
 
 	if err != nil {
diff --git a/server/service/core/action/policy/details.go b/server/service/core/action/policy/details.go
index ccf25d4d6..a040025c2 100644
--- a/server/service/core/action/policy/details.go
+++ b/server/service/core/action/policy/details.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/factly/dega-server/service/core/model"
 	"github.com/factly/dega-server/util"
+	httpx "github.com/factly/dega-server/util/http"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
 	"github.com/factly/x/middlewarex"
@@ -71,7 +72,7 @@ func details(w http.ResponseWriter, r *http.Request) {
 	req.Header.Set("X-User", fmt.Sprintf("%d", userID))
 	req.Header.Set("Content-Type", "application/json")
 
-	client := &http.Client{}
+	client := httpx.CustomHttpClient()
 	resp, err := client.Do(req)
 
 	if err != nil {
diff --git a/server/service/core/action/policy/list.go b/server/service/core/action/policy/list.go
index abe007766..16556c95c 100644
--- a/server/service/core/action/policy/list.go
+++ b/server/service/core/action/policy/list.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/factly/dega-server/service/core/model"
 	"github.com/factly/dega-server/util"
+	httpx "github.com/factly/dega-server/util/http"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
 	"github.com/factly/x/middlewarex"
@@ -70,7 +71,7 @@ func list(w http.ResponseWriter, r *http.Request) {
 	req.Header.Set("X-User", fmt.Sprintf("%d", userID))
 	req.Header.Set("Content-Type", "application/json")
 
-	client := &http.Client{}
+	client := httpx.CustomHttpClient()
 	resp, err := client.Do(req)
 	if err != nil {
 		loggerx.Error(err)
diff --git a/server/service/core/action/policy/update.go b/server/service/core/action/policy/update.go
index 7a9a161ce..588f5109b 100644
--- a/server/service/core/action/policy/update.go
+++ b/server/service/core/action/policy/update.go
@@ -10,6 +10,7 @@ import (
 
 	"github.com/factly/dega-server/service/core/model"
 	"github.com/factly/dega-server/util"
+	httpx "github.com/factly/dega-server/util/http"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
 	"github.com/factly/x/meilisearchx"
@@ -90,7 +91,7 @@ func update(w http.ResponseWriter, r *http.Request) {
 	req.Header.Set("X-User", strconv.Itoa(userID))
 	req.Header.Set("Content-Type", "application/json")
 
-	client := &http.Client{}
+	client := httpx.CustomHttpClient()
 	resp, err := client.Do(req)
 
 	if err != nil {
diff --git a/server/service/core/action/role/create.go b/server/service/core/action/role/create.go
index dcff9f357..8b20abdd3 100644
--- a/server/service/core/action/role/create.go
+++ b/server/service/core/action/role/create.go
@@ -7,18 +7,16 @@ import (
 	"fmt"
 	"net/http"
 	"strconv"
-	"time"
 
 	"github.com/factly/dega-server/service/core/model"
 	"github.com/factly/dega-server/util"
-	"github.com/factly/dega-server/util/timex"
-	"github.com/spf13/viper"
-
+	httpx "github.com/factly/dega-server/util/http"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
 	"github.com/factly/x/middlewarex"
 	"github.com/factly/x/renderx"
 	"github.com/go-chi/chi"
+	"github.com/spf13/viper"
 )
 
 func create(w http.ResponseWriter, r *http.Request) {
@@ -77,7 +75,7 @@ func create(w http.ResponseWriter, r *http.Request) {
 	req.Header.Set("X-User", strconv.Itoa(uID))
 	req.Header.Set("Content-Type", "application/json")
 
-	client := &http.Client{Timeout: time.Duration(timex.HTTP_TIMEOUT) * time.Second}
+	client := httpx.CustomHttpClient()
 	resp, err := client.Do(req)
 	if err != nil {
 		loggerx.Error(err)
diff --git a/server/service/core/action/role/delete.go b/server/service/core/action/role/delete.go
index df7c2668a..498088476 100644
--- a/server/service/core/action/role/delete.go
+++ b/server/service/core/action/role/delete.go
@@ -4,10 +4,9 @@ import (
 	"fmt"
 	"net/http"
 	"strconv"
-	"time"
 
 	"github.com/factly/dega-server/util"
-	"github.com/factly/dega-server/util/timex"
+	httpx "github.com/factly/dega-server/util/http"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
 	"github.com/factly/x/middlewarex"
@@ -48,8 +47,7 @@ func delete(w http.ResponseWriter, r *http.Request) {
 	}
 
 	reqURL := viper.GetString("kavach_url") + fmt.Sprintf("/organisations/%d/applications/%d/spaces/%s/roles/%s", orgID, applicationID, spaceID, roleID)
-	client := http.Client{Timeout: time.Minute * time.Duration(timex.HTTP_TIMEOUT)}
-
+	client := httpx.CustomHttpClient()
 	req, err := http.NewRequest(http.MethodDelete, reqURL, nil)
 	if err != nil {
 		loggerx.Error(err)
diff --git a/server/service/core/action/role/details.go b/server/service/core/action/role/details.go
index c6d8c5b3c..b6a4854f5 100644
--- a/server/service/core/action/role/details.go
+++ b/server/service/core/action/role/details.go
@@ -5,11 +5,10 @@ import (
 	"fmt"
 	"net/http"
 	"strconv"
-	"time"
 
 	"github.com/factly/dega-server/service/core/model"
 	"github.com/factly/dega-server/util"
-	"github.com/factly/dega-server/util/timex"
+	httpx "github.com/factly/dega-server/util/http"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
 	"github.com/factly/x/middlewarex"
@@ -51,8 +50,7 @@ func details(w http.ResponseWriter, r *http.Request) {
 	roleID := chi.URLParam(r, "role_id")
 
 	reqURL := viper.GetString("kavach_url") + fmt.Sprintf("/organisations/%d/applications/%d/spaces/%s/roles/%s", orgID, applicationID, spaceID, roleID)
-	client := http.Client{Timeout: time.Minute * time.Duration(timex.HTTP_TIMEOUT)}
-
+	client := httpx.CustomHttpClient()
 	req, err := http.NewRequest(http.MethodGet, reqURL, nil)
 	if err != nil {
 		loggerx.Error(err)
diff --git a/server/service/core/action/role/list.go b/server/service/core/action/role/list.go
index 8051ed029..c61039475 100644
--- a/server/service/core/action/role/list.go
+++ b/server/service/core/action/role/list.go
@@ -11,6 +11,7 @@ import (
 
 	"github.com/factly/dega-server/service/core/model"
 	"github.com/factly/dega-server/util"
+	httpx "github.com/factly/dega-server/util/http"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
 
@@ -57,7 +58,7 @@ func list(w http.ResponseWriter, r *http.Request) {
 	req.Header.Set("X-User", strconv.Itoa(uID))
 	req.Header.Set("Content-Type", "application/json")
 
-	client := &http.Client{}
+	client := httpx.CustomHttpClient()
 	resp, err := client.Do(req)
 	if err != nil {
 		loggerx.Error(err)
diff --git a/server/service/core/action/role/update.go b/server/service/core/action/role/update.go
index 3b7d5331d..6a94e60c1 100644
--- a/server/service/core/action/role/update.go
+++ b/server/service/core/action/role/update.go
@@ -7,11 +7,10 @@ import (
 	"fmt"
 	"net/http"
 	"strconv"
-	"time"
 
 	"github.com/factly/dega-server/service/core/model"
 	"github.com/factly/dega-server/util"
-	"github.com/factly/dega-server/util/timex"
+	httpx "github.com/factly/dega-server/util/http"
 	"github.com/spf13/viper"
 
 	"github.com/factly/x/errorx"
@@ -79,7 +78,7 @@ func update(w http.ResponseWriter, r *http.Request) {
 	req.Header.Set("X-User", strconv.Itoa(uID))
 	req.Header.Set("Content-Type", "application/json")
 
-	client := &http.Client{Timeout: time.Duration(timex.HTTP_TIMEOUT)}
+	client := httpx.CustomHttpClient()
 	resp, err := client.Do(req)
 	if err != nil {
 		loggerx.Error(err)
diff --git a/server/service/core/action/role/user/create.go b/server/service/core/action/role/user/create.go
index f714089d4..7fdc47df6 100644
--- a/server/service/core/action/role/user/create.go
+++ b/server/service/core/action/role/user/create.go
@@ -7,10 +7,9 @@ import (
 	"fmt"
 	"net/http"
 	"strconv"
-	"time"
 
 	"github.com/factly/dega-server/util"
-	"github.com/factly/dega-server/util/timex"
+	httpx "github.com/factly/dega-server/util/http"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
 	"github.com/factly/x/middlewarex"
@@ -81,8 +80,7 @@ func create(w http.ResponseWriter, r *http.Request) {
 	}
 	req.Header.Set("X-User", fmt.Sprintf("%d", uID))
 	req.Header.Set("Content-type", "application/json")
-	client := http.Client{Timeout: time.Minute * time.Duration(timex.HTTP_TIMEOUT)}
-
+	client := httpx.CustomHttpClient()
 	response, err := client.Do(req)
 	if err != nil {
 		loggerx.Error(err)
diff --git a/server/service/core/action/role/user/delete.go b/server/service/core/action/role/user/delete.go
index 3d8cc9172..750b43c2f 100644
--- a/server/service/core/action/role/user/delete.go
+++ b/server/service/core/action/role/user/delete.go
@@ -4,10 +4,9 @@ import (
 	"fmt"
 	"net/http"
 	"strconv"
-	"time"
 
 	"github.com/factly/dega-server/util"
-	"github.com/factly/dega-server/util/timex"
+	httpx "github.com/factly/dega-server/util/http"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
 	"github.com/factly/x/middlewarex"
@@ -50,7 +49,7 @@ func delete(w http.ResponseWriter, r *http.Request) {
 	userID := chi.URLParam(r, "user_id")
 
 	reqURL := viper.GetString("kavach_url") + fmt.Sprintf("/organisations/%d/applications/%d/spaces/%s/roles/%s/users/%s", orgID, applicationID, spaceID, roleID, userID)
-	client := http.Client{Timeout: time.Minute * time.Duration(timex.HTTP_TIMEOUT)}
+	client := httpx.CustomHttpClient()
 	req, err := http.NewRequest(http.MethodDelete, reqURL, nil)
 	if err != nil {
 		loggerx.Error(err)
diff --git a/server/service/core/action/role/user/list.go b/server/service/core/action/role/user/list.go
index b31d64402..be3b86fb3 100644
--- a/server/service/core/action/role/user/list.go
+++ b/server/service/core/action/role/user/list.go
@@ -5,11 +5,10 @@ import (
 	"fmt"
 	"net/http"
 	"strconv"
-	"time"
 
 	"github.com/factly/dega-server/service/core/model"
 	"github.com/factly/dega-server/util"
-	"github.com/factly/dega-server/util/timex"
+	httpx "github.com/factly/dega-server/util/http"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
 	"github.com/factly/x/middlewarex"
@@ -65,7 +64,7 @@ func list(w http.ResponseWriter, r *http.Request) {
 	req.Header.Set("X-User", fmt.Sprintf("%d", uID))
 	req.Header.Set("Content-Type", "application/json")
 
-	client := http.Client{Timeout: time.Second * time.Duration(timex.HTTP_TIMEOUT)}
+	client := httpx.CustomHttpClient()
 	resp, err := client.Do(req)
 	if err != nil {
 		loggerx.Error(err)
diff --git a/server/service/core/action/space/create.go b/server/service/core/action/space/create.go
index c82909851..5fe2443c4 100644
--- a/server/service/core/action/space/create.go
+++ b/server/service/core/action/space/create.go
@@ -15,6 +15,7 @@ import (
 	"github.com/factly/dega-server/config"
 	"github.com/factly/dega-server/service/core/model"
 	"github.com/factly/dega-server/util"
+	httpx "github.com/factly/dega-server/util/http"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
 	"github.com/factly/x/meilisearchx"
@@ -140,7 +141,7 @@ func create(w http.ResponseWriter, r *http.Request) {
 	req.Header.Set("X-User", strconv.Itoa(uID))
 	req.Header.Set("Content-Type", "application/json")
 
-	client := &http.Client{}
+	client := httpx.CustomHttpClient()
 	resp, err := client.Do(req)
 	if err != nil {
 		loggerx.Error(err)
diff --git a/server/service/core/action/space/delete.go b/server/service/core/action/space/delete.go
index cfed2f4a0..276fdc188 100644
--- a/server/service/core/action/space/delete.go
+++ b/server/service/core/action/space/delete.go
@@ -10,6 +10,7 @@ import (
 	"github.com/factly/dega-server/config"
 	"github.com/factly/dega-server/service/core/model"
 	"github.com/factly/dega-server/util"
+	httpx "github.com/factly/dega-server/util/http"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
 	"github.com/factly/x/meilisearchx"
@@ -68,7 +69,7 @@ func delete(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	// getting the details for the space to be deleted
-	client := http.Client{}
+	client := httpx.CustomHttpClient()
 	req, err := http.NewRequest("DELETE", viper.GetString("kavach_url")+fmt.Sprintf("/organisations/%d/applications/", orgID)+fmt.Sprintf("%d", applicationID)+"/spaces/"+spaceID, nil)
 	if err != nil {
 		loggerx.Error(err)
diff --git a/server/service/core/action/space/my.go b/server/service/core/action/space/my.go
index 6d13d468a..21eded427 100644
--- a/server/service/core/action/space/my.go
+++ b/server/service/core/action/space/my.go
@@ -6,10 +6,9 @@ import (
 	"io/ioutil"
 	"net/http"
 	"strconv"
-	"time"
 
 	"github.com/factly/dega-server/util"
-	"github.com/factly/dega-server/util/timex"
+	httpx "github.com/factly/dega-server/util/http"
 	"github.com/spf13/viper"
 
 	"github.com/factly/dega-server/config"
@@ -89,7 +88,7 @@ func my(w http.ResponseWriter, r *http.Request) {
 	req.Header.Set("X-User", strconv.Itoa(uID))
 	req.Header.Set("Content-Type", "application/json")
 
-	client := http.Client{Timeout: time.Minute * time.Duration(timex.HTTP_TIMEOUT)}
+	client := httpx.CustomHttpClient()
 	resp, err := client.Do(req)
 
 	if err != nil {
@@ -122,7 +121,7 @@ func my(w http.ResponseWriter, r *http.Request) {
 			errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
 			return
 		}
-		client := http.Client{Timeout: time.Minute * time.Duration(timex.HTTP_TIMEOUT)}
+		client := httpx.CustomHttpClient()
 		resp, err := client.Do(req)
 		if err != nil {
 			loggerx.Error(err)
diff --git a/server/service/core/action/space/update.go b/server/service/core/action/space/update.go
index 3b20cc612..f84244f94 100644
--- a/server/service/core/action/space/update.go
+++ b/server/service/core/action/space/update.go
@@ -8,12 +8,11 @@ import (
 	"fmt"
 	"net/http"
 	"strconv"
-	"time"
 
 	"github.com/factly/dega-server/config"
 	"github.com/factly/dega-server/service/core/model"
 	"github.com/factly/dega-server/util"
-	"github.com/factly/dega-server/util/timex"
+	httpx "github.com/factly/dega-server/util/http"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
 	"github.com/factly/x/meilisearchx"
@@ -105,7 +104,7 @@ func update(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	client := http.Client{Timeout: time.Second * time.Duration(timex.HTTP_TIMEOUT)}
+	client := httpx.CustomHttpClient()
 	req, err := http.NewRequest("PUT", viper.GetString("kavach_url")+"/organisations/"+fmt.Sprintf("%d", space.OrganisationID)+"/applications/"+fmt.Sprintf("%d", applicationID)+"/spaces/"+fmt.Sprintf("%d", spaceID), buf)
 	if err != nil {
 		loggerx.Error(err)
diff --git a/server/service/core/action/space/user.go b/server/service/core/action/space/user.go
index 6a1117b48..e69491c1b 100644
--- a/server/service/core/action/space/user.go
+++ b/server/service/core/action/space/user.go
@@ -5,11 +5,10 @@ import (
 	"fmt"
 	"net/http"
 	"strconv"
-	"time"
 
 	"github.com/factly/dega-server/service/core/model"
 	"github.com/factly/dega-server/util"
-	"github.com/factly/dega-server/util/timex"
+	httpx "github.com/factly/dega-server/util/http"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
 	"github.com/factly/x/middlewarex"
@@ -56,7 +55,7 @@ func users(w http.ResponseWriter, r *http.Request) {
 	}
 	req.Header.Set("X-User", fmt.Sprintf("%d", uID))
 	req.Header.Set("Content-Type", "application/json")
-	client := http.Client{Timeout: time.Second * time.Duration(timex.HTTP_TIMEOUT)}
+	client := httpx.CustomHttpClient()
 	resp, err := client.Do(req)
 	if err != nil {
 		loggerx.Error(err)
diff --git a/server/service/fact-check/action/google/list.go b/server/service/fact-check/action/google/list.go
index 6d1173378..324bb9c2b 100644
--- a/server/service/fact-check/action/google/list.go
+++ b/server/service/fact-check/action/google/list.go
@@ -6,14 +6,12 @@ import (
 	"io/ioutil"
 	"net/http"
 	"net/url"
-	"time"
 
-	"github.com/spf13/viper"
-
-	"github.com/factly/dega-server/util/timex"
+	httpx "github.com/factly/dega-server/util/http"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
 	"github.com/factly/x/renderx"
+	"github.com/spf13/viper"
 )
 
 // googleapis for factchecks
@@ -73,8 +71,7 @@ func list(w http.ResponseWriter, r *http.Request) {
 	}
 
 	req.URL.RawQuery = q.Encode()
-
-	client := http.Client{Timeout: time.Minute * time.Duration(timex.HTTP_TIMEOUT)}
+	client := httpx.CustomHttpClient()
 	resp, err := client.Do(req)
 
 	if err != nil {
diff --git a/server/service/reindex/space.go b/server/service/reindex/space.go
index 7ac3d212f..9b40539b7 100644
--- a/server/service/reindex/space.go
+++ b/server/service/reindex/space.go
@@ -6,12 +6,11 @@ import (
 	"log"
 	"net/http"
 	"strconv"
-	"time"
 
 	"github.com/factly/dega-server/config"
 	"github.com/factly/dega-server/service/core/model"
 	"github.com/factly/dega-server/util"
-	"github.com/factly/dega-server/util/timex"
+	httpx "github.com/factly/dega-server/util/http"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
 	"github.com/factly/x/meilisearchx"
@@ -46,7 +45,7 @@ func space(w http.ResponseWriter, r *http.Request) {
 	}
 
 	req.Header.Set("X-User", fmt.Sprintf("%d", uID))
-	client := http.Client{Timeout: time.Minute * time.Duration(timex.HTTP_TIMEOUT)}
+	client := httpx.CustomHttpClient()
 	response, err := client.Do(req)
 	if err != nil {
 		loggerx.Error(err)
diff --git a/server/service/user/route.go b/server/service/user/route.go
index cb913ed6c..880a1f5ab 100644
--- a/server/service/user/route.go
+++ b/server/service/user/route.go
@@ -3,9 +3,8 @@ package user
 import (
 	"encoding/json"
 	"net/http"
-	"time"
 
-	"github.com/factly/dega-server/util/timex"
+	httpx "github.com/factly/dega-server/util/http"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/renderx"
 	"github.com/go-chi/chi"
@@ -46,8 +45,7 @@ func redirectToKavach(w http.ResponseWriter, r *http.Request) {
 
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("X-USer", header.Get("X-User"))
-
-	client := http.Client{Timeout: time.Minute * time.Duration(timex.HTTP_TIMEOUT)}
+	client := httpx.CustomHttpClient()
 	resp, err := client.Do(req)
 	if err != nil {
 		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
diff --git a/server/util/applicationID.go b/server/util/applicationID.go
index b88f28a5b..c12f06f42 100644
--- a/server/util/applicationID.go
+++ b/server/util/applicationID.go
@@ -5,9 +5,8 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
-	"time"
 
-	"github.com/factly/dega-server/util/timex"
+	httpx "github.com/factly/dega-server/util/http"
 	"github.com/spf13/viper"
 )
 
@@ -18,7 +17,7 @@ func GetApplicationID(userID uint, appSlug string) (uint, error) {
 	}
 
 	req.Header.Set("X-User", fmt.Sprintf("%d", userID))
-	client := http.Client{Timeout: time.Minute * time.Duration(timex.HTTP_TIMEOUT)}
+	client := httpx.CustomHttpClient()
 	response, err := client.Do(req)
 	if err != nil {
 		return 0, err
diff --git a/server/util/getPermission.go b/server/util/getPermission.go
index f951c836e..031cf775c 100644
--- a/server/util/getPermission.go
+++ b/server/util/getPermission.go
@@ -5,10 +5,9 @@ import (
 	"fmt"
 	"net/http"
 	"strings"
-	"time"
 
 	"github.com/factly/dega-server/service/core/model"
-	"github.com/factly/dega-server/util/timex"
+	httpx "github.com/factly/dega-server/util/http"
 	"github.com/factly/x/loggerx"
 	"github.com/spf13/viper"
 )
@@ -39,7 +38,7 @@ type TupleWithSubjectSet struct {
 const namespace string = "spaces"
 
 func GetPermissions(orgID, appID, spaceID, uID uint) ([]model.Permission, error) {
-	client := http.Client{Timeout: time.Minute * time.Duration(timex.HTTP_TIMEOUT)}
+	client := httpx.CustomHttpClient()
 	roleObject := fmt.Sprintf("roles:org:%d:app:%d:space:%d", orgID, appID, spaceID)
 	requestURL := viper.GetString("keto_url") + "/relation-tuples?namespace=spaces&" + fmt.Sprintf("subject_id=%d&object=%s", uID, roleObject)
 	req, err := http.NewRequest("GET", requestURL, nil)
diff --git a/server/util/healthCheckers.go b/server/util/healthCheckers.go
index e3594e57c..7cde5197b 100644
--- a/server/util/healthCheckers.go
+++ b/server/util/healthCheckers.go
@@ -3,9 +3,8 @@ package util
 import (
 	"errors"
 	"net/http"
-	"time"
 
-	"github.com/factly/dega-server/util/timex"
+	httpx "github.com/factly/dega-server/util/http"
 	"github.com/spf13/viper"
 )
 
@@ -38,7 +37,7 @@ func GetRequest(url string) error {
 	}
 	req.Header.Set("Content-Type", "application/json")
 
-	client := http.Client{Timeout: time.Minute * time.Duration(timex.HTTP_TIMEOUT)}
+	client := httpx.CustomHttpClient()
 	res, err := client.Do(req)
 	if err != nil {
 		return err
diff --git a/server/util/http/client.go b/server/util/http/client.go
new file mode 100644
index 000000000..d9d70ad9e
--- /dev/null
+++ b/server/util/http/client.go
@@ -0,0 +1,12 @@
+package httpx
+
+import (
+	"net/http"
+	"time"
+)
+
+const httpTimeout = 10
+
+func CustomHttpClient() *http.Client {
+	return &http.Client{Timeout: time.Minute * time.Duration(httpTimeout)}
+}
diff --git a/server/util/keto.go b/server/util/keto.go
index 0793e5285..fb7080c72 100644
--- a/server/util/keto.go
+++ b/server/util/keto.go
@@ -2,9 +2,8 @@ package util
 
 import (
 	"net/http"
-	"time"
 
-	"github.com/factly/dega-server/util/timex"
+	httpx "github.com/factly/dega-server/util/http"
 	"github.com/spf13/viper"
 )
 
@@ -16,7 +15,7 @@ func KetoGetRequest(path string) (*http.Response, error) {
 	}
 	req.Header.Set("Content-Type", "application/json")
 
-	client := http.Client{Timeout: time.Minute * time.Duration(timex.HTTP_TIMEOUT)}
+	client := httpx.CustomHttpClient()
 	resp, err := client.Do(req)
 	if err != nil {
 		return nil, err
diff --git a/server/util/organisation.go b/server/util/organisation.go
index d6f8f6a62..0226158de 100644
--- a/server/util/organisation.go
+++ b/server/util/organisation.go
@@ -5,10 +5,9 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
-	"time"
 
 	"github.com/factly/dega-server/service/core/model"
-	"github.com/factly/dega-server/util/timex"
+	httpx "github.com/factly/dega-server/util/http"
 	"github.com/spf13/viper"
 )
 
@@ -31,7 +30,7 @@ func GetAllOrganisationsMap(q string) (map[uint]model.Organisation, error) {
 	}
 	req.Header.Set("Content-Type", "application/json")
 
-	client := http.Client{Timeout: time.Minute * time.Duration(timex.HTTP_TIMEOUT)}
+	client := httpx.CustomHttpClient()
 	resp, err := client.Do(req)
 	if err != nil {
 		return nil, err
@@ -74,7 +73,7 @@ func CheckOwnerFromKavach(uID, oID int) (bool, error) {
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("X-User", fmt.Sprint(uID))
 
-	client := http.Client{Timeout: time.Minute * time.Duration(timex.HTTP_TIMEOUT)}
+	client := httpx.CustomHttpClient()
 	resp, err := client.Do(req)
 	if err != nil {
 		return false, err
diff --git a/server/util/organisationID.go b/server/util/organisationID.go
index 8b08d4187..8059d690d 100644
--- a/server/util/organisationID.go
+++ b/server/util/organisationID.go
@@ -7,11 +7,10 @@ import (
 	"fmt"
 	"net/http"
 	"strings"
-	"time"
 
 	//	"github.com/factly/dega-server/config"
 
-	"github.com/factly/dega-server/util/timex"
+	httpx "github.com/factly/dega-server/util/http"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
 	"github.com/factly/x/middlewarex"
@@ -78,7 +77,7 @@ func GetOrganisationIDfromSpaceID(spaceID, userID uint) (int, error) {
 		return 0, err
 	}
 	req.Header.Set("X-User", fmt.Sprintf("%d", userID))
-	client := http.Client{Timeout: time.Minute * time.Duration(timex.HTTP_TIMEOUT)}
+	client := httpx.CustomHttpClient()
 	response, err := client.Do(req)
 	if err != nil {
 		return 0, err
diff --git a/server/util/policy.go b/server/util/policy.go
index 4a63d0061..6017be3a7 100644
--- a/server/util/policy.go
+++ b/server/util/policy.go
@@ -6,9 +6,8 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
-	"time"
 
-	"github.com/factly/dega-server/util/timex"
+	httpx "github.com/factly/dega-server/util/http"
 	"github.com/factly/x/middlewarex"
 	"github.com/spf13/viper"
 )
@@ -77,7 +76,7 @@ func CheckAdmin(orgID, uID uint) (bool, error) {
 		return false, err
 	}
 
-	client := http.Client{Timeout: time.Minute * time.Duration(timex.HTTP_TIMEOUT)}
+	client := httpx.CustomHttpClient()
 	response, err := client.Do(req)
 	if err != nil {
 		return false, err
@@ -117,7 +116,7 @@ func IsAllowed(entity, action string, orgID, spaceID, userID uint) (int, error)
 		return 0, err
 	}
 	req.Header.Set("Content-Type", "application/json")
-	client := http.Client{Timeout: time.Minute * time.Duration(timex.HTTP_TIMEOUT)}
+	client := httpx.CustomHttpClient()
 	resp, err := client.Do(req)
 	if err != nil {
 		return 0, err
diff --git a/server/util/space.go b/server/util/space.go
index a7609f880..4da58485e 100644
--- a/server/util/space.go
+++ b/server/util/space.go
@@ -4,10 +4,9 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
-	"time"
 
 	"github.com/factly/dega-server/service/core/model"
-	"github.com/factly/dega-server/util/timex"
+	httpx "github.com/factly/dega-server/util/http"
 	"github.com/spf13/viper"
 )
 
@@ -24,7 +23,7 @@ func GetSpacefromKavach(userID, orgID, spaceID uint) (*model.Space, error) {
 	req.Header.Set("X-User", fmt.Sprintf("%d", userID))
 	req.Header.Set("Content-Type", "application/json")
 
-	client := http.Client{Timeout: time.Second * time.Duration(timex.HTTP_TIMEOUT)}
+	client := httpx.CustomHttpClient()
 	resp, err := client.Do(req)
 	if err != nil {
 		return nil, err

From ccc5ffea13e2d64637a96a572640a7cee39a3e81 Mon Sep 17 00:00:00 2001
From: vsumit89 <sumit.vishwakarma@factly.in>
Date: Tue, 30 Aug 2022 11:13:18 +0530
Subject: [PATCH 15/38] removed unwanted variable

---
 server/util/timex/time.go | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 server/util/timex/time.go

diff --git a/server/util/timex/time.go b/server/util/timex/time.go
deleted file mode 100644
index 7fef2c33d..000000000
--- a/server/util/timex/time.go
+++ /dev/null
@@ -1,3 +0,0 @@
-package timex
-
-var HTTP_TIMEOUT = 10

From 3445e9b9f29cc1ea54474fbf5dd5f9db9844c98c Mon Sep 17 00:00:00 2001
From: Mourya Prasanth <mouryaprasanthp@gmail.com>
Date: Tue, 30 Aug 2022 16:47:17 +0530
Subject: [PATCH 16/38] feat: update scooter version to use embed component

---
 studio/package-lock.json | 14 +++++++-------
 studio/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/studio/package-lock.json b/studio/package-lock.json
index 161c75841..11915a7f3 100644
--- a/studio/package-lock.json
+++ b/studio/package-lock.json
@@ -17,7 +17,7 @@
         "@editorjs/quote": "^2.3.0",
         "@editorjs/raw": "^2.1.2",
         "@editorjs/table": "^1.2.2",
-        "@factly/scooter": "^0.0.3",
+        "@factly/scooter": "^0.0.4",
         "@testing-library/jest-dom": "^4.2.4",
         "@testing-library/react": "^9.5.0",
         "@testing-library/user-event": "^7.2.1",
@@ -2374,9 +2374,9 @@
       "integrity": "sha512-3/gr7IkjsYuECndCpcBSKzZQHos7C9QU1ach8avyVbXB3VLAa1RyGjgocu0Ct4d02HdxirrYZ7+vP1Na+s04GQ=="
     },
     "node_modules/@factly/scooter": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/@factly/scooter/-/scooter-0.0.3.tgz",
-      "integrity": "sha512-qE21CrZCSin2MZA7rLtILitKkZbqX/PcZWjzdgbcSDysUpSxNiGx3l1fhZVH86B3I6ehlm0thCcTeCqWPGJ9ig==",
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/@factly/scooter/-/scooter-0.0.4.tgz",
+      "integrity": "sha512-aeNNY5aNFb9cTfG7h9TyFCtP6u8dy+nQkntISmYex+XnuqLixeZv5iDLCns73pGRqALYHs8/NVe2tgYt5q4juw==",
       "peerDependencies": {
         "react": "^18.2.0",
         "react-dom": "^18.2.0"
@@ -29573,9 +29573,9 @@
       "integrity": "sha512-3/gr7IkjsYuECndCpcBSKzZQHos7C9QU1ach8avyVbXB3VLAa1RyGjgocu0Ct4d02HdxirrYZ7+vP1Na+s04GQ=="
     },
     "@factly/scooter": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/@factly/scooter/-/scooter-0.0.3.tgz",
-      "integrity": "sha512-qE21CrZCSin2MZA7rLtILitKkZbqX/PcZWjzdgbcSDysUpSxNiGx3l1fhZVH86B3I6ehlm0thCcTeCqWPGJ9ig=="
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/@factly/scooter/-/scooter-0.0.4.tgz",
+      "integrity": "sha512-aeNNY5aNFb9cTfG7h9TyFCtP6u8dy+nQkntISmYex+XnuqLixeZv5iDLCns73pGRqALYHs8/NVe2tgYt5q4juw=="
     },
     "@hapi/address": {
       "version": "2.1.4",
diff --git a/studio/package.json b/studio/package.json
index 8544cd3a6..8d01eda2a 100644
--- a/studio/package.json
+++ b/studio/package.json
@@ -16,7 +16,7 @@
     "@editorjs/quote": "^2.3.0",
     "@editorjs/raw": "^2.1.2",
     "@editorjs/table": "^1.2.2",
-    "@factly/scooter": "^0.0.3",
+    "@factly/scooter": "^0.0.4",
     "@testing-library/jest-dom": "^4.2.4",
     "@testing-library/react": "^9.5.0",
     "@testing-library/user-event": "^7.2.1",

From 8349470a5832a95d21ccff7e1f921bdcd386f4fb Mon Sep 17 00:00:00 2001
From: vsumit89 <sumit.vishwakarma@factly.in>
Date: Wed, 31 Aug 2022 14:40:53 +0530
Subject: [PATCH 17/38] fixed the issues related to creating policies

---
 server/service/core/action/role/update.go     |  2 +-
 server/service/core/action/space/my.go        |  2 +-
 server/util/getservices.go                    | 66 ++++++++++++++++++-
 studio/src/actions/roles.js                   |  3 +-
 studio/src/config/routesConfig.js             |  8 ++-
 studio/src/pages/roles/EditRole.js            | 35 +++-------
 studio/src/pages/roles/components/RoleForm.js |  1 +
 7 files changed, 84 insertions(+), 33 deletions(-)

diff --git a/server/service/core/action/role/update.go b/server/service/core/action/role/update.go
index 6a94e60c1..8a51b35a9 100644
--- a/server/service/core/action/role/update.go
+++ b/server/service/core/action/role/update.go
@@ -58,7 +58,7 @@ func update(w http.ResponseWriter, r *http.Request) {
 		errorx.Render(w, errorx.Parser(errorx.DecodeError()))
 		return
 	}
-
+	
 	buf := new(bytes.Buffer)
 	err = json.NewEncoder(buf).Encode(spaceRole)
 	if err != nil {
diff --git a/server/service/core/action/space/my.go b/server/service/core/action/space/my.go
index 21eded427..f62adea3e 100644
--- a/server/service/core/action/space/my.go
+++ b/server/service/core/action/space/my.go
@@ -172,7 +172,7 @@ func my(w http.ResponseWriter, r *http.Request) {
 				}
 			}
 
-			spaceWithPerm.AllowedServices, err = util.GetAllowedServices(eachSpace.ID)
+			spaceWithPerm.AllowedServices, err = util.GetAllowedServices(eachSpace.ID, organisation.Organisation.ID, uint(uID))
 			if err != nil {
 				loggerx.Error(err)
 				errorx.Render(w, errorx.Parser(errorx.DBError()))
diff --git a/server/util/getservices.go b/server/util/getservices.go
index 9205fa906..22587c61a 100644
--- a/server/util/getservices.go
+++ b/server/util/getservices.go
@@ -4,13 +4,24 @@ import (
 	"github.com/factly/dega-server/config"
 	"github.com/factly/dega-server/service/core/model"
 	"github.com/factly/x/loggerx"
+	"github.com/factly/x/middlewarex"
+	"github.com/spf13/viper"
 )
 
-func GetAllowedServices(spaceID uint) ([]string, error) {
+func GetAllowedServices(spaceID, orgID, userID uint) ([]string, error) {
+	superOrgID, err := middlewarex.GetSuperOrganisationID("Kavach")
+	if err != nil {
+		return nil, err
+	}
+	err = createSpacePermissionIfDoesNotExist(spaceID, superOrgID == int(orgID), userID)
+	if err != nil {
+		return nil, err
+	}
+
 	spacePermission := new(model.SpacePermission)
-	err := config.DB.Model(&model.SpacePermission{}).Where(&model.SpacePermission{
+	err = config.DB.Model(&model.SpacePermission{}).Where(&model.SpacePermission{
 		SpaceID: spaceID,
-	}).First(spacePermission).Error
+	}).Find(spacePermission).Error
 	if err != nil {
 		if !(err.Error() == "record not found") {
 			loggerx.Error(err)
@@ -29,3 +40,52 @@ func GetAllowedServices(spaceID uint) ([]string, error) {
 
 	return serviceList, nil
 }
+
+func createSpacePermissionIfDoesNotExist(spaceID uint, isSuperOrg bool, userID uint) error {
+	var count int64
+	err := config.DB.Model(&model.SpacePermission{}).Where(&model.SpacePermission{
+		SpaceID: spaceID,
+	}).Count(&count).Error
+	if err != nil {
+		return err
+	}
+
+	if count == 1 {
+		return nil
+	}
+
+	if count == 0 {
+		var spacePermission model.SpacePermission
+		if isSuperOrg {
+			spacePermission = model.SpacePermission{
+				Base: config.Base{
+					CreatedByID: userID,
+				},
+				SpaceID:   spaceID,
+				Media:     -1,
+				Posts:     -1,
+				Podcast:   true,
+				Episodes:  -1,
+				FactCheck: true,
+				Videos:    -1,
+			}
+		} else {
+			spacePermission = model.SpacePermission{
+				Base: config.Base{
+					CreatedByID: userID,
+				},
+				SpaceID:   spaceID,
+				Media:     viper.GetInt64("default_number_of_media"),
+				Posts:     viper.GetInt64("default_number_of_posts"),
+				Episodes:  viper.GetInt64("default_number_of_episodes"),
+				Videos:    viper.GetInt64("default_number_of_videos"),
+				Podcast:   false,
+				FactCheck: false,
+			}
+		}
+		if err = config.DB.Model(&model.SpacePermission{}).Create(&spacePermission).Error; err != nil {
+			return err
+		}
+	}
+	return nil
+}
diff --git a/studio/src/actions/roles.js b/studio/src/actions/roles.js
index 7913f2f11..3b8c9e4f6 100644
--- a/studio/src/actions/roles.js
+++ b/studio/src/actions/roles.js
@@ -73,10 +73,9 @@ export const createRole = (data) => {
 export const updateRole = (data) => {
   return (dispatch, getState) => {
     const currentSpaceID = getState().spaces?.selected;
-    const currentOrgID = getState().spaces?.details[currentSpaceID].organisation_id;
     dispatch(loadingRoles());
     return axios
-      .put(ROLES_API(currentSpaceID) + '/' + data.id, { role: data, organisation_id: currentOrgID })
+      .put(ROLES_API(currentSpaceID) + '/' + data.id, data)
       .then((response) => {
         dispatch(addRole(UPDATE_ROLE, response.data));
         dispatch(addSuccessNotification('Roles updated'));
diff --git a/studio/src/config/routesConfig.js b/studio/src/config/routesConfig.js
index d270f457d..419859470 100644
--- a/studio/src/config/routesConfig.js
+++ b/studio/src/config/routesConfig.js
@@ -147,6 +147,7 @@ import Reindex from '../pages/spaces/Reindex';
 import { Component } from 'react';
 import ViewPolicy from '../pages/policies/components/ViewPolicy';
 import RoleUsers from '../pages/roles/users';
+import EditRole from '../pages/roles/EditRole';
 
 const routes = {
   dashboard: {
@@ -418,7 +419,12 @@ const routes = {
     Component: Roles,
     title: 'Roles',
   },
-
+  roleEdit: {
+    path: '/members/roles/:id/edit',
+    Component: EditRole,
+    menuKey: '/members/roles/edit',
+    title: 'Edit Role',
+  },
   roleUsers: {
     path: '/members/roles/:roleID/users',
     menuKey: '/members',
diff --git a/studio/src/pages/roles/EditRole.js b/studio/src/pages/roles/EditRole.js
index b8c635795..197f2493a 100644
--- a/studio/src/pages/roles/EditRole.js
+++ b/studio/src/pages/roles/EditRole.js
@@ -1,51 +1,36 @@
 import React from 'react';
 import { getRole, updateRole } from '../../actions/roles';
-import { useDispatch } from 'react-redux';
-import { useHistory } from 'react-router-dom';
+import { useDispatch, useSelector } from 'react-redux';
+import { useHistory, useParams } from 'react-router-dom';
 import { Helmet } from 'react-helmet';
 import RoleEditForm from './components/RoleForm';
+import { Skeleton } from 'antd';
 
 function EditRole() {
   const history = useHistory();
   const { id } = useParams();
   const dispatch = useDispatch();
   const { role, loading } = useSelector((state) => {
-    // if (!state.policies.details[id])
-    //   return {
-    //     policy: null,
-    //     loading: state.policies.loading,
-    //   };
-
     return {
-      policy: {
-        ...state.roles.details[id],
-        // permissions: state.policies.details[id].permissions.reduce(
-        //   (obj, item) => Object.assign(obj, { [item.resource]: item.actions }),
-        //   {},
-        // ),
-        // users: state.policies.details[id].users
-        //   ? state.policies.details[id].users.map((item) => parseInt(item.id))
-        //   : [],
-      },
-      loading: state.policies.loading,
+      role: state.roles.details[id],
+      loading: state.roles.loading,
     };
   });
+
+  console.log(role, loading);
   React.useEffect(() => {
     dispatch(getRole(id));
   }, [dispatch, id]);
   const onCreate = (values) => {
     console.log('this has beeen called');
-    // values.users = values.users.map((item) => item.toString());
-    // values.permissions = values.permissions.filter(
-    //   (item) => item && item.resource && item.actions.length > 0,
-    // );
+    console.log({ values });
     dispatch(updateRole({ ...role, ...values })).then(() => history.push('/members/roles'));
   };
 
   return (
     <>
-      <Helmet title={'Create Role'} />
-      <RoleEditForm onCreate={onCreate} data={role} />
+      <Helmet title={'Update Role'} />
+      {loading ? <Skeleton /> : <RoleEditForm onCreate={onCreate} data={role} />}
     </>
   );
 }
diff --git a/studio/src/pages/roles/components/RoleForm.js b/studio/src/pages/roles/components/RoleForm.js
index 2f30d8f3d..ba0a85993 100644
--- a/studio/src/pages/roles/components/RoleForm.js
+++ b/studio/src/pages/roles/components/RoleForm.js
@@ -21,6 +21,7 @@ function RoleForm({ data = {}, onCreate }) {
         onFinish={(values) => {
           onCreate(values);
         }}
+        initialValues={data}
       >
         <Form.Item
           name="name"

From 47a3c2c164c49fa083dc160aa6875f2b23f19bca Mon Sep 17 00:00:00 2001
From: surajmn1 <suraj.natraj@factly.in>
Date: Thu, 1 Sep 2022 12:45:02 +0530
Subject: [PATCH 18/38] fix add space users

---
 studio/src/reducers/spacesReducer.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/studio/src/reducers/spacesReducer.js b/studio/src/reducers/spacesReducer.js
index 360949b42..78e720c3b 100644
--- a/studio/src/reducers/spacesReducer.js
+++ b/studio/src/reducers/spacesReducer.js
@@ -100,6 +100,7 @@ export default function spacesReducer(state = initialState, action = {}) {
       return {
         ...state,
         details: {
+          ...state.details , 
           [action.payload.id]: {
             ...state.details[action.payload.id],
             users: action.payload.data,

From 0d050a6a0e7f7f78e2277649c4a97b8b356d85b0 Mon Sep 17 00:00:00 2001
From: vsumit89 <sumit.vishwakarma@factly.in>
Date: Thu, 1 Sep 2022 13:25:10 +0530
Subject: [PATCH 19/38] added a check for listing spaces

---
 server/service/core/action/space/my.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/server/service/core/action/space/my.go b/server/service/core/action/space/my.go
index f62adea3e..295eb904b 100644
--- a/server/service/core/action/space/my.go
+++ b/server/service/core/action/space/my.go
@@ -130,6 +130,9 @@ func my(w http.ResponseWriter, r *http.Request) {
 		}
 		defer resp.Body.Close()
 
+		if resp.StatusCode != 200 {
+			continue
+		}
 		organisationSpacesfromKavach := make([]model.KavachSpace, 0)
 		err = json.NewDecoder(resp.Body).Decode(&organisationSpacesfromKavach)
 		if err != nil {

From f25b3abeea6d4b7de7db33848154e6f1864e6aa7 Mon Sep 17 00:00:00 2001
From: surajmn1 <suraj.natraj@factly.in>
Date: Thu, 1 Sep 2022 14:29:37 +0530
Subject: [PATCH 20/38] added null check for response

---
 studio/src/actions/spaces.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/studio/src/actions/spaces.js b/studio/src/actions/spaces.js
index 745cb00fa..6b44c95d1 100644
--- a/studio/src/actions/spaces.js
+++ b/studio/src/actions/spaces.js
@@ -21,7 +21,7 @@ export const getSpaces = () => {
     return axios
       .get(API_GET_SPACES)
       .then((response) => {
-        dispatch(getSpacesSuccess(response.data));
+        dispatch(getSpacesSuccess(response.data.filter((org)=> org.applications!==null && org.spaces!==null)));
         return response.data;
       })
       .catch((error) => {

From 62d59792971ee6b4a5c70fb8dad93780244a795b Mon Sep 17 00:00:00 2001
From: vsumit89 <sumit.vishwakarma@factly.in>
Date: Thu, 1 Sep 2022 16:26:46 +0530
Subject: [PATCH 21/38] fixed the permission changes

---
 server/util/getPermission.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/server/util/getPermission.go b/server/util/getPermission.go
index 031cf775c..136af31fe 100644
--- a/server/util/getPermission.go
+++ b/server/util/getPermission.go
@@ -75,7 +75,7 @@ func GetPermissions(orgID, appID, spaceID, uID uint) ([]model.Permission, error)
 			}
 
 			if response.StatusCode != 200 {
-				return nil, err
+				continue
 			}
 
 			resourceTuples := RelationTuplesWithSubjectSet{}
@@ -104,7 +104,6 @@ func GetPermissions(orgID, appID, spaceID, uID uint) ([]model.Permission, error)
 
 	_, err = json.Marshal(ketoResponse)
 	if err != nil {
-		fmt.Print("here")
 		loggerx.Error(err)
 		return nil, err
 	}

From c9090c3cfa5e57625a211b806ca645ce291cd475 Mon Sep 17 00:00:00 2001
From: vsumit89 <sumit.vishwakarma@factly.in>
Date: Thu, 1 Sep 2022 16:39:08 +0530
Subject: [PATCH 22/38] fixed url encoding

---
 server/util/getPermission.go | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/server/util/getPermission.go b/server/util/getPermission.go
index 136af31fe..ca1952137 100644
--- a/server/util/getPermission.go
+++ b/server/util/getPermission.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
+	"net/url"
 	"strings"
 
 	"github.com/factly/dega-server/service/core/model"
@@ -64,8 +65,20 @@ func GetPermissions(orgID, appID, spaceID, uID uint) ([]model.Permission, error)
 	var ketoResponse = make(map[string][]string)
 	for _, tuple := range tuples.Tuples {
 		if strings.HasPrefix(tuple.Object, "roles") {
-			requestURL = viper.GetString("keto_url") + "/relation-tuples?" + fmt.Sprintf("namespace=%s&subject_set.namespace=%s&subject_set.object=%s&subject_set.relation=%s", namespace, namespace, roleObject, tuple.Relation)
-			req, err = http.NewRequest("GET", requestURL, nil)
+			baseURL, err := url.Parse(viper.GetString("keto_url"))
+			if err != nil {
+				return nil, err
+			}
+
+			//adding the path
+			baseURL.Path += "relation-tuples"
+			params := url.Values{}
+			params.Add("namespace", namespace)
+			params.Add("subject_set.namespace", namespace)
+			params.Add("subject_set.object", roleObject)
+			params.Add("subject_set.relation", tuple.Relation)
+			baseURL.RawQuery = params.Encode()
+			req, err = http.NewRequest("GET", baseURL.String(), nil)
 			if err != nil {
 				return nil, err
 			}

From 0616ba5bbcf4f11fe5fd0770956b5965ca0a11aa Mon Sep 17 00:00:00 2001
From: vsumit89 <sumit.vishwakarma@factly.in>
Date: Thu, 1 Sep 2022 16:39:46 +0530
Subject: [PATCH 23/38] fixed url

---
 server/util/getPermission.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/util/getPermission.go b/server/util/getPermission.go
index ca1952137..8b70e5566 100644
--- a/server/util/getPermission.go
+++ b/server/util/getPermission.go
@@ -78,7 +78,8 @@ func GetPermissions(orgID, appID, spaceID, uID uint) ([]model.Permission, error)
 			params.Add("subject_set.object", roleObject)
 			params.Add("subject_set.relation", tuple.Relation)
 			baseURL.RawQuery = params.Encode()
-			req, err = http.NewRequest("GET", baseURL.String(), nil)
+			reqUrl := baseURL.String()
+			req, err = http.NewRequest("GET", reqUrl, nil)
 			if err != nil {
 				return nil, err
 			}

From 8717178785827b516125ae7ce282bc95e97b172b Mon Sep 17 00:00:00 2001
From: vsumit89 <sumit.vishwakarma@factly.in>
Date: Fri, 2 Sep 2022 16:45:59 +0530
Subject: [PATCH 24/38] fixed go.mod issue in dega-api

---
 api/graph/loaders/dataloader.go |  2 +-
 api/graph/resolvers/sitemap.go  |  2 +-
 api/util/httpx/client.go        | 12 ++++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 api/util/httpx/client.go

diff --git a/api/graph/loaders/dataloader.go b/api/graph/loaders/dataloader.go
index 21cf4be96..c7ba9f466 100644
--- a/api/graph/loaders/dataloader.go
+++ b/api/graph/loaders/dataloader.go
@@ -12,8 +12,8 @@ import (
 	"github.com/factly/dega-api/graph/logger"
 	"github.com/factly/dega-api/graph/models"
 	"github.com/factly/dega-api/graph/validator"
-	httpx "github.com/factly/dega-server/util/http"
 	"github.com/factly/dega-api/util"
+	httpx "github.com/factly/dega-api/util/httpx"
 	"github.com/spf13/viper"
 )
 
diff --git a/api/graph/resolvers/sitemap.go b/api/graph/resolvers/sitemap.go
index c1fd43177..a145526e5 100644
--- a/api/graph/resolvers/sitemap.go
+++ b/api/graph/resolvers/sitemap.go
@@ -10,7 +10,7 @@ import (
 	"github.com/factly/dega-api/graph/generated"
 	"github.com/factly/dega-api/graph/models"
 	"github.com/factly/dega-api/graph/validator"
-	httpx "github.com/factly/dega-server/util/http"
+	httpx "github.com/factly/dega-api/util/httpx"
 	"github.com/spf13/viper"
 )
 
diff --git a/api/util/httpx/client.go b/api/util/httpx/client.go
new file mode 100644
index 000000000..d9d70ad9e
--- /dev/null
+++ b/api/util/httpx/client.go
@@ -0,0 +1,12 @@
+package httpx
+
+import (
+	"net/http"
+	"time"
+)
+
+const httpTimeout = 10
+
+func CustomHttpClient() *http.Client {
+	return &http.Client{Timeout: time.Minute * time.Duration(httpTimeout)}
+}

From 7e852e79bf5cd70006f5aca1764089c9873082f1 Mon Sep 17 00:00:00 2001
From: surajmn1 <suraj.natraj@factly.in>
Date: Fri, 2 Sep 2022 17:33:26 +0530
Subject: [PATCH 25/38] update name column index

---
 studio/src/pages/users/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/studio/src/pages/users/index.js b/studio/src/pages/users/index.js
index 27010ffdc..a71e4f8cf 100644
--- a/studio/src/pages/users/index.js
+++ b/studio/src/pages/users/index.js
@@ -30,7 +30,7 @@ function Users() {
   const columns = [
     {
       title: 'Name',
-      dataIndex: 'name',
+      dataIndex: 'display_name',
       key: 'name',
     },
     {

From 786f5f628b8b03f0efd0579f887f9642ad2ce8a3 Mon Sep 17 00:00:00 2001
From: vsumit89 <sumit.vishwakarma@factly.in>
Date: Sun, 4 Sep 2022 02:39:21 +0530
Subject: [PATCH 26/38] fixed the rating issues on the dashboard

---
 .../pages/dashboard/components/Features.js    | 53 +++++++++++--------
 1 file changed, 31 insertions(+), 22 deletions(-)

diff --git a/studio/src/pages/dashboard/components/Features.js b/studio/src/pages/dashboard/components/Features.js
index 1c64353fb..2e3223af3 100644
--- a/studio/src/pages/dashboard/components/Features.js
+++ b/studio/src/pages/dashboard/components/Features.js
@@ -16,26 +16,6 @@ function Features() {
     return admin.organisation;
   });
 
-  React.useEffect(() => {
-    fetchEntities();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-  const fetchEntities = () => {
-    dispatch(getRatings());
-    dispatch(getFormats());
-    dispatch(getPolicies());
-  };
-
-  React.useEffect(() => {
-    if (superOrg.is_admin) {
-      fetchEvents();
-    }
-  }, [superOrg.is_admin]);
-
-  const fetchEvents = () => {
-    dispatch(getEvents());
-  };
-
   const {
     ratings,
     ratingsLoading,
@@ -45,7 +25,9 @@ function Features() {
     policiesLoading,
     events,
     eventsLoading,
-  } = useSelector(({ ratings, formats, policies, events }) => {
+    validServices,
+    loadingServices,
+  } = useSelector(({ ratings, formats, policies, events, spaces }) => {
     return {
       ratings: Object.keys(ratings.details).length,
       ratingsLoading: ratings.loading,
@@ -55,9 +37,35 @@ function Features() {
       policiesLoading: policies.loading,
       events: Object.keys(events.details).length,
       eventsLoading: events.loading,
+      validServices: spaces.details[spaces.selected].services?.length
+        ? spaces.details[spaces.selected].services
+        : [],
+      loadingServices: spaces.loading,
     };
   });
 
+  React.useEffect(() => {
+    fetchEntities();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+  const fetchEntities = () => {
+    if (!loadingServices && validServices?.includes('fact-checking')) {
+      dispatch(getRatings());
+    }
+    dispatch(getFormats());
+    dispatch(getPolicies());
+  };
+
+  React.useEffect(() => {
+    if (superOrg.is_admin) {
+      fetchEvents();
+    }
+  }, [superOrg.is_admin]);
+
+  const fetchEvents = () => {
+    dispatch(getEvents());
+  };
+
   return (
     <>
       {!ratingsLoading &&
@@ -68,7 +76,8 @@ function Features() {
       ) : null}
 
       <Space>
-        {ratingsLoading ? null : ratings > 0 ? null : (
+        {ratingsLoading && loadingServices ? null : ratings > 0 ||
+          !validServices.includes('fact-checking') ? null : (
           <Card
             title="Ratings"
             actions={[

From 364927795549d6d8f2eb4af4355c3e8b55596044 Mon Sep 17 00:00:00 2001
From: vsumit89 <sumit.vishwakarma@factly.in>
Date: Sun, 4 Sep 2022 02:40:20 +0530
Subject: [PATCH 27/38] fixed the rating issues on the dashboard

---
 studio/src/actions/spaces.js         | 6 +++++-
 studio/src/reducers/spacesReducer.js | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/studio/src/actions/spaces.js b/studio/src/actions/spaces.js
index 6b44c95d1..716ef327a 100644
--- a/studio/src/actions/spaces.js
+++ b/studio/src/actions/spaces.js
@@ -21,7 +21,11 @@ export const getSpaces = () => {
     return axios
       .get(API_GET_SPACES)
       .then((response) => {
-        dispatch(getSpacesSuccess(response.data.filter((org)=> org.applications!==null && org.spaces!==null)));
+        dispatch(
+          getSpacesSuccess(
+            response.data.filter((org) => org.applications !== null && org.spaces !== null),
+          ),
+        );
         return response.data;
       })
       .catch((error) => {
diff --git a/studio/src/reducers/spacesReducer.js b/studio/src/reducers/spacesReducer.js
index 78e720c3b..61b6e6c77 100644
--- a/studio/src/reducers/spacesReducer.js
+++ b/studio/src/reducers/spacesReducer.js
@@ -100,7 +100,7 @@ export default function spacesReducer(state = initialState, action = {}) {
       return {
         ...state,
         details: {
-          ...state.details , 
+          ...state.details,
           [action.payload.id]: {
             ...state.details[action.payload.id],
             users: action.payload.data,

From f4d32c0821fa9a457e2b57a324af408c8a2e49cd Mon Sep 17 00:00:00 2001
From: vsumit89 <sumit.vishwakarma@factly.in>
Date: Sun, 4 Sep 2022 02:41:31 +0530
Subject: [PATCH 28/38] removed unwanted console logs

---
 studio/src/actions/policies.js                      | 2 --
 studio/src/pages/roles/EditRole.js                  | 3 ---
 studio/src/pages/spaces/components/SpaceEditForm.js | 1 -
 3 files changed, 6 deletions(-)

diff --git a/studio/src/actions/policies.js b/studio/src/actions/policies.js
index 5038ad2e1..fe55a3fa5 100644
--- a/studio/src/actions/policies.js
+++ b/studio/src/actions/policies.js
@@ -66,7 +66,6 @@ export const getPolicy = (id) => {
     return axios
       .get(POLICIES_API + '/' + id)
       .then((response) => {
-        console.log(response.data);
         dispatch(addPolicy(GET_POLICY, response.data));
       })
       .catch((error) => {
@@ -94,7 +93,6 @@ export const createPolicy = (data) => {
 
 // action to update policy by id
 export const updatePolicy = (data) => {
-  console.log({ data });
   return (dispatch) => {
     dispatch(loadingPolicies());
     return axios
diff --git a/studio/src/pages/roles/EditRole.js b/studio/src/pages/roles/EditRole.js
index 197f2493a..46315e0ed 100644
--- a/studio/src/pages/roles/EditRole.js
+++ b/studio/src/pages/roles/EditRole.js
@@ -17,13 +17,10 @@ function EditRole() {
     };
   });
 
-  console.log(role, loading);
   React.useEffect(() => {
     dispatch(getRole(id));
   }, [dispatch, id]);
   const onCreate = (values) => {
-    console.log('this has beeen called');
-    console.log({ values });
     dispatch(updateRole({ ...role, ...values })).then(() => history.push('/members/roles'));
   };
 
diff --git a/studio/src/pages/spaces/components/SpaceEditForm.js b/studio/src/pages/spaces/components/SpaceEditForm.js
index 041e9dcb3..e4e8c3c84 100644
--- a/studio/src/pages/spaces/components/SpaceEditForm.js
+++ b/studio/src/pages/spaces/components/SpaceEditForm.js
@@ -49,7 +49,6 @@ const SpaceEditForm = ({ onCreate, data = {} }) => {
         onFinishFailed={(errors) => {
           // let name = errors.errorFields[0].name[0];
           // if (['name', 'slug'].includes(name)) {
-          console.log({ errors });
           // }
         }}
         onValuesChange={() => {

From ef8af039f8c4433789eeea7f9a1243ff53deddba Mon Sep 17 00:00:00 2001
From: Mourya Prasanth <mouryaprasanthp@gmail.com>
Date: Sun, 4 Sep 2022 07:13:57 +0530
Subject: [PATCH 29/38] chore: update scooter version add images gallery to
 images component

---
 studio/.npmrc                                      |  1 +
 studio/package-lock.json                           | 14 +++++++-------
 studio/package.json                                |  2 +-
 .../src/components/FormItems/DescriptionInput.js   | 10 ++++++++++
 4 files changed, 19 insertions(+), 8 deletions(-)
 create mode 100644 studio/.npmrc

diff --git a/studio/.npmrc b/studio/.npmrc
new file mode 100644
index 000000000..521a9f7c0
--- /dev/null
+++ b/studio/.npmrc
@@ -0,0 +1 @@
+legacy-peer-deps=true
diff --git a/studio/package-lock.json b/studio/package-lock.json
index 11915a7f3..4ec03bc5b 100644
--- a/studio/package-lock.json
+++ b/studio/package-lock.json
@@ -17,7 +17,7 @@
         "@editorjs/quote": "^2.3.0",
         "@editorjs/raw": "^2.1.2",
         "@editorjs/table": "^1.2.2",
-        "@factly/scooter": "^0.0.4",
+        "@factly/scooter": "^0.0.7",
         "@testing-library/jest-dom": "^4.2.4",
         "@testing-library/react": "^9.5.0",
         "@testing-library/user-event": "^7.2.1",
@@ -2374,9 +2374,9 @@
       "integrity": "sha512-3/gr7IkjsYuECndCpcBSKzZQHos7C9QU1ach8avyVbXB3VLAa1RyGjgocu0Ct4d02HdxirrYZ7+vP1Na+s04GQ=="
     },
     "node_modules/@factly/scooter": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/@factly/scooter/-/scooter-0.0.4.tgz",
-      "integrity": "sha512-aeNNY5aNFb9cTfG7h9TyFCtP6u8dy+nQkntISmYex+XnuqLixeZv5iDLCns73pGRqALYHs8/NVe2tgYt5q4juw==",
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/@factly/scooter/-/scooter-0.0.7.tgz",
+      "integrity": "sha512-qkK7me6DuQUBMBBzGOq5xrFQdR8qae6r3S+QMFIoDCuzBZHRxgcTRpW3VQmHh+q6hQvn3uEY6WBtUiwgUHxjoA==",
       "peerDependencies": {
         "react": "^18.2.0",
         "react-dom": "^18.2.0"
@@ -29573,9 +29573,9 @@
       "integrity": "sha512-3/gr7IkjsYuECndCpcBSKzZQHos7C9QU1ach8avyVbXB3VLAa1RyGjgocu0Ct4d02HdxirrYZ7+vP1Na+s04GQ=="
     },
     "@factly/scooter": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/@factly/scooter/-/scooter-0.0.4.tgz",
-      "integrity": "sha512-aeNNY5aNFb9cTfG7h9TyFCtP6u8dy+nQkntISmYex+XnuqLixeZv5iDLCns73pGRqALYHs8/NVe2tgYt5q4juw=="
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/@factly/scooter/-/scooter-0.0.7.tgz",
+      "integrity": "sha512-qkK7me6DuQUBMBBzGOq5xrFQdR8qae6r3S+QMFIoDCuzBZHRxgcTRpW3VQmHh+q6hQvn3uEY6WBtUiwgUHxjoA=="
     },
     "@hapi/address": {
       "version": "2.1.4",
diff --git a/studio/package.json b/studio/package.json
index 8d01eda2a..37afaabd3 100644
--- a/studio/package.json
+++ b/studio/package.json
@@ -16,7 +16,7 @@
     "@editorjs/quote": "^2.3.0",
     "@editorjs/raw": "^2.1.2",
     "@editorjs/table": "^1.2.2",
-    "@factly/scooter": "^0.0.4",
+    "@factly/scooter": "^0.0.7",
     "@testing-library/jest-dom": "^4.2.4",
     "@testing-library/react": "^9.5.0",
     "@testing-library/user-event": "^7.2.1",
diff --git a/studio/src/components/FormItems/DescriptionInput.js b/studio/src/components/FormItems/DescriptionInput.js
index 1cc2b43a1..25aebe80e 100644
--- a/studio/src/components/FormItems/DescriptionInput.js
+++ b/studio/src/components/FormItems/DescriptionInput.js
@@ -1,7 +1,10 @@
 import React from 'react';
 import { Form } from 'antd';
+import axios from 'axios';
 // import Editor from '../Editor';
 import { Editor } from '@factly/scooter';
+import { MEDIA_API } from '../../constants/media';
+
 const DescriptionInput = ({
   name = 'description',
   label = 'Description',
@@ -24,6 +27,13 @@ const DescriptionInput = ({
         onChange={({ json, html }) => console.log({ json, html })}
         {...inputProps}
         initialValue={initialValue}
+        imagesFetcher={(currentPage) =>
+          axios
+            .get(MEDIA_API, {
+              params: { page: currentPage, limit: 12 },
+            })
+            .then((res) => res.data)
+        }
       />
     </Form.Item>
   );

From df561bc63c43e16c6599990936c771df778427c1 Mon Sep 17 00:00:00 2001
From: Mourya Prasanth <mouryaprasanthp@gmail.com>
Date: Sun, 4 Sep 2022 16:34:55 +0530
Subject: [PATCH 30/38] fix: add iframely and uppy endpoints to config

---
 studio/public/config.js                             | 1 +
 studio/src/components/FormItems/DescriptionInput.js | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/studio/public/config.js b/studio/public/config.js
index 7f685ccd9..af754abb5 100644
--- a/studio/public/config.js
+++ b/studio/public/config.js
@@ -4,3 +4,4 @@ window.REACT_APP_COMPANION_URL = 'http://127.0.0.1:3020';
 window.PUBLIC_URL = 'http://127.0.0.1:4455/.factly/dega/studio';
 window.REACT_APP_KAVACH_PUBLIC_URL = 'http://127.0.0.1:4455/.factly/kavach/web';
 window.REACT_APP_SACH_API_URL = 'https://sach-server.factly.in';
+window.REACT_APP_IFRAMELY_URL = 'http://127.0.0.1:4455/.factly/dega/server/meta';
diff --git a/studio/src/components/FormItems/DescriptionInput.js b/studio/src/components/FormItems/DescriptionInput.js
index 25aebe80e..16a161856 100644
--- a/studio/src/components/FormItems/DescriptionInput.js
+++ b/studio/src/components/FormItems/DescriptionInput.js
@@ -27,6 +27,8 @@ const DescriptionInput = ({
         onChange={({ json, html }) => console.log({ json, html })}
         {...inputProps}
         initialValue={initialValue}
+        uploadEndpoint={window.REACT_APP_COMPANION_URL}
+        iframelyEndpoint={window.REACT_APP_IFRAMELY_URL}
         imagesFetcher={(currentPage) =>
           axios
             .get(MEDIA_API, {

From dffb1e6707f5f78b2c38b259699b35184e1d6733 Mon Sep 17 00:00:00 2001
From: vsumit89 <sumit.vishwakarma@factly.in>
Date: Sun, 4 Sep 2022 20:43:05 +0530
Subject: [PATCH 31/38] fixed merge api changes

---
 api/graph/resolvers/sitemap.go  | 235 +-------------------------------
 api/graph/resolvers/sitemaps.go |   3 +-
 2 files changed, 7 insertions(+), 231 deletions(-)

diff --git a/api/graph/resolvers/sitemap.go b/api/graph/resolvers/sitemap.go
index a145526e5..851fbcfde 100644
--- a/api/graph/resolvers/sitemap.go
+++ b/api/graph/resolvers/sitemap.go
@@ -2,241 +2,16 @@ package resolvers
 
 import (
 	"context"
-	"encoding/json"
-	"fmt"
-	"net/http"
+	"time"
 
-	"github.com/factly/dega-api/config"
 	"github.com/factly/dega-api/graph/generated"
 	"github.com/factly/dega-api/graph/models"
-	"github.com/factly/dega-api/graph/validator"
-	httpx "github.com/factly/dega-api/util/httpx"
-	"github.com/spf13/viper"
 )
 
-func (r *queryResolver) Sitemap(ctx context.Context) (*models.Sitemaps, error) {
-	var ok models.Sitemaps = "OKAY"
-	return &ok, nil
+func (r *sitemapResolver) PublishedDate(ctx context.Context, obj *models.Sitemap) (*time.Time, error) {
+	return &obj.PublishedAt, nil
 }
 
-func (r *sitemapsResolver) Categories(ctx context.Context, obj *models.Sitemaps) ([]*models.Sitemap, error) {
-	sID, err := validator.GetSpace(ctx)
-	if err != nil {
-		return nil, err
-	}
+func (r *Resolver) Sitemap() generated.SitemapResolver { return &sitemapResolver{r} }
 
-	categories := []models.Category{}
-
-	config.DB.Model(&models.Category{}).Where("space_id in (?)", sID).Find(&categories)
-	nodes := []*models.Sitemap{}
-
-	for _, category := range categories {
-		sitemap := &models.Sitemap{
-			ID:        fmt.Sprint(category.ID),
-			Slug:      category.Slug,
-			CreatedAt: category.CreatedAt,
-		}
-		nodes = append(nodes, sitemap)
-	}
-	return nodes, nil
-}
-
-func (r *sitemapsResolver) Tags(ctx context.Context, obj *models.Sitemaps) ([]*models.Sitemap, error) {
-	sID, err := validator.GetSpace(ctx)
-	if err != nil {
-		return nil, err
-	}
-	tags := []models.Tag{}
-
-	config.DB.Model(&models.Tag{}).Where("space_id in (?)", sID).Find(&tags)
-	nodes := []*models.Sitemap{}
-
-	for _, tag := range tags {
-		sitemap := &models.Sitemap{
-			ID:        fmt.Sprint(tag.ID),
-			Slug:      tag.Slug,
-			CreatedAt: tag.CreatedAt,
-		}
-		nodes = append(nodes, sitemap)
-	}
-	return nodes, nil
-}
-
-func (r *sitemapsResolver) Users(ctx context.Context, obj *models.Sitemaps) ([]*models.Sitemap, error) {
-
-	sID, err := validator.GetSpace(ctx)
-	if err != nil {
-		return nil, nil
-	}
-
-	post := &models.Post{}
-	post.SpaceID = sID
-
-	err = config.DB.First(post).Error
-	if err != nil {
-		return nil, nil
-	}
-
-	postAuthor := &models.PostAuthor{}
-	postAuthor.PostID = post.ID
-
-	err = config.DB.First(postAuthor).Error
-	if err != nil {
-		return nil, nil
-	}
-
-	space := &models.Space{}
-	space.ID = sID
-
-	err = config.DB.First(space).Error
-	if err != nil {
-		return nil, nil
-	}
-
-	url := fmt.Sprint(viper.GetString("kavach_url"), "/organisations/", space.OrganisationID, "/users")
-
-	req, err := http.NewRequest("GET", url, nil)
-	if err != nil {
-		return nil, nil
-	}
-
-	req.Header.Set("Content-Type", "application/json")
-	req.Header.Set("X-User", fmt.Sprint(postAuthor.AuthorID))
-	client := httpx.CustomHttpClient()
-	resp, err := client.Do(req)
-
-	if err != nil {
-		return nil, nil
-	}
-
-	defer resp.Body.Close()
-
-	users := []*models.User{}
-	err = json.NewDecoder(resp.Body).Decode(&users)
-
-	if err != nil {
-		return nil, nil
-	}
-
-	nodes := []*models.Sitemap{}
-
-	for _, user := range users {
-		sitemap := &models.Sitemap{
-			ID:        fmt.Sprint(user.ID),
-			Slug:      fmt.Sprint(user.ID),
-			CreatedAt: user.CreatedAt,
-		}
-		nodes = append(nodes, sitemap)
-	}
-	return nodes, nil
-}
-
-func (r *sitemapsResolver) Formats(ctx context.Context, obj *models.Sitemaps) ([]*models.Sitemap, error) {
-	sID, err := validator.GetSpace(ctx)
-	if err != nil {
-		return nil, err
-	}
-	formats := []models.Format{}
-
-	config.DB.Model(&models.Format{}).Where("space_id in (?)", sID).Find(&formats)
-	nodes := []*models.Sitemap{}
-
-	for _, format := range formats {
-		sitemap := &models.Sitemap{
-			ID:        fmt.Sprint(format.ID),
-			Slug:      format.Slug,
-			CreatedAt: format.CreatedAt,
-		}
-		nodes = append(nodes, sitemap)
-	}
-	return nodes, nil
-}
-
-func (r *sitemapsResolver) Posts(ctx context.Context, obj *models.Sitemaps) ([]*models.Sitemap, error) {
-	sID, err := validator.GetSpace(ctx)
-	if err != nil {
-		return nil, err
-	}
-	posts := []models.Post{}
-
-	config.DB.Model(&models.Post{}).Where("space_id in (?)", sID).Find(&posts)
-	nodes := []*models.Sitemap{}
-
-	for _, post := range posts {
-		sitemap := &models.Sitemap{
-			ID:        fmt.Sprint(post.ID),
-			Slug:      post.Slug,
-			CreatedAt: post.CreatedAt,
-		}
-		nodes = append(nodes, sitemap)
-	}
-	return nodes, nil
-}
-
-func (r *sitemapsResolver) Claims(ctx context.Context, obj *models.Sitemaps) ([]*models.Sitemap, error) {
-	sID, err := validator.GetSpace(ctx)
-	if err != nil {
-		return nil, err
-	}
-	claims := []models.Claim{}
-
-	config.DB.Model(&models.Claim{}).Where("space_id in (?)", sID).Find(&claims)
-	nodes := []*models.Sitemap{}
-
-	for _, claim := range claims {
-		sitemap := &models.Sitemap{
-			ID:        fmt.Sprint(claim.ID),
-			Slug:      claim.Slug,
-			CreatedAt: claim.CreatedAt,
-		}
-		nodes = append(nodes, sitemap)
-	}
-	return nodes, nil
-}
-
-func (r *sitemapsResolver) Claimants(ctx context.Context, obj *models.Sitemaps) ([]*models.Sitemap, error) {
-	sID, err := validator.GetSpace(ctx)
-	if err != nil {
-		return nil, err
-	}
-	claimants := []models.Claimant{}
-
-	config.DB.Model(&models.Claimant{}).Where("space_id in (?)", sID).Find(&claimants)
-	nodes := []*models.Sitemap{}
-
-	for _, claimant := range claimants {
-		sitemap := &models.Sitemap{
-			ID:        fmt.Sprint(claimant.ID),
-			Slug:      claimant.Slug,
-			CreatedAt: claimant.CreatedAt,
-		}
-		nodes = append(nodes, sitemap)
-	}
-	return nodes, nil
-}
-
-func (r *sitemapsResolver) Ratings(ctx context.Context, obj *models.Sitemaps) ([]*models.Sitemap, error) {
-	sID, err := validator.GetSpace(ctx)
-	if err != nil {
-		return nil, err
-	}
-	ratings := []models.Rating{}
-
-	config.DB.Model(&models.Rating{}).Where("space_id in (?)", sID).Find(&ratings)
-	nodes := []*models.Sitemap{}
-
-	for _, rating := range ratings {
-		sitemap := &models.Sitemap{
-			ID:        fmt.Sprint(rating.ID),
-			Slug:      rating.Slug,
-			CreatedAt: rating.CreatedAt,
-		}
-		nodes = append(nodes, sitemap)
-	}
-	return nodes, nil
-}
-
-// Sitemaps model resolver
-func (r *Resolver) Sitemaps() generated.SitemapsResolver { return &sitemapsResolver{r} }
-
-type sitemapsResolver struct{ *Resolver }
+type sitemapResolver struct{ *Resolver }
\ No newline at end of file
diff --git a/api/graph/resolvers/sitemaps.go b/api/graph/resolvers/sitemaps.go
index 7882023e0..ac87faf3f 100644
--- a/api/graph/resolvers/sitemaps.go
+++ b/api/graph/resolvers/sitemaps.go
@@ -11,6 +11,7 @@ import (
 	"github.com/factly/dega-api/graph/generated"
 	"github.com/factly/dega-api/graph/models"
 	"github.com/factly/dega-api/graph/validator"
+	"github.com/factly/dega-api/util/httpx"
 	"github.com/spf13/viper"
 )
 
@@ -104,7 +105,7 @@ func (r *sitemapsResolver) Users(ctx context.Context, obj *models.Sitemaps) ([]*
 
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("X-User", fmt.Sprint(postAuthor.AuthorID))
-	client := &http.Client{}
+	client := httpx.CustomHttpClient()
 	resp, err := client.Do(req)
 
 	if err != nil {

From 348f6694610c5d9dff974119d2acd899b926c181 Mon Sep 17 00:00:00 2001
From: vsumit89 <sumit.vishwakarma@factly.in>
Date: Sun, 4 Sep 2022 22:37:09 +0530
Subject: [PATCH 32/38] fixed the dega-api issue

---
 studio/src/pages/claims/CreateClaim.js | 30 +++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/studio/src/pages/claims/CreateClaim.js b/studio/src/pages/claims/CreateClaim.js
index e698d743e..4f0d06350 100644
--- a/studio/src/pages/claims/CreateClaim.js
+++ b/studio/src/pages/claims/CreateClaim.js
@@ -1,9 +1,10 @@
 import React from 'react';
 import ClaimCreateForm from './components/ClaimForm';
-import { useDispatch } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 import { createClaim } from '../../actions/claims';
-import { useHistory } from 'react-router-dom';
+import { Link, useHistory } from 'react-router-dom';
 import { Helmet } from 'react-helmet';
+import { Button, Result } from 'antd';
 
 function CreateClaim() {
   const history = useHistory();
@@ -12,10 +13,33 @@ function CreateClaim() {
   const onCreate = (values) => {
     dispatch(createClaim(values)).then(() => history.push('/claims'));
   };
+
+  const { claimantsCount } = useSelector(({ claimants }) => {
+    return {
+      claimantsCount: (claimants?.req?.[0]?.data) ? claimants?.req?.[0]?.data : 0
+    }
+  })
+
   return (
     <>
       <Helmet title={'Create Claim'} />
-      <ClaimCreateForm onCreate={onCreate} />
+      {
+        claimantsCount ? (
+          <ClaimCreateForm onCreate={onCreate} />
+        )
+        : (
+          <Result
+            status={"403"}
+            title={"Please create a claimant."}
+            subTitle="You cannot create a claim without a claimant."
+            extra={
+              <Link to="/claimants/create">
+                <Button type="primary">Create claimant</Button>
+              </Link>
+            }
+          />
+        )
+      }
     </>
   );
 }

From 1f0db10dacc4a758b6bca26cdcfbf608b9621f80 Mon Sep 17 00:00:00 2001
From: surajmn1 <suraj.natraj@factly.in>
Date: Mon, 5 Sep 2022 11:34:45 +0530
Subject: [PATCH 33/38] Revert "remove selected option from select dropdowns"

This reverts commit bd85c84d929f616b69f4d65a63fc094e0e852a76.
---
 studio/src/components/Filter/index.js   | 31 -------------
 studio/src/components/Selector/index.js | 28 +++++-------
 studio/src/pages/pages/index.js         | 60 +++++++++++++------------
 3 files changed, 42 insertions(+), 77 deletions(-)
 delete mode 100644 studio/src/components/Filter/index.js

diff --git a/studio/src/components/Filter/index.js b/studio/src/components/Filter/index.js
deleted file mode 100644
index b8fe9b371..000000000
--- a/studio/src/components/Filter/index.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import React, { useState } from 'react';
-import { Select, Form } from 'antd';
-const { Option } = Select;
-
-const Filter = ({ mode, defaultValue, optionsMap, placeholder, name, label, form }) => {
-  const [selectedItems, setSelectedItems] = useState(optionsMap[defaultValue]);
-  const filteredOptions = Object.keys(optionsMap).filter((o) => !selectedItems.includes(o));
-  const selectedOptions = optionsMap[selectedItems];
-
-  return (
-    <Form.Item label={label} name={name}>
-      <Select
-        placeholder={placeholder}
-        onChange={(value) => {
-          form.setFieldsValue({ [name]: optionsMap[value] });
-          setSelectedItems(value);
-        }}
-      >
-        {filteredOptions.map((item, index) => {
-          return (
-            <Select.Option key={item} value={item}>
-              {optionsMap[item]}
-            </Select.Option>
-          );
-        })}
-      </Select>
-    </Form.Item>
-  );
-};
-
-export default Filter;
diff --git a/studio/src/components/Selector/index.js b/studio/src/components/Selector/index.js
index 456f9a006..d43e6d292 100644
--- a/studio/src/components/Selector/index.js
+++ b/studio/src/components/Selector/index.js
@@ -18,7 +18,6 @@ function Selector({
   const entity = action.toLowerCase();
   const selectorType = require(`../../actions/${entity}`);
   const [entityCreatedFlag, setEntityCreatedFlag] = React.useState(false);
-  const [selectedOptions, setSelectedOptions] = React.useState([]);
   const [query, setQuery] = React.useState({
     page: 1,
     limit: 5,
@@ -118,14 +117,11 @@ function Selector({
       searchValue={searchValue}
       value={value}
       placeholder={placeholder}
-      onChange={(values) => {
-        setSelectedOptions(values);
-        onChange(values);
-      }}
+      onChange={(values) => onChange(values)}
       onSearch={(value) => onSearch(value)}
-      filterOption={(input, option) => {
-        return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
-      }}
+      filterOption={(input, option) =>
+        option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      }
       onPopupScroll={(e) => {
         if (
           e.target.scrollTop + e.target.offsetHeight === e.target.scrollHeight ||
@@ -167,16 +163,12 @@ function Selector({
       autoClearSearchValue={true}
     >
       {details
-        .filter((item) => {
-          return ![...invalidOptions].includes(item.id);
-        })
-        .map((item, _, array) => {
-          return (
-            <Select.Option value={item.id} key={entity + item.id}>
-              {item[display] ? item[display] : item['email'] ? item['email'] : null}
-            </Select.Option>
-          );
-        })}
+        .filter((item) => !invalidOptions.includes(item.id))
+        .map((item) => (
+          <Select.Option value={item.id} key={entity + item.id}>
+            {item[display] ? item[display] : item['email'] ? item['email'] : null}
+          </Select.Option>
+        ))}
     </Select>
   );
 }
diff --git a/studio/src/pages/pages/index.js b/studio/src/pages/pages/index.js
index 9a1ae709b..210c15302 100644
--- a/studio/src/pages/pages/index.js
+++ b/studio/src/pages/pages/index.js
@@ -1,5 +1,5 @@
 /* eslint-disable react-hooks/exhaustive-deps */
-import React, { useEffect, useState } from 'react';
+import React, { useEffect } from 'react';
 import { Space, Button, Select, Form, Col, Row, Input } from 'antd';
 import { Link, useLocation, useHistory } from 'react-router-dom';
 import PageList from './components/PageList';
@@ -14,7 +14,6 @@ import { UpOutlined, DownOutlined } from '@ant-design/icons';
 import Loader from '../../components/Loader';
 import { Helmet } from 'react-helmet';
 import Filters from '../../utils/filters';
-import Filter from '../../components/Filter';
 
 function Pages({ formats }) {
   const spaces = useSelector(({ spaces }) => spaces);
@@ -57,11 +56,11 @@ function Pages({ formats }) {
   const keys = ['page', 'limit', 'q', 'sort', 'tag', 'category', 'author', 'status'];
   const params = getUrlParams(query, keys);
 
-  // useEffect(() => {
-  //   if (form) {
-  //     form.setFieldsValue(new Filters(params));
-  //   }
-  // }, [search, formats.loading]);
+  useEffect(() => {
+    if (form) {
+      form.setFieldsValue(new Filters(params));
+    }
+  }, [search, formats.loading]);
 
   useEffect(() => {
     fetchPages();
@@ -151,29 +150,34 @@ function Pages({ formats }) {
             </Form.Item>
           </Col>
           <Col key={4}>
-            <Filter
-              placeholder={'Status'}
-              defaultValue="all"
-              label={'Status'}
-              form={form}
-              name={'status'}
-              optionsMap={{
-                all: 'All',
-                draft: 'Draft',
-                publish: 'Publish',
-                ready: 'Ready to Publish',
-              }}
-            />
+            <Form.Item label="Status" name="status">
+              <Select placeholder="Status" defaultValue="all">
+                <Option value="all" key={'all'}>
+                  All
+                </Option>
+                <Option value="draft" key={'draft'}>
+                  Draft
+                </Option>
+                <Option value="publish" key={'publish'}>
+                  Publish
+                </Option>
+                <Option value="ready" key={'ready'}>
+                  Ready to Publish
+                </Option>
+              </Select>
+            </Form.Item>
           </Col>
           <Col>
-            <Filter
-              placeholder={'Sort by'}
-              defaultValue="desc"
-              label={'Sort By'}
-              name={'sort'}
-              form={form}
-              optionsMap={{ desc: 'Latest', asc: 'Old' }}
-            />
+            <Form.Item label="Sort By" name="sort">
+              <Select placeholder="Sort By" defaultValue="desc" style={{ width: '100%' }}>
+                <Option value="desc" key={'desc'}>
+                  Latest
+                </Option>
+                <Option value="asc" key={'asc'}>
+                  Old
+                </Option>
+              </Select>
+            </Form.Item>
           </Col>
           <Button
             type="link"

From dd4a47cc2a67fdee28d77cf727e1fb36da34e36a Mon Sep 17 00:00:00 2001
From: surajmn1 <suraj.natraj@factly.in>
Date: Mon, 5 Sep 2022 12:34:33 +0530
Subject: [PATCH 34/38] fix list authors in particular space instead of org

---
 server/service/core/action/author/list.go | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/server/service/core/action/author/list.go b/server/service/core/action/author/list.go
index 5daf736eb..f25295f6f 100644
--- a/server/service/core/action/author/list.go
+++ b/server/service/core/action/author/list.go
@@ -53,10 +53,24 @@ func list(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	applicationID, err := util.GetApplicationID(uint(uID), "dega")
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
+		return
+	}
+
+	sID, err := middlewarex.GetSpace(r.Context())
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.Unauthorized()))
+		return
+	}
+
 	result := paging{}
 	result.Nodes = make([]model.Author, 0)
 
-	url := fmt.Sprint(viper.GetString("kavach_url"), "/organisations/", oID, "/users")
+	url := fmt.Sprint(viper.GetString("kavach_url"), "/organisations/", oID, "/applications/", applicationID, "/spaces/", sID, "/users")
 
 	req, err := http.NewRequest("GET", url, nil)
 	if err != nil {

From 0f4ba7a6798c911c39143956b011d73cd9517355 Mon Sep 17 00:00:00 2001
From: Mourya Prasanth <mouryaprasanthp@gmail.com>
Date: Mon, 5 Sep 2022 18:37:49 +0530
Subject: [PATCH 35/38] fix: update uppyconfig for scooter editor

---
 .../components/FormItems/DescriptionInput.js  | 68 +++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/studio/src/components/FormItems/DescriptionInput.js b/studio/src/components/FormItems/DescriptionInput.js
index 16a161856..730f08ceb 100644
--- a/studio/src/components/FormItems/DescriptionInput.js
+++ b/studio/src/components/FormItems/DescriptionInput.js
@@ -4,6 +4,7 @@ import axios from 'axios';
 // import Editor from '../Editor';
 import { Editor } from '@factly/scooter';
 import { MEDIA_API } from '../../constants/media';
+import { useSelector } from 'react-redux';
 
 const DescriptionInput = ({
   name = 'description',
@@ -14,6 +15,10 @@ const DescriptionInput = ({
   formItemProps,
   initialValue,
 }) => {
+  const space_slug = useSelector((state) => {
+    return state.spaces.details[state.spaces.selected]?.slug;
+  });
+
   inputProps = { ...inputProps, onChange };
   formItemProps = noLabel ? formItemProps : { ...formItemProps, label };
 
@@ -36,6 +41,69 @@ const DescriptionInput = ({
             })
             .then((res) => res.data)
         }
+        onFileAdded={(file) => {
+          const data = file.data;
+          const url = data.thumbnail ? data.thumbnail : URL.createObjectURL(data);
+          const image = new Image();
+          image.src = url;
+          image.onload = () => {
+            // uppy.setFileMeta(file.id, { width: image.width, height: image.height });
+            URL.revokeObjectURL(url);
+          };
+          image.onerror = () => {
+            URL.revokeObjectURL(url);
+          };
+        }}
+        onUploadComplete={(result) => {
+          const successful = result.successful[0];
+          const { meta } = successful;
+          const upload = {};
+          upload['alt_text'] = meta.caption;
+          upload['caption'] = meta.caption;
+          upload['description'] = meta.caption;
+          upload['dimensions'] = `${meta.width}x${meta.height}`;
+          upload['file_size'] = successful.size;
+          upload['name'] = successful.fileName;
+          upload['slug'] = successful.response.body.key;
+          upload['title'] = meta.caption ? meta.caption : ' ';
+          upload['type'] = successful.meta.type;
+          upload['url'] = {};
+          upload['url']['raw'] = successful.uploadURL;
+
+          axios.post(MEDIA_API, [upload]).catch((error) => {
+            console.error(error);
+          });
+        }}
+        uploadConfig={{
+          restrictions: {
+            maxFileSize: 5242880,
+            allowedFileTypes: ['.jpg', '.jpeg', '.png', '.gif'],
+          },
+          onBeforeUpload: (files) => {
+            const updatedFiles = {};
+
+            Object.keys(files).forEach((fileID) => {
+              updatedFiles[fileID] = {
+                ...files[fileID],
+                fileName: files[fileID].meta.name,
+                meta: {
+                  ...files[fileID].meta,
+                  name:
+                    space_slug +
+                    '/' +
+                    new Date().getFullYear() +
+                    '/' +
+                    new Date().getMonth() +
+                    '/' +
+                    Date.now().toString() +
+                    '_' +
+                    files[fileID].meta.name,
+                },
+              };
+            });
+            return updatedFiles;
+          },
+        }}
       />
     </Form.Item>
   );

From b39d07c89ccc2cabe338c4e7635ed09e0f267a16 Mon Sep 17 00:00:00 2001
From: vsumit89 <sumit.vishwakarma@factly.in>
Date: Tue, 6 Sep 2022 16:40:35 +0530
Subject: [PATCH 36/38] fixed dega-api issue for getting org ID

---
 api/graph/validator/organisation.go | 50 +++++++++++++++++++++++++----
 1 file changed, 43 insertions(+), 7 deletions(-)

diff --git a/api/graph/validator/organisation.go b/api/graph/validator/organisation.go
index f2263173f..295435568 100644
--- a/api/graph/validator/organisation.go
+++ b/api/graph/validator/organisation.go
@@ -2,11 +2,16 @@ package validator
 
 import (
 	"context"
+	"encoding/json"
 	"errors"
+	"fmt"
 	"net/http"
 
-	"github.com/factly/dega-api/config"
-	"github.com/factly/dega-api/graph/models"
+	"github.com/factly/dega-api/util/httpx"
+	"github.com/factly/x/errorx"
+	"github.com/factly/x/loggerx"
+	"github.com/factly/x/middlewarex"
+	"github.com/spf13/viper"
 )
 
 type ctxKeyOrganisationID int
@@ -25,16 +30,21 @@ func CheckOrganisation() func(http.Handler) http.Handler {
 				return
 			}
 
-			space := &models.Space{}
-			space.ID = spaceID
+			userID, err := middlewarex.GetUser(r.Context())
+			if err != nil {
+				loggerx.Error(err)
+				errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+				return
+			}
 
-			err = config.DB.First(&space).Error
+			organisationID, err := GetOrganisationIDfromSpaceID(uint(spaceID), uint(userID))
 			if err != nil {
-				w.WriteHeader(http.StatusUnauthorized)
+				loggerx.Error(err)
+				errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
 				return
 			}
 
-			ctx = context.WithValue(ctx, OrgIDKey, space.OrganisationID)
+			ctx = context.WithValue(ctx, OrgIDKey, organisationID)
 			next.ServeHTTP(w, r.WithContext(ctx))
 		})
 	}
@@ -51,3 +61,29 @@ func GetOrganisation(ctx context.Context) (int, error) {
 	}
 	return 0, errors.New("something went wrong")
 }
+
+func GetOrganisationIDfromSpaceID(spaceID, userID uint) (int, error) {
+	//** need to make change in x-package if space id is given organisation should be returned
+	req, err := http.NewRequest(http.MethodGet, viper.GetString("kavach_url")+fmt.Sprintf("/util/space/%d/getOrganisation", spaceID), nil)
+	if err != nil {
+		return 0, err
+	}
+	req.Header.Set("X-User", fmt.Sprintf("%d", userID))
+	client := httpx.CustomHttpClient()
+	response, err := client.Do(req)
+	if err != nil {
+		return 0, err
+	}
+	defer response.Body.Close()
+	responseBody := map[string]interface{}{}
+	err = json.NewDecoder(response.Body).Decode(&responseBody)
+	if err != nil {
+		return 0, err
+	}
+
+	if response.StatusCode != 200 {
+		return 0, errors.New("internal server error on kavach while getting organisation id from space id")
+	}
+	organisationID := int(responseBody["organisation_id"].(float64))
+	return organisationID, nil
+}

From e953619f2b73bb1af589adb2256077cc16612cb3 Mon Sep 17 00:00:00 2001
From: vsumit89 <sumit.vishwakarma@factly.in>
Date: Wed, 7 Sep 2022 00:07:17 +0530
Subject: [PATCH 37/38] added space token validation for dega-api

---
 api/go.mod                          |  2 +-
 api/go.sum                          |  4 +++
 api/graph/resolvers/post.go         |  3 +-
 api/graph/validator/organisation.go | 15 ++++-----
 api/graph/validator/space.go        | 47 ++++++++++++++++++++++++++---
 api/server.go                       |  3 +-
 6 files changed, 57 insertions(+), 17 deletions(-)

diff --git a/api/go.mod b/api/go.mod
index d9a30bc12..8bda9eaff 100644
--- a/api/go.mod
+++ b/api/go.mod
@@ -5,7 +5,7 @@ go 1.18
 require (
 	github.com/99designs/gqlgen v0.17.12
 	github.com/DATA-DOG/go-sqlmock v1.5.0
-	github.com/factly/x v0.0.77
+	github.com/factly/x v0.0.84
 	github.com/gavv/httpexpect/v2 v2.2.0
 	github.com/go-chi/chi v4.1.2+incompatible
 	github.com/go-chi/cors v1.1.1
diff --git a/api/go.sum b/api/go.sum
index 4a12d26a8..45b6eb724 100644
--- a/api/go.sum
+++ b/api/go.sum
@@ -136,6 +136,10 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7
 github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0=
 github.com/factly/x v0.0.77 h1:HQXTOLTpPWZhNhCC3TwLQk9nfKlJqzSYjjrCQ20p57o=
 github.com/factly/x v0.0.77/go.mod h1:ZB3evopCd4ev4uZNCxldkh0AgYsxvEabiefrM8RJHBc=
+github.com/factly/x v0.0.83 h1:p+/p/QhxWN2DYRuxeRYk5KV27dH+JFjXwKXQAPGIedk=
+github.com/factly/x v0.0.83/go.mod h1:ZB3evopCd4ev4uZNCxldkh0AgYsxvEabiefrM8RJHBc=
+github.com/factly/x v0.0.84 h1:tMVbLGAoF6gqZqFNiPY5zAybp7N2XwOolaukFBEYgxg=
+github.com/factly/x v0.0.84/go.mod h1:ZB3evopCd4ev4uZNCxldkh0AgYsxvEabiefrM8RJHBc=
 github.com/fasthttp/websocket v1.4.2 h1:AU/zSiIIAuJjBMf5o+vO0syGOnEfvZRu40xIhW/3RuM=
 github.com/fasthttp/websocket v1.4.2/go.mod h1:smsv/h4PBEBaU0XDTY5UwJTpZv69fQ0FfcLJr21mA6Y=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
diff --git a/api/graph/resolvers/post.go b/api/graph/resolvers/post.go
index 67f07ddd4..356503bb0 100644
--- a/api/graph/resolvers/post.go
+++ b/api/graph/resolvers/post.go
@@ -212,11 +212,12 @@ func (r *queryResolver) Posts(ctx context.Context, spaces []int, formats *models
 	if err != nil {
 		return nil, err
 	}
+
 	oID, err := validator.GetOrganisation(ctx)
 	if err != nil {
 		return nil, err
 	}
-
+	
 	columns := []string{"created_at", "updated_at", "name", "slug"}
 	pageSortBy := "created_at"
 	pageSortOrder := "desc"
diff --git a/api/graph/validator/organisation.go b/api/graph/validator/organisation.go
index 295435568..b1407770f 100644
--- a/api/graph/validator/organisation.go
+++ b/api/graph/validator/organisation.go
@@ -10,7 +10,6 @@ import (
 	"github.com/factly/dega-api/util/httpx"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
-	"github.com/factly/x/middlewarex"
 	"github.com/spf13/viper"
 )
 
@@ -30,14 +29,13 @@ func CheckOrganisation() func(http.Handler) http.Handler {
 				return
 			}
 
-			userID, err := middlewarex.GetUser(r.Context())
+			token, err := GetSpaceToken(ctx)
 			if err != nil {
-				loggerx.Error(err)
-				errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
+				w.WriteHeader(http.StatusUnauthorized)
 				return
 			}
 
-			organisationID, err := GetOrganisationIDfromSpaceID(uint(spaceID), uint(userID))
+			organisationID, err := GetOrganisationIDfromSpaceID(uint(spaceID), token)
 			if err != nil {
 				loggerx.Error(err)
 				errorx.Render(w, errorx.Parser(errorx.InternalServerError()))
@@ -62,13 +60,12 @@ func GetOrganisation(ctx context.Context) (int, error) {
 	return 0, errors.New("something went wrong")
 }
 
-func GetOrganisationIDfromSpaceID(spaceID, userID uint) (int, error) {
-	//** need to make change in x-package if space id is given organisation should be returned
-	req, err := http.NewRequest(http.MethodGet, viper.GetString("kavach_url")+fmt.Sprintf("/util/space/%d/getOrganisation", spaceID), nil)
+func GetOrganisationIDfromSpaceID(spaceID uint, token string) (int, error) {
+	req, err := http.NewRequest(http.MethodGet, viper.GetString("kavach_url")+fmt.Sprintf("/util/space/%d/getOrganisationUsingToken", spaceID), nil)
 	if err != nil {
 		return 0, err
 	}
-	req.Header.Set("X-User", fmt.Sprintf("%d", userID))
+	req.Header.Set("X-Space-Token", token)
 	client := httpx.CustomHttpClient()
 	response, err := client.Do(req)
 	if err != nil {
diff --git a/api/graph/validator/space.go b/api/graph/validator/space.go
index 5568318e3..d30818795 100644
--- a/api/graph/validator/space.go
+++ b/api/graph/validator/space.go
@@ -3,14 +3,25 @@ package validator
 import (
 	"context"
 	"errors"
+	"fmt"
+
 	"net/http"
 	"strconv"
+
+	"github.com/factly/x/requestx"
+	"github.com/spf13/viper"
 )
 
 type ctxKeySpaceID int
+type ctxKeyToken string
 
 // SpaceIDKey is the key that holds the unique space ID in a request context.
 const SpaceIDKey ctxKeySpaceID = 0
+const TokenIDKey ctxKeyToken = "spaceToken"
+
+type ValidationBody struct {
+	Token string `json:"token" validate:"required"`
+}
 
 // CheckSpace - to check Space in header
 func CheckSpace() func(http.Handler) http.Handler {
@@ -22,14 +33,31 @@ func CheckSpace() func(http.Handler) http.Handler {
 				return
 			}
 
-			sid, err := strconv.Atoi(space)
-			if err != nil || sid == 0 {
+			sID, err := strconv.Atoi(space)
+			if err != nil || sID == 0 {
 				w.WriteHeader(http.StatusUnauthorized)
 				return
 			}
-			ctx := r.Context()
 
-			ctx = context.WithValue(ctx, SpaceIDKey, sid)
+			authHeader := r.Header.Get("X-Dega-API-Key")
+			if authHeader == "" {
+				w.WriteHeader(http.StatusUnauthorized)
+				return
+			}
+
+			tokenBody := ValidationBody{
+				Token: authHeader,
+			}
+
+			res, err := requestx.Request("POST", viper.GetString("kavach_url")+"/spaces/"+fmt.Sprintf("%d", sID)+"/validateToken", tokenBody, nil)
+			if err != nil || res.StatusCode != http.StatusOK {
+				w.WriteHeader(http.StatusUnauthorized)
+				return
+			}
+
+			ctx := r.Context()
+			ctx = context.WithValue(ctx, SpaceIDKey, sID)
+			ctx = context.WithValue(ctx, TokenIDKey, authHeader)
 			next.ServeHTTP(w, r.WithContext(ctx))
 		})
 	}
@@ -46,3 +74,14 @@ func GetSpace(ctx context.Context) (uint, error) {
 	}
 	return 0, errors.New("something went wrong")
 }
+
+func GetSpaceToken(ctx context.Context) (string, error) {
+	if ctx == nil {
+		return "", errors.New("context not found")
+	}
+	token := ctx.Value(TokenIDKey)
+	if token != nil {
+		return token.(string), nil
+	}
+	return "", errors.New("something went wrong")
+}
diff --git a/api/server.go b/api/server.go
index 012492f8a..77918e143 100644
--- a/api/server.go
+++ b/api/server.go
@@ -8,7 +8,6 @@ import (
 	"github.com/factly/x/healthx"
 	"github.com/factly/x/loggerx"
 	"github.com/factly/x/meilisearchx"
-	"github.com/factly/x/middlewarex"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/spf13/viper"
 
@@ -79,7 +78,7 @@ func main() {
 
 	srv := handler.NewDefaultServer(generated.NewExecutableSchema(generated.Config{Resolvers: &resolvers.Resolver{}}))
 
-	r := router.With(validator.CheckSpace(), validator.CheckOrganisation(), middlewarex.ValidateAPIToken("X-Dega-API-Key", "dega", validator.GetOrganisation))
+	r := router.With(validator.CheckSpace(), validator.CheckOrganisation())
 
 	if cache.IsEnabled() {
 		r = r.With(cache.CachingMiddleware(), cache.RespMiddleware)

From c3d7069f9370dfd3f5ce37588a5fc971af0b788a Mon Sep 17 00:00:00 2001
From: surajmn1 <suraj.natraj@factly.in>
Date: Wed, 7 Sep 2022 12:11:19 +0530
Subject: [PATCH 38/38] added a check to limit api requests

---
 studio/src/components/Selector/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/studio/src/components/Selector/index.js b/studio/src/components/Selector/index.js
index d43e6d292..e41dd20a2 100644
--- a/studio/src/components/Selector/index.js
+++ b/studio/src/components/Selector/index.js
@@ -127,7 +127,7 @@ function Selector({
           e.target.scrollTop + e.target.offsetHeight === e.target.scrollHeight ||
           e.target.scrollTop + e.target.offsetHeight >= e.target.scrollHeight - 16
         ) {
-          if (details.length < total) {
+          if (details.length < total &&  Math.ceil(total/query.limit) >= query.page+1 ) {
             setQuery({ ...query, page: query.page + 1 });
           }
         }