update ignore project
This commit is contained in:
		
							parent
							
								
									12a1447931
								
							
						
					
					
						commit
						2561d39b4a
					
				| 
						 | 
					@ -230,6 +230,7 @@ class JiraService
 | 
				
			||||||
        $groupedIssues = [];
 | 
					        $groupedIssues = [];
 | 
				
			||||||
        $users_data = [];
 | 
					        $users_data = [];
 | 
				
			||||||
        $user_warning = [];
 | 
					        $user_warning = [];
 | 
				
			||||||
 | 
					        $ignore_projects = ['PJ_tracking'];
 | 
				
			||||||
        foreach ($users as $user) {
 | 
					        foreach ($users as $user) {
 | 
				
			||||||
            $user = (array) $user[0];
 | 
					            $user = (array) $user[0];
 | 
				
			||||||
            $users_data[$user['displayName']]['user'] = $user;
 | 
					            $users_data[$user['displayName']]['user'] = $user;
 | 
				
			||||||
| 
						 | 
					@ -252,32 +253,42 @@ class JiraService
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            $issues = json_decode($response->getBody()->getContents(), true);
 | 
					            $issues = json_decode($response->getBody()->getContents(), true);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					             // Lọc các issue không thuộc các project bị ignore
 | 
				
			||||||
 | 
					            $filtered_issues = array_filter($issues['issues'], function ($issue) use ($ignore_projects) {
 | 
				
			||||||
 | 
					                return !in_array($issue['fields']['project']['name'], $ignore_projects);
 | 
				
			||||||
 | 
					            });
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            $issues['issues'] = $filtered_issues;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            if (count($issues['issues']) == 0) {
 | 
					            if (count($issues['issues']) == 0) {
 | 
				
			||||||
                $user_warning[] = $user;
 | 
					                $user_warning[] = $user;
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            foreach ($issues['issues'] as $issue) {
 | 
					            foreach ($issues['issues'] as $issue) {
 | 
				
			||||||
                $projectName = $issue['fields']['project']['name'];
 | 
					                $projectName = $issue['fields']['project']['name'];
 | 
				
			||||||
                $username = $issue['fields']['assignee']['displayName'];
 | 
					                if(!in_array($projectName, $ignore_projects)) {
 | 
				
			||||||
                $issue['fields']['assignee']['emailAddress'] = $user['emailAddress'];
 | 
					                    $username = $issue['fields']['assignee']['displayName'];
 | 
				
			||||||
                if (!isset($groupedIssues[$projectName])) {
 | 
					                    $issue['fields']['assignee']['emailAddress'] = $user['emailAddress'];
 | 
				
			||||||
                    $groupedIssues[$projectName] = [];
 | 
					                    if (!isset($groupedIssues[$projectName])) {
 | 
				
			||||||
                    $groupedIssues[$projectName]['project'] = $issue['fields']['project'];
 | 
					                        $groupedIssues[$projectName] = [];
 | 
				
			||||||
 | 
					                        $groupedIssues[$projectName]['project'] = $issue['fields']['project'];
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
 | 
					    
 | 
				
			||||||
 | 
					                    if (!isset($groupedIssues[$projectName]['users'][$username])) {
 | 
				
			||||||
 | 
					                        $groupedIssues[$projectName]['users'][$username] = [];
 | 
				
			||||||
 | 
					                        $groupedIssues[$projectName]['users'][$username]['user'] = $issue['fields']['assignee'];
 | 
				
			||||||
 | 
					                        $groupedIssues[$projectName]['users'][$username]['p_total_spent'] = 0;
 | 
				
			||||||
 | 
					                        $groupedIssues[$projectName]['users'][$username]['p_total_est'] = 0;
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
 | 
					    
 | 
				
			||||||
 | 
					                    $groupedIssues[$projectName]['users'][$username]['issues'][] = $issue;
 | 
				
			||||||
 | 
					                    $groupedIssues[$projectName]['users'][$username]['p_total_spent'] = $groupedIssues[$projectName]['users'][$username]['p_total_spent'] + $issue['fields']['timespent'];
 | 
				
			||||||
 | 
					                    $groupedIssues[$projectName]['users'][$username]['p_total_est'] = $groupedIssues[$projectName]['users'][$username]['p_total_est'] + ($issue['fields']['timeoriginalestimate'] ?? 0);
 | 
				
			||||||
 | 
					    
 | 
				
			||||||
 | 
					                    $users_data[$user['displayName']]['total_spent'] = $users_data[$user['displayName']]['total_spent'] + $issue['fields']['timespent'];
 | 
				
			||||||
 | 
					                    $users_data[$user['displayName']]['total_est'] = $users_data[$user['displayName']]['total_est'] + ($issue['fields']['timeoriginalestimate'] ?? 0);
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
 | 
					                
 | 
				
			||||||
                if (!isset($groupedIssues[$projectName]['users'][$username])) {
 | 
					 | 
				
			||||||
                    $groupedIssues[$projectName]['users'][$username] = [];
 | 
					 | 
				
			||||||
                    $groupedIssues[$projectName]['users'][$username]['user'] = $issue['fields']['assignee'];
 | 
					 | 
				
			||||||
                    $groupedIssues[$projectName]['users'][$username]['p_total_spent'] = 0;
 | 
					 | 
				
			||||||
                    $groupedIssues[$projectName]['users'][$username]['p_total_est'] = 0;
 | 
					 | 
				
			||||||
                }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
                $groupedIssues[$projectName]['users'][$username]['issues'][] = $issue;
 | 
					 | 
				
			||||||
                $groupedIssues[$projectName]['users'][$username]['p_total_spent'] = $groupedIssues[$projectName]['users'][$username]['p_total_spent'] + $issue['fields']['timespent'];
 | 
					 | 
				
			||||||
                $groupedIssues[$projectName]['users'][$username]['p_total_est'] = $groupedIssues[$projectName]['users'][$username]['p_total_est'] + ($issue['fields']['timeoriginalestimate'] ?? 0);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
                $users_data[$user['displayName']]['total_spent'] = $users_data[$user['displayName']]['total_spent'] + $issue['fields']['timespent'];
 | 
					 | 
				
			||||||
                $users_data[$user['displayName']]['total_est'] = $users_data[$user['displayName']]['total_est'] + ($issue['fields']['timeoriginalestimate'] ?? 0);
 | 
					 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue