Skip to content
Snippets Groups Projects
Commit 35a33ef8 authored by LE DURAND Matteo's avatar LE DURAND Matteo
Browse files

fix: les MergeRequest sont maintenant pris en compte uniquement si l'action est accepté

parent bbd23ce0
Branches
No related tags found
2 merge requests!28Ajout de l'onglet indicateur et plus,!18MAJ de main de la branche dev
...@@ -129,10 +129,24 @@ get_gitlab_events <- function(base_url, project_id, private_token) { ...@@ -129,10 +129,24 @@ get_gitlab_events <- function(base_url, project_id, private_token) {
data <- data %>% data <- data %>%
mutate( mutate(
project_name = as.character(project_id), project_name = as.character(project_id),
type = if_else((is.null(target_type) | target_type == "") | as.character(target_type) == "Issue" | as.character(action_name) == "joined", # remplecer par | as.ch(target-type)=="Issue"
as.character(action_name), type = case_when(
as.character(target_type)), is.null(target_type) | target_type == "" ~ as.character(action_name),
message = note.body, as.character(action_name) == "joined" ~ as.character(action_name),
TRUE ~ as.character(target_type)
),
message = case_when(
# Cas spécifique : MergeRequest avec action_name == "accepted"
as.character(target_type) == "MergeRequest" & as.character(action_name) == "accepted" ~ as.character(target_title),
# Cas général : autres MergeRequest ou WikiPage::Meta
as.character(target_type) %in% c("WikiPage::Meta") ~ as.character(target_title),
# Si ce n'est pas un cas spécial, garder note.body
TRUE ~ as.character(note.body)
),
updated_at = created_at, updated_at = created_at,
author = author.username author = author.username
) %>% ) %>%
......
...@@ -170,13 +170,27 @@ get_gitlab_events <- function(base_url, project_id, private_token) { ...@@ -170,13 +170,27 @@ get_gitlab_events <- function(base_url, project_id, private_token) {
data <- data %>% data <- data %>%
mutate( mutate(
project_name = as.character(project_id), project_name = as.character(project_id),
type = if_else((is.null(target_type) | target_type == "") | as.character(target_type) == "Issue" | as.character(action_name) == "joined", # remplecer par | as.ch(target-type)=="Issue"
as.character(action_name), type = case_when(
as.character(target_type)), is.null(target_type) | target_type == "" ~ as.character(action_name),
message = ifelse(as.character(target_type) == "WikiPage::Meta",as.character(target_title),as.character(note.body)), as.character(action_name) == "joined" ~ as.character(action_name),
TRUE ~ as.character(target_type)
),
message = case_when(
# Cas spécifique : MergeRequest avec action_name == "accepted"
as.character(target_type) == "MergeRequest" & as.character(action_name) == "accepted" ~ as.character(target_title),
# Cas général : autres MergeRequest ou WikiPage::Meta
as.character(target_type) %in% c("WikiPage::Meta") ~ as.character(target_title),
# Si ce n'est pas un cas spécial, garder note.body
TRUE ~ as.character(note.body)
),
updated_at = created_at, updated_at = created_at,
author = author.username author = author.username
) %>% )%>%
left_join(name_gitlab, by = c("project_name" = "id")) %>% left_join(name_gitlab, by = c("project_name" = "id")) %>%
mutate(project_name = name) %>% mutate(project_name = name) %>%
select(-name) select(-name)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment