Merge pull request #415 from factly/fix/go-lint

Update docker-compose.yml and server files
factly · Jan 10, 2024 · c630ff8 · c630ff8
2 parents cf18cc1 + 2476c40
commit c630ff8
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 17 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -240,6 +240,7 @@ services:
       - REACT_APP_PUBLIC_PATH_DEVELOPMENT=/.factly/kavach/web/
       - REACT_APP_KAVACH_TITLE=Kavach
       - REACT_APP_COMPANION_URL=http://127.0.0.1:3020
+
       - REACT_APP_API_URL=http://127.0.0.1:4455/.factly/kavach/server
       - REACT_APP_KRATOS_PUBLIC_URL=http://127.0.0.1:4455/.ory/kratos/public
       - REACT_APP_ENABLE_MULTITENANCY=true
@@ -250,7 +251,10 @@ services:
       - type: bind
         source: ./web
         target: /app
-      - /app/node_modules
+      - type: bind
+        source: ./web/node_modules
+        target: /app/node_modules
+      # - /app/node_modules
     restart: unless-stopped
     networks:
       - kavach

diff --git a/server/action/admin/organisation/create.go b/server/action/admin/organisation/create.go
@@ -118,9 +118,11 @@ func create(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	result := model.Organisation{}
+	var result model.Organisation
 
-	result = *organisation
+	if organisation != nil {
+		result = *organisation
+	}
 
 	result.OrganisationUsers = []model.OrganisationUser{permission}
 

diff --git a/server/action/admin/organisation/update.go b/server/action/admin/organisation/update.go
@@ -94,8 +94,11 @@ func update(w http.ResponseWriter, r *http.Request) {
 		errorx.Render(w, errorx.Parser(errorx.RecordNotFound()))
 		return
 	}
-	result := model.Organisation{}
-	result = *organisation
+	var result model.Organisation
+	if organisation != nil {
+		result = *organisation
+	}
+
 	result.OrganisationUsers = []model.OrganisationUser{*permission}
 
 	tx.Commit()

diff --git a/server/action/organisation/application/addDefault.go b/server/action/organisation/application/addDefault.go
@@ -99,8 +99,8 @@ func addDefault(w http.ResponseWriter, r *http.Request) {
 		errorx.Render(w, errorx.Parser(errorx.DBError()))
 		return
 	}
-	newOrganisations := make([]model.Organisation, 0)
-	newOrganisations = append(app.Organisations, *org)
+
+	newOrganisations := append(app.Organisations, *org)
 	err = tx.Model(&app).Association("Organisations").Replace(&newOrganisations)
 	if err != nil {
 		tx.Rollback()

diff --git a/server/action/organisation/application/roles/user/create.go b/server/action/organisation/application/roles/user/create.go
@@ -145,8 +145,7 @@ func create(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	users := make([]model.User, 0)
-	users = append(appRole.Users, user)
+	users := append(appRole.Users, user)
 	appRole.Users = users
 	if err = model.DB.Model(&appRole).Association("Users").Replace(&users); err != nil {
 		tx.Rollback()

diff --git a/server/action/organisation/application/space/roles/user/create.go b/server/action/organisation/application/space/roles/user/create.go
@@ -154,8 +154,8 @@ func create(w http.ResponseWriter, r *http.Request) {
 		errorx.Render(w, errorx.Parser(errorx.DBError()))
 		return
 	}
-	users := make([]model.User, 0)
-	users = append(spaceRole.Users, user)
+
+	users := append(spaceRole.Users, user)
 	spaceRole.Users = users
 	if err = tx.Model(&spaceRole).Association("Users").Replace(&users); err != nil {
 		tx.Rollback()

diff --git a/server/action/organisation/user/list.go b/server/action/organisation/user/list.go
@@ -56,7 +56,8 @@ func list(w http.ResponseWriter, r *http.Request) {
 		errorx.Render(w, errorx.Parser(errorx.RecordNotFound()))
 		return
 	}
-	userIDs := []string{}
+
+	var userIDs []string
 
 	if role == "owner" || role == "member" {
 		userIDs, err = keto.ListSubjectsByObjectID(namespace, role, fmt.Sprintf("org:%d", orgID))

diff --git a/server/action/user/checker.go b/server/action/user/checker.go
@@ -26,11 +26,6 @@ type matchContext struct {
 	URL                 *url.URL `json:"url"`
 }
 
-type templateContent struct {
-	From             map[string]interface{} `json:"from"`
-	Personalizations []interface{}          `json:"personalizations"`
-	TemplateID       string                 `json:"template_id"`
-}
 
 // create organisation
 func checker(w http.ResponseWriter, r *http.Request) {