#114 Import all projects from specified namespaces

zubroide · Jan 19, 2023 · 0f6897b · 0f6897b
1 parent 6fd9015
commit 0f6897b
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 17 deletions.
diff --git a/.env.docker.example b/.env.docker.example
@@ -42,3 +42,4 @@ HTTP_PORT=8000
 GITLAB_HOST=https://gitlab.com/
 GITLAB_PRIVATE_TOKEN=your_gitlab_token
 GITLAB_RESTRICTIONS_PROJECT_IDS=1111,2222,3333
+GITLAB_RESTRICTIONS_GROUP_IDS=1212,2323
diff --git a/.env.example b/.env.example
@@ -42,3 +42,4 @@ HTTP_PORT=8000
 GITLAB_HOST=https://gitlab.com/
 GITLAB_PRIVATE_TOKEN=your_gitlab_token
 GITLAB_RESTRICTIONS_PROJECT_IDS=1111,2222,3333
+GITLAB_RESTRICTIONS_GROUP_IDS=1212,2323
diff --git a/app/Model/Service/Eloquent/EloquentIssueService.php b/app/Model/Service/Eloquent/EloquentIssueService.php
@@ -15,29 +15,16 @@ class EloquentIssueService extends CrudServiceAbstract
     use StoreContributorsTrait;
     use StoreLabelsTrait;
 
-    /** @var int[]|null */
-    protected $filterProjectIds = null;
-
     public function __construct()
     {
         $this->repository = app(AppServiceProvider::ISSUE_REPOSITORY);
-        $this->filterProjectIds = config('gitlab.restrictions.project_ids');
     }
 
     /**
      * @inheritdoc
      */
     public function storeList(Collection $list)
     {
-        // If selected only concrete projects, we update only them
-        if ($this->filterProjectIds !== null) {
-            foreach ($list as $key => $item) {
-                if (!in_array($item['project_id'], $this->filterProjectIds)) {
-                    $list->pull($key);
-                }
-            }
-        }
-
         $this->storeContributors($list, ['author', 'assignee']);
         $this->storeLabels($list, 'labels');
         parent::storeList($list);

diff --git a/app/Model/Service/Eloquent/EloquentProjectService.php b/app/Model/Service/Eloquent/EloquentProjectService.php
@@ -16,21 +16,32 @@ class EloquentProjectService extends CrudServiceAbstract
     /** @var int[]|null */
     protected $filterProjectIds = null;
 
+    /** @var int[]|null */
+    protected $filterGroupIds = null;
+
     public function __construct()
     {
         $this->repository = app(AppServiceProvider::PROJECT_REPOSITORY);
         $this->filterProjectIds = config('gitlab.restrictions.project_ids');
+        $this->filterGroupIds = config('gitlab.restrictions.group_ids');
     }
 
     /**
      * @inheritdoc
      */
     public function storeList(Collection $list)
     {
-        // If selected only concrete projects, we update only them
-        if ($this->filterProjectIds !== null) {
+        $projectIds = $this->filterProjectIds;
+        $groupIds = $this->filterGroupIds;
+
+        // If selected only concrete projects or groups, we update only them
+        if (!empty($projectIds) || !empty($groupIds)) {
             foreach ($list as $key => $item) {
-                if (!in_array($item['id'], $this->filterProjectIds)) {
+                if (!(in_array($item['id'], $projectIds) || (
+                    ($item['namespace']['id'] ?? null) &&
+                    ($item['namespace']['kind'] ?? null) == 'group' &&
+                    in_array($item['namespace']['id'], $groupIds)
+                ))) {
                     $list->pull($key);
                 }
             }

diff --git a/config/gitlab.php b/config/gitlab.php
@@ -23,7 +23,10 @@
         // int[]|null
         'project_ids' => env('GITLAB_RESTRICTIONS_PROJECT_IDS')
             ? explode(',', env('GITLAB_RESTRICTIONS_PROJECT_IDS'))
-            : null,
+            : [],
+        'group_ids' => env('GITLAB_RESTRICTIONS_GROUP_IDS')
+            ? explode(',', env('GITLAB_RESTRICTIONS_GROUP_IDS'))
+            : [],
     ],
 
 ];