Revert "try to fix conflicts"

This reverts commit f05eb40.

Author: Zettat123

models/fixtures/action_run.yml

@@ -9,7 +9,6 @@
   ref: "refs/heads/master"
   commit_sha: "c2d72f548424103f01ee1dc02889c1e2bff816b0"
   event: "push"
-  trigger_event: "push"
   is_fork_pull_request: 0
   status: 1
   started: 1683636528
@@ -29,7 +28,6 @@
   ref: "refs/heads/master"
   commit_sha: "c2d72f548424103f01ee1dc02889c1e2bff816b0"
   event: "push"
-  trigger_event: "push"
   is_fork_pull_request: 0
   status: 1
   started: 1683636528
@@ -40,107 +38,6 @@
   approved_by: 0
 -
   id: 793
-  title: "job output"
-  repo_id: 4
-  owner_id: 1
-  workflow_id: "test.yaml"
-  index: 189
-  trigger_user_id: 1
-  ref: "refs/heads/master"
-  commit_sha: "c2d72f548424103f01ee1dc02889c1e2bff816b0"
-  event: "push"
-  trigger_event: "push"
-  is_fork_pull_request: 0
-  status: 6 # running
-  started: 1683636528
-  stopped: 1683636626
-  created: 1683636108
-  updated: 1683636626
-  need_approval: 0
-  approved_by: 0
--
-  id: 794
-  title: "job output"
-  repo_id: 4
-  owner_id: 1
-  workflow_id: "test.yaml"
-  index: 190
-  trigger_user_id: 1
-  ref: "refs/heads/test"
-  commit_sha: "c2d72f548424103f01ee1dc02889c1e2bff816b0"
-  event: "push"
-  trigger_event: "push"
-  is_fork_pull_request: 0
-  status: 1
-  started: 1683636528
-  stopped: 1683636626
-  created: 1683636108
-  updated: 1683636626
-  need_approval: 0
-  approved_by: 0
--
-  id: 802
-  title: "workflow run list"
-  repo_id: 5
-  owner_id: 3
-  workflow_id: "test.yaml"
-  index: 191
-  trigger_user_id: 1
-  ref: "refs/heads/test"
-  commit_sha: "c2d72f548424103f01ee1dc02889c1e2bff816b0"
-  event: "push"
-  trigger_event: "push"
-  is_fork_pull_request: 0
-  status: 1
-  started: 1683636528
-  stopped: 1683636626
-  created: 1683636108
-  updated: 1683636626
-  need_approval: 0
-  approved_by: 0
--
-  id: 803
-  title: "workflow run list for user"
-  repo_id: 2
-  owner_id: 0
-  workflow_id: "test.yaml"
-  index: 192
-  trigger_user_id: 1
-  ref: "refs/heads/test"
-  commit_sha: "c2d72f548424103f01ee1dc02889c1e2bff816b0"
-  event: "push"
-  trigger_event: "push"
-  is_fork_pull_request: 0
-  status: 1
-  started: 1683636528
-  stopped: 1683636626
-  created: 1683636108
-  updated: 1683636626
-  need_approval: 0
-  approved_by: 0
-
--
-  id: 795
-  title: "to be deleted (test)"
-  repo_id: 2
-  owner_id: 2
-  workflow_id: "test.yaml"
-  index: 191
-  trigger_user_id: 1
-  ref: "refs/heads/test"
-  commit_sha: "c2d72f548424103f01ee1dc02889c1e2bff816b0"
-  event: "push"
-  trigger_event: "push"
-  is_fork_pull_request: 0
-  status: 2
-  started: 1683636528
-  stopped: 1683636626
-  created: 1683636108
-  updated: 1683636626
-  need_approval: 0
-  approved_by: 0
--
-  id: 796
   title: "use a private action"
   repo_id: 6
   owner_id: 10

models/fixtures/action_run_job.yml

@@ -29,109 +29,6 @@
 -
   id: 194
   run_id: 793
-  repo_id: 4
-  owner_id: 1
-  commit_sha: c2d72f548424103f01ee1dc02889c1e2bff816b0
-  is_fork_pull_request: 0
-  name: job1 (1)
-  attempt: 1
-  job_id: job1
-  task_id: 49
-  status: 1
-  started: 1683636528
-  stopped: 1683636626
--
-  id: 195
-  run_id: 793
-  repo_id: 4
-  owner_id: 1
-  commit_sha: c2d72f548424103f01ee1dc02889c1e2bff816b0
-  is_fork_pull_request: 0
-  name: job1 (2)
-  attempt: 1
-  job_id: job1
-  task_id: 50
-  status: 1
-  started: 1683636528
-  stopped: 1683636626
--
-  id: 196
-  run_id: 793
-  repo_id: 4
-  owner_id: 1
-  commit_sha: c2d72f548424103f01ee1dc02889c1e2bff816b0
-  is_fork_pull_request: 0
-  name: job2
-  attempt: 1
-  job_id: job2
-  needs: '["job1"]'
-  task_id: 51
-  status: 5
-  started: 1683636528
-  stopped: 1683636626
-
--
-  id: 198
-  run_id: 795
-  repo_id: 2
-  owner_id: 2
-  commit_sha: c2d72f548424103f01ee1dc02889c1e2bff816b0
-  is_fork_pull_request: 0
-  name: job_1
-  attempt: 1
-  job_id: job_1
-  task_id: 53
-  status: 1
-  started: 1683636528
-  stopped: 1683636626
-
--
-  id: 199
-  run_id: 795
-  repo_id: 2
-  owner_id: 2
-  commit_sha: c2d72f548424103f01ee1dc02889c1e2bff816b0
-  is_fork_pull_request: 0
-  name: job_2
-  attempt: 1
-  job_id: job_2
-  task_id: 54
-  status: 2
-  started: 1683636528
-  stopped: 1683636626
--
-  id: 203
-  run_id: 802
-  repo_id: 5
-  owner_id: 0
-  commit_sha: c2d72f548424103f01ee1dc02889c1e2bff816b0
-  is_fork_pull_request: 0
-  name: job2
-  attempt: 1
-  job_id: job2
-  needs: '["job1"]'
-  task_id: 51
-  status: 5
-  started: 1683636528
-  stopped: 1683636626
--
-  id: 204
-  run_id: 803
-  repo_id: 2
-  owner_id: 0
-  commit_sha: c2d72f548424103f01ee1dc02889c1e2bff816b0
-  is_fork_pull_request: 0
-  name: job2
-  attempt: 1
-  job_id: job2
-  needs: '["job1"]'
-  task_id: 51
-  status: 5
-  started: 1683636528
-  stopped: 1683636626
--
-  id: 205
-  run_id: 796
   repo_id: 6
   owner_id: 10
   commit_sha: 6e64b26de7ba966d01d90ecfaf5c7f14ef203e86

models/fixtures/action_task.yml

@@ -62,126 +62,6 @@
   job_id: 194
   attempt: 1
   runner_id: 1
-  status: 1 # success
-  started: 1683636528
-  stopped: 1683636626
-  repo_id: 4
-  owner_id: 1
-  commit_sha: c2d72f548424103f01ee1dc02889c1e2bff816b0
-  is_fork_pull_request: 0
-  token_hash: b8d3962425466b6709b9ac51446f93260c54afe8e7b6d3686e34f991fb8a8953822b0deed86fe41a103f34bc48dbc4784220
-  token_salt: ffffffffff
-  token_last_eight: ffffffff
-  log_filename: artifact-test2/2f/47.log
-  log_in_storage: 1
-  log_length: 707
-  log_size: 90179
-  log_expired: 0
--
-  id: 50
-  job_id: 195
-  attempt: 1
-  runner_id: 1
-  status: 1 # success
-  started: 1683636528
-  stopped: 1683636626
-  repo_id: 4
-  owner_id: 1
-  commit_sha: c2d72f548424103f01ee1dc02889c1e2bff816b0
-  is_fork_pull_request: 0
-  token_hash: b8d3962425466b6709b9ac51446f93260c54afe8e7b6d3686e34f991fb8a8953822b0deed86fe41a103f34bc48dbc4784221
-  token_salt: ffffffffff
-  token_last_eight: ffffffff
-  log_filename: artifact-test2/2f/47.log
-  log_in_storage: 1
-  log_length: 707
-  log_size: 90179
-  log_expired: 0
--
-  id: 51
-  job_id: 196
-  attempt: 1
-  runner_id: 1
-  status: 6 # running
-  started: 1683636528
-  stopped: 1683636626
-  repo_id: 4
-  owner_id: 1
-  commit_sha: c2d72f548424103f01ee1dc02889c1e2bff816b0
-  is_fork_pull_request: 0
-  token_hash: b8d3962425466b6709b9ac51446f93260c54afe8e7b6d3686e34f991fb8a8953822b0deed86fe41a103f34bc48dbc4784222
-  token_salt: ffffffffff
-  token_last_eight: ffffffff
-  log_filename: artifact-test2/2f/47.log
-  log_in_storage: 1
-  log_length: 707
-  log_size: 90179
-  log_expired: 0
--
-  id: 52
-  job_id: 196
-  attempt: 1
-  runner_id: 34350
-  status: 6 # running
-  started: 1683636528
-  stopped: 1683636626
-  repo_id: 4
-  owner_id: 1
-  commit_sha: c2d72f548424103f01ee1dc02889c1e2bff816b0
-  is_fork_pull_request: 0
-  token_hash: f8d3962425466b6709b9ac51446f93260c54afe8e7b6d3686e34f991fb8a8953822b0deed86fe41a103f34bc48dbc4784222
-  token_salt: ffffffffff
-  token_last_eight: ffffffff
-  log_filename: artifact-test2/2f/47.log
-  log_in_storage: 1
-  log_length: 707
-  log_size: 90179
-  log_expired: 0
--
-  id: 53
-  job_id: 198
-  attempt: 1
-  runner_id: 1
-  status: 1
-  started: 1683636528
-  stopped: 1683636626
-  repo_id: 2
-  owner_id: 2
-  commit_sha: c2d72f548424103f01ee1dc02889c1e2bff816b0
-  is_fork_pull_request: 0
-  token_hash: b8d3962425466b6709b9ac51446f93260c54afe8e7b6d3686e34f991fb8a8953822b0deed86fe41a103f34bc48dbc4784223
-  token_salt: ffffffffff
-  token_last_eight: ffffffff
-  log_filename: artifact-test2/2f/47.log
-  log_in_storage: 1
-  log_length: 0
-  log_size: 0
-  log_expired: 0
--
-  id: 54
-  job_id: 199
-  attempt: 1
-  runner_id: 1
-  status: 2
-  started: 1683636528
-  stopped: 1683636626
-  repo_id: 2
-  owner_id: 2
-  commit_sha: c2d72f548424103f01ee1dc02889c1e2bff816b0
-  is_fork_pull_request: 0
-  token_hash: b8d3962425466b6709b9ac51446f93260c54afe8e7b6d3686e34f991fb8a8953822b0deed86fe41a103f34bc48dbc4784224
-  token_salt: ffffffffff
-  token_last_eight: ffffffff
-  log_filename: artifact-test2/2f/47.log
-  log_in_storage: 1
-  log_length: 0
-  log_size: 0
-  log_expired: 0
--
-  id: 55
-  job_id: 205
-  attempt: 1
-  runner_id: 1
   status: 6 # 6 is the status code for "running"
   started: 1683636528
   stopped: 1683636626

models/user/search.go

@@ -46,16 +46,16 @@ type SearchUserOptions struct {
 
 func (opts *SearchUserOptions) toSearchQueryBase(ctx context.Context) *xorm.Session {
 	var cond builder.Cond
-	cond = builder.Eq{"type": opts.Types}
+	cond = builder.In("type", opts.Types)
 	if opts.IncludeReserved {
-		switch {
-		case slices.Contains(opts.Types, UserTypeIndividual):
+		if slices.Contains(opts.Types, UserTypeIndividual) {
 			cond = cond.Or(builder.Eq{"type": UserTypeUserReserved}).Or(
 				builder.Eq{"type": UserTypeBot},
 			).Or(
 				builder.Eq{"type": UserTypeRemoteUser},
 			)
-		case slices.Contains(opts.Types, UserTypeOrganization):
+		}
+		if slices.Contains(opts.Types, UserTypeOrganization) {
 			cond = cond.Or(builder.Eq{"type": UserTypeOrganizationReserved})
 		}
 	}

models/user/user_test.go

@@ -75,7 +75,7 @@ func TestSearchUsers(t *testing.T) {
 	}
 
 	// test orgs
-	testOrgSuccess := func(opts user_model.SearchUserOptions, expectedOrgIDs []int64) {
+	testOrgSuccess := func(opts *user_model.SearchUserOptions, expectedOrgIDs []int64) {
 		opts.Types = []user_model.UserType{user_model.UserTypeOrganization}
 		testSuccess(opts, expectedOrgIDs)
 	}
@@ -99,7 +99,7 @@ func TestSearchUsers(t *testing.T) {
 		[]int64{})
 
 	// test users
-	testUserSuccess := func(opts user_model.SearchUserOptions, expectedUserIDs []int64) {
+	testUserSuccess := func(opts *user_model.SearchUserOptions, expectedUserIDs []int64) {
 		opts.Types = []user_model.UserType{user_model.UserTypeIndividual}
 		testSuccess(opts, expectedUserIDs)
 	}