Merge pull request #175 from traPtitech/develop

fix bug
traPtitech · May 23, 2021 · 1d70db8 · 1d70db8
2 parents 5cffe04 + 8d9c022
commit 1d70db8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
@@ -1119,7 +1119,7 @@ components:
         値がない場合は、belongs として振る舞う
       schema:
         type: string
-        example:
+        enum:
           - admins
           - belongs
 

diff --git a/usecase/production/event.go b/usecase/production/event.go
@@ -175,6 +175,7 @@ func createUserMap(users []*domain.User) map[uuid.UUID]*domain.User {
 	return userMap
 }
 
+// add traQ group and traP(111...)
 func addTraQGroupIDs(repo *Repository, userID uuid.UUID, expr filter.Expr) filter.Expr {
 	t, err := repo.GormRepo.GetToken(userID)
 	if err != nil {
@@ -195,6 +196,14 @@ func addTraQGroupIDs(repo *Repository, userID uuid.UUID, expr filter.Expr) filte
 				if err != nil {
 					return e
 				}
+				// add traP
+				user, err := repo.GormRepo.GetUser(id)
+				if err != nil {
+					return e
+				}
+				if user.Provider.Issuer == traQIssuerName {
+					groupIDs = append(groupIDs, traPGroupID)
+				}
 				return &filter.LogicOpExpr{
 					LogicOp: filter.Or,
 					Lhs:     e,