Merge pull request #457 from UffizziCloud/feature/275_project_created…

…_from_cli_not_visible_to_other_users [275] add all members to project created from cli
UffizziCloud · Jul 31, 2023 · 4e32fd6 · 4e32fd6
2 parents fb6a4ca + b79d6ad
commit 4e32fd6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -7,6 +7,9 @@ on:
       - main
   pull_request:
     types: [opened,synchronize,reopened]
+concurrency:
+  group: ${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   lint:
@@ -49,7 +52,7 @@ jobs:
         with:
           images: uffizzi/app
           tags: |
-            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }}
+            type=raw,value=latest,enable=${{ github.ref_name == 'main' }}
             type=ref,event=branch,enable=${{ github.ref_name == 'qa' || github.ref_name == 'develop' }}
             type=ref,event=pr
       - name: Build and Push Image to Docker Hub

diff --git a/core/app/services/uffizzi_core/project_service.rb b/core/app/services/uffizzi_core/project_service.rb
@@ -37,8 +37,8 @@ def update_compose_secret_errors(project, secret)
     end
 
     def add_users_to_project!(project, account)
-      user_projects = account.memberships.where(role: UffizziCore::Membership.role.admin).map do |membership|
-        { project: project, user: membership.user, role: UffizziCore::UserProject.role.admin }
+      user_projects = account.memberships.map do |membership|
+        { project: project, user: membership.user, role: membership.role }
       end
 
       UffizziCore::UserProject.create!(user_projects)

diff --git a/core/test/controllers/uffizzi_core/api/cli/v1/accounts/projects_controller_test.rb b/core/test/controllers/uffizzi_core/api/cli/v1/accounts/projects_controller_test.rb
@@ -4,13 +4,13 @@
 
 class UffizziCore::Api::Cli::V1::Accounts::ProjectsControllerTest < ActionController::TestCase
   setup do
-    @user = create(:user, :with_personal_account)
-    @account = @user.personal_account
-    sign_in @user
+    @admin = create(:user, :with_organizational_account)
+    @account = @admin.accounts.organizational.first
+    sign_in(@admin)
   end
 
   test '#index' do
-    create(:project, :with_members, account: @account, members: [@user])
+    create(:project, :with_members, account: @account, members: [@admin])
 
     get :index, params: { account_id: @account.id }, format: :json
 
@@ -21,10 +21,11 @@ class UffizziCore::Api::Cli::V1::Accounts::ProjectsControllerTest < ActionContro
 
   test '#create' do
     attributes = attributes_for(:project)
+    create(:user, :developer_in_organization, organization: @account)
 
     differences = {
       -> { UffizziCore::Project.count } => 1,
-      -> { UffizziCore::UserProject.count } => 1,
+      -> { UffizziCore::UserProject.count } => 2,
     }
 
     assert_difference differences do