Merge pull request #25 from pilucca/master

Fix branch restriction sorting

sample_repo_configuration.yml

@@ -91,6 +91,7 @@ pr-restrictions:
   required-all-tasks-complete: true
   required-approvers: 2
   required-successful-builds: 1
+  unapprove-on-update: true
   merge-config:
     default-strategy: no-ff
     enabled-strategies:

src/.vscode/settings.json

@@ -0,0 +1,2 @@
+{
+}

src/bec_pr_restriction_t.erl

@@ -18,6 +18,7 @@
                         , 'required-all-tasks-complete' := boolean()
                         , 'required-approvers'          := integer()
                         , 'required-successful-builds'  := boolean()
+                        , 'unapprove-on-update'         := boolean()
                         }.
 
 %%==============================================================================
@@ -35,12 +36,14 @@ from_map(#{ <<"mergeConfig">>              := MergeConfig
           , <<"requiredAllTasksComplete">> := RequiredAllTasksComplete
           , <<"requiredApprovers">>        := RequiresApprovers
           , <<"requiredSuccessfulBuilds">> := RequiredSuccessfulBuilds
+          , <<"unapproveOnUpdate">>        := UnapproveOnUpdate
           }) ->
   #{ 'merge-config'                => bec_merge_config_t:from_map(MergeConfig)
    , 'required-all-approvers'      => RequiredAllApprovers
    , 'required-all-tasks-complete' => RequiredAllTasksComplete
    , 'required-approvers'          => RequiresApprovers
    , 'required-successful-builds'  => RequiredSuccessfulBuilds
+   , 'unapprove-on-update'         => UnapproveOnUpdate
    }.
 
 -spec to_map(restriction()) -> map().
@@ -49,10 +52,12 @@ to_map(#{ 'merge-config'                := MergeConfig
         , 'required-all-tasks-complete' := RequiredAllTasksComplete
         , 'required-approvers'          := RequiresApprovers
         , 'required-successful-builds'  := RequiredSuccessfulBuilds
+        , 'unapprove-on-update'         := UnapproveOnUpdate
         }) ->
   #{ <<"mergeConfig">>              => bec_merge_config_t:to_map(MergeConfig)
    , <<"requiredAllApprovers">>     => RequiredAllApprovers
    , <<"requiredAllTasksComplete">> => RequiredAllTasksComplete
    , <<"requiredApprovers">>        => RequiresApprovers
    , <<"requiredSuccessfulBuilds">> => RequiredSuccessfulBuilds
+   , <<"unapproveOnUpdate">>        => UnapproveOnUpdate
    }.

src/bitbucket.erl

@@ -164,7 +164,8 @@ get_branch_restrictions(ProjectKey, RepoSlug) ->
   case bitbucket_api:get_branch_restrictions(ProjectKey, RepoSlug) of
     {ok, Response} ->
       Values = maps:get(<<"values">>, Response),
-      {ok, lists:sort([bec_branch_restriction_t:from_map(V) || V <- Values])};
+      {ok, lists:sort([maps:remove(id, X) ||
+        X <- [bec_branch_restriction_t:from_map(V) || V <- Values]])};
     {error, Reason} ->
       {error, Reason}
   end.