Commit df46554e authored by Mo Firouz's avatar Mo Firouz
Browse files

Correctly check for group existence before attempting to join.

parent 841307ec
Loading
Loading
Loading
Loading
+5 −4
Original line number Diff line number Diff line
@@ -285,10 +285,6 @@ FROM groups
WHERE (id = $1) AND (disable_time = '1970-01-01 00:00:00')`
	rows, err := db.Query(query, groupID)
	if err != nil {
		if err == sql.ErrNoRows {
			logger.Info("Group does not exist.", zap.Error(err), zap.String("group_id", groupID.String()))
			return ErrGroupNotFound
		}
		logger.Error("Could not look up group while trying to join it.", zap.Error(err))
		return err
	}
@@ -300,6 +296,11 @@ WHERE (id = $1) AND (disable_time = '1970-01-01 00:00:00')`
		return err
	}

	if len(groups) == 0 {
		logger.Info("Group does not exist.", zap.Error(err), zap.String("group_id", groupID.String()))
		return ErrGroupNotFound
	}

	group := groups[0]
	if group.EdgeCount >= group.MaxCount {
		logger.Info("Group maximum count has reached.", zap.Error(err), zap.String("group_id", groupID.String()))