Add selfservice parameter on the GH team entity; don't allow users to subscribe to non-selfservice teams

TomasHofman · TomasHofman · commit 052b03571e66 · 2025-01-21T15:20:17.000+01:00
diff --git a/src/main/java/org/jboss/set/mjolnir/client/application/admin/gitHubMembers/GitHubMembersView.java b/src/main/java/org/jboss/set/mjolnir/client/application/admin/gitHubMembers/GitHubMembersView.java
@@ -112,7 +112,7 @@ protected void onSelectionChanged(GithubTeam selectedTeam) {
             public void setData(List<GithubTeam> values) {
                 // prepend "All teams" option
                 values = new ArrayList<>(values);
-                GithubTeam allTeamsItem = new GithubTeam("All teams", null);
+                GithubTeam allTeamsItem = new GithubTeam("All teams", null, false);
                 values.add(0, allTeamsItem);
                 super.setData(values);
             }
diff --git a/src/main/java/org/jboss/set/mjolnir/client/application/subscriptionSetting/SubscriptionSettingView.java b/src/main/java/org/jboss/set/mjolnir/client/application/subscriptionSetting/SubscriptionSettingView.java
@@ -56,7 +56,7 @@ protected String getName(GithubOrganization item) {
 
             @Override
             protected void onSelectionChanged(GithubOrganization selectedObject) {
-                mySubscriptionsWidget.setData(selectedObject != null ? selectedObject.getTeams() : Collections.<GithubTeam>emptyList());
+                mySubscriptionsWidget.setData(selectedObject != null ? selectedObject.getSelfServiceTeams() : Collections.<GithubTeam>emptyList());
             }
         });
 
diff --git a/src/main/java/org/jboss/set/mjolnir/server/bean/GitHubSubscriptionBean.java b/src/main/java/org/jboss/set/mjolnir/server/bean/GitHubSubscriptionBean.java
@@ -215,6 +215,11 @@ public List<GithubOrganization> getSubscriptions(String gitHubName) {
     public void setSubscriptions(String gitHubName, Map<Integer, Boolean> subscriptions) {
             for (Map.Entry<Integer, Boolean> entry : subscriptions.entrySet()) {
                 final Integer teamId = entry.getKey();
+                GithubTeam team = organizationRepository.getTeam(teamId);
+                if (team == null) {
+                    throw new ApplicationException("Managing this team subscriptions not allowed: " + teamId);
+                }
+
                 if (entry.getValue()) {
                     try {
                         teamService.addMembership(teamId, gitHubName);
@@ -233,9 +238,14 @@ public void setSubscriptions(String gitHubName, Map<Integer, Boolean> subscripti
             }
     }
 
-    public void unsubscribeUser(String organization, String gitHubName) {
+    public void unsubscribeUser(String orgName, String gitHubName) {
         try {
-            organizationService.removeMember(organization, gitHubName);
+            GithubOrganization organization = organizationRepository.getOrganization(orgName);
+            if (organization == null) {
+                throw new ApplicationException("Managing this organization subscriptions not allowed: " + orgName);
+            }
+
+            organizationService.removeMember(orgName, gitHubName);
         } catch (IOException e) {
             throw new ApplicationException(e);
         }
diff --git a/src/main/java/org/jboss/set/mjolnir/server/bean/OrganizationRepository.java b/src/main/java/org/jboss/set/mjolnir/server/bean/OrganizationRepository.java
@@ -1,6 +1,7 @@
 package org.jboss.set.mjolnir.server.bean;
 
 import org.jboss.set.mjolnir.shared.domain.GithubOrganization;
+import org.jboss.set.mjolnir.shared.domain.GithubTeam;
 
 import java.util.List;
 
@@ -18,4 +19,14 @@ public interface OrganizationRepository {
      */
     List<GithubOrganization> getOrganizations();
 
+    /**
+     * Retrieves GH team with given ID.
+     */
+    GithubTeam getTeam(long id);
+
+    /**
+     * Retrieves GH org by name.
+     */
+    GithubOrganization getOrganization(String name);
+
 }
diff --git a/src/main/java/org/jboss/set/mjolnir/server/bean/OrganizationRepositoryBean.java b/src/main/java/org/jboss/set/mjolnir/server/bean/OrganizationRepositoryBean.java
@@ -27,40 +27,63 @@ public class OrganizationRepositoryBean implements OrganizationRepository {
 
     @Override
     public List<GithubOrganization> getOrganizations() {
-        // load organizations into a map
         EntityManager em = entityManagerFactory.createEntityManager();
+        try {
+            // load organizations into a map
+            final List<GithubOrganizationEntity> organizationsList =
+                    em.createQuery("FROM GithubOrganizationEntity WHERE subscriptionsEnabled = true", GithubOrganizationEntity.class)
+                            .getResultList();
 
-        final List<GithubOrganizationEntity> organizationsList =
-                em.createQuery("FROM GithubOrganizationEntity WHERE subscriptionsEnabled = true", GithubOrganizationEntity.class)
-                        .getResultList();
 
-        em.close();
+            final Map<Long, GithubOrganization> orgMap = new HashMap<>();
 
-        final Map<Long, GithubOrganization> orgMap = new HashMap<>();
-
-        for (GithubOrganizationEntity organization : organizationsList) {
-            final GithubOrganization org = new GithubOrganization(organization.getName());
-            orgMap.put(organization.getId(), org);
-        }
+            for (GithubOrganizationEntity organization : organizationsList) {
+                final GithubOrganization org = new GithubOrganization(organization.getName());
+                orgMap.put(organization.getId(), org);
+            }
 
-        // load teams and add them to organizations
-        em = entityManagerFactory.createEntityManager();
+            // load teams and add them to organizations
+            final List<GithubTeamEntity> teamsList =
+                    em.createQuery("FROM GithubTeamEntity", GithubTeamEntity.class).getResultList();
 
-        final List<GithubTeamEntity> teamsList =
-                em.createQuery("FROM GithubTeamEntity", GithubTeamEntity.class).getResultList();
+            for (GithubTeamEntity teamEnt : teamsList) {
+                final GithubTeam team = new GithubTeam(teamEnt.getName(), teamEnt.getGithubId().intValue(),
+                        Boolean.TRUE.equals(teamEnt.getSelfService()));
+                final Long orgId = teamEnt.getOrganization().getId();
+                final GithubOrganization org = orgMap.get(orgId);
+                if (org != null) {
+                    org.addTeam(team);
+                }
+            }
 
-        em.close();
+            return new ArrayList<>(orgMap.values());
+        } finally {
+            em.close();
+        }
+    }
 
-        for (GithubTeamEntity teamEnt : teamsList) {
-            final GithubTeam team = new GithubTeam(teamEnt.getName(), teamEnt.getGithubId().intValue());
-            final Long orgId = teamEnt.getOrganization().getId();
-            final GithubOrganization org = orgMap.get(orgId);
-            if (org != null) {
-                org.addTeam(team);
-            }
+    @Override
+    public GithubOrganization getOrganization(String name) {
+        EntityManager em = entityManagerFactory.createEntityManager();
+        try {
+            GithubOrganizationEntity e = em.createQuery("FROM GithubOrganizationEntity WHERE name = ?1", GithubOrganizationEntity.class)
+                    .setParameter(1, name)
+                    .getSingleResult();
+            return new GithubOrganization(e.getName());
+        } finally {
+            em.close();
         }
+    }
 
-        return new ArrayList<>(orgMap.values());
+    @Override
+    public GithubTeam getTeam(long id) {
+        EntityManager em = entityManagerFactory.createEntityManager();
+        try {
+            GithubTeamEntity e = em.find(GithubTeamEntity.class, id);
+            return new GithubTeam(e.getName(), e.getId().intValue(), Boolean.TRUE.equals(e.getSelfService()));
+        } finally {
+            em.close();
+        }
     }
 
 }
diff --git a/src/main/java/org/jboss/set/mjolnir/server/entities/GithubOrganizationEntity.java b/src/main/java/org/jboss/set/mjolnir/server/entities/GithubOrganizationEntity.java
@@ -20,6 +20,7 @@ public class GithubOrganizationEntity {
     @SequenceGenerator(name = "sq_github_orgs", sequenceName = "sq_github_orgs", allocationSize = 1)
     private Long id;
 
+    @Column(name = "name")
     private String name;
 
     @Column(name = "subscriptions_enabled")
diff --git a/src/main/java/org/jboss/set/mjolnir/server/entities/GithubTeamEntity.java b/src/main/java/org/jboss/set/mjolnir/server/entities/GithubTeamEntity.java
@@ -31,6 +31,9 @@ public class GithubTeamEntity {
     @Column(name = "github_id", unique = true)
     private Long githubId;
 
+    @Column(name = "selfservice")
+    private Boolean selfService;
+
     public GithubTeamEntity() {
     }
 
@@ -65,4 +68,8 @@ public Long getGithubId() {
     public void setGithubId(Long githubId) {
         this.githubId = githubId;
     }
+
+    public Boolean getSelfService() {
+        return selfService;
+    }
 }
diff --git a/src/main/java/org/jboss/set/mjolnir/server/service/GitHubServiceImpl.java b/src/main/java/org/jboss/set/mjolnir/server/service/GitHubServiceImpl.java
@@ -123,6 +123,10 @@ public EntityUpdateResult<RegisteredUser> modifyGitHubName(String newGithubName)
 
     @Override
     public String subscribe(int teamId) {
+        GithubTeam team = organizationRepository.getTeam(teamId);
+        if (team == null || !team.isSelfService()) {
+            throw new ApplicationException("Users not allowed to manage subscription to this team: " + teamId);
+        }
         final String githubName = getCurrentUserGitHubName();
         try {
             final String state = teamService.addMembership(teamId, githubName);
@@ -137,6 +141,10 @@ public String subscribe(int teamId) {
 
     @Override
     public void unsubscribe(int teamId) {
+        GithubTeam team = organizationRepository.getTeam(teamId);
+        if (team == null || !team.isSelfService()) {
+            throw new ApplicationException("Users not allowed to manage subscription to this team: " + teamId);
+        }
         final String githubName = getCurrentUserGitHubName();
         try {
             teamService.removeMembership(teamId, githubName);
diff --git a/src/main/java/org/jboss/set/mjolnir/shared/domain/GithubOrganization.java b/src/main/java/org/jboss/set/mjolnir/shared/domain/GithubOrganization.java
@@ -25,6 +25,7 @@
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * Wrapper class to hold the team information for each Github organization in the github-team-data xml file.
@@ -60,6 +61,10 @@ public List<GithubTeam> getTeams() {
         return teams;
     }
 
+    public List<GithubTeam> getSelfServiceTeams() {
+        return teams.stream().filter(GithubTeam::isSelfService).collect(Collectors.toList());
+    }
+
     public String getName() {
         return name;
     }
diff --git a/src/main/java/org/jboss/set/mjolnir/shared/domain/GithubTeam.java b/src/main/java/org/jboss/set/mjolnir/shared/domain/GithubTeam.java
@@ -38,9 +38,12 @@ public class GithubTeam implements Serializable {
     private String membershipState;
     private GithubOrganization organization;
 
-    public GithubTeam(String name, Integer id) {
+    private boolean selfService;
+
+    public GithubTeam(String name, Integer id, boolean selfService) {
         this.name = name;
         this.id = id;
+        this.selfService = selfService;
     }
 
     public GithubTeam() {
@@ -70,6 +73,10 @@ public void setOrganization(GithubOrganization organization) {
         this.organization = organization;
     }
 
+    public boolean isSelfService() {
+        return selfService;
+    }
+
     // GWT quirk - must implement equals method for null IDs, otherwise CellTable doesn't redraw items correctly
     // if an item with null id is displayed
     // if both object IDs are null, objects are equal
diff --git a/src/main/resources/InitialPostgresSQL/create_tables.sql b/src/main/resources/InitialPostgresSQL/create_tables.sql
@@ -13,6 +13,7 @@ create table github_teams (
     org_id bigint not null,
     name varchar(255),
     github_id bigint unique,
+    selfservice boolean,
     constraint fk_github_teams_org_id foreign key (org_id) references github_orgs (id)
 );
 

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ protected void onSelectionChanged(GithubTeam selectedTeam) {`
`112`	`112`	`public void setData(List<GithubTeam> values) {`
`113`	`113`	`// prepend "All teams" option`
`114`	`114`	`values = new ArrayList<>(values);`
`115`		`- GithubTeam allTeamsItem = new GithubTeam("All teams", null);`
	`115`	`+ GithubTeam allTeamsItem = new GithubTeam("All teams", null, false);`
`116`	`116`	`values.add(0, allTeamsItem);`
`117`	`117`	`super.setData(values);`
`118`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ protected String getName(GithubOrganization item) {`
`56`	`56`
`57`	`57`	`@Override`
`58`	`58`	`protected void onSelectionChanged(GithubOrganization selectedObject) {`
`59`		`- mySubscriptionsWidget.setData(selectedObject != null ? selectedObject.getTeams() : Collections.<GithubTeam>emptyList());`
	`59`	`+ mySubscriptionsWidget.setData(selectedObject != null ? selectedObject.getSelfServiceTeams() : Collections.<GithubTeam>emptyList());`
`60`	`60`	`}`
`61`	`61`	`});`
`62`	`62`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,9 @@ public class GithubTeamEntity {`
`31`	`31`	`@Column(name = "github_id", unique = true)`
`32`	`32`	`private Long githubId;`
`33`	`33`
	`34`	`+ @Column(name = "selfservice")`
	`35`	`+ private Boolean selfService;`
	`36`	`+`
`34`	`37`	`public GithubTeamEntity() {`
`35`	`38`	`}`
`36`	`39`
`@@ -65,4 +68,8 @@ public Long getGithubId() {`
`65`	`68`	`public void setGithubId(Long githubId) {`
`66`	`69`	`this.githubId = githubId;`
`67`	`70`	`}`
	`71`	`+`
	`72`	`+ public Boolean getSelfService() {`
	`73`	`+ return selfService;`
	`74`	`+ }`
`68`	`75`	`}`