Add #201 Ability to configure default organisation and types on initi… #203
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
georgepadayatti
requested changes
Oct 6, 2023
georgepadayatti
requested changes
Oct 6, 2023
| ) | ||
|
|
||
| // AddOrganization Adds an organization | ||
| func AddOrganization(orgReq config.Organization, userId string) (org.Organization, error) { |
There was a problem hiding this comment.
Move this function to organizations.go file under org package.
src/middleware/middleware.go
Outdated
| common.HandleError(w, http.StatusBadRequest, m, err) | ||
| return | ||
| } | ||
| if count > 1 { | ||
| _, err := org.DeleteAllOrganizations() |
There was a problem hiding this comment.
Move this logic to main.go ?
|
|
||
| // checking if the string contained whitespace only | ||
| if strings.TrimSpace(orgReq.Name) == "" { | ||
| log.Printf("Failed to add organization: Missing mandatory param - Name") |
There was a problem hiding this comment.
Application should exit if organisation configuration is invalid.
| @@ -138,7 +138,7 @@ func GetOrganizationByID(w http.ResponseWriter, r *http.Request) { | |||
| func GetOrganizationId() (string, error) { | |||
There was a problem hiding this comment.
Move this to org package
| @@ -138,7 +138,7 @@ func GetOrganizationByID(w http.ResponseWriter, r *http.Request) { | |||
| func GetOrganizationId() (string, error) { | |||
| org, err := org.GetOrganization() | |||
There was a problem hiding this comment.
Rename this to GetFirstOrganization
src/org/organizations.go
Outdated
| @@ -660,3 +660,25 @@ func GetName(organizationID string) (string, error) { | |||
|
|
|||
| return result.Name, err | |||
| } | |||
|
|
|||
| // GetOrganizationCount Get organization count | |||
| func GetOrganizationCount() (int64, error) { | |||
There was a problem hiding this comment.
Rename to GetOrganizationsCount
| @@ -138,7 +138,7 @@ func GetOrganizationByID(w http.ResponseWriter, r *http.Request) { | |||
| func GetOrganizationId() (string, error) { | |||
There was a problem hiding this comment.
Rename to GetFirstOrganisation
albinpa
force-pushed
the
feature/201-configure-default-organization
branch
from
467aed5 to
c04ed48
Compare
georgepadayatti
requested changes
Oct 10, 2023
src/config/config.go
Outdated
| } | ||
|
|
||
| type OrgType struct { | ||
| Type string `valid:"required"` |
src/org/organizations.go
Outdated
| return orgResp, err | ||
| } | ||
|
|
||
| func IsOrganizationUpdateRequired(org Organization, orgReq config.Organization, typeName string) bool { |
There was a problem hiding this comment.
@albinpa We don't need this anymore ?
src/org/organizations.go
Outdated
| } | ||
|
|
||
| // UpdateOrganization Updates an organization | ||
| func UpdateOrganization(org Organization, orgReq config.Organization, orgType orgtype.OrgType) (Organization, error) { |
There was a problem hiding this comment.
@albinpa We don't need this anymore ?
src/orgtype/orgType.go
Outdated
| } | ||
|
|
||
| // UpdateOrganizationType Updates an organization type | ||
| func UpdateOrganizationType(orgType OrgType, typeReq config.OrgType) (OrgType, error) { |
…on configuration and create/update
albinpa
force-pushed
the
feature/201-configure-default-organization
branch
from
c04ed48 to
f0a352a
Compare
georgepadayatti
approved these changes
Oct 11, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…al start of the application if not existing