Skip to content

Commit

Permalink
Merge pull request #109 from tada-team/meeting-freq-statuses
Browse files Browse the repository at this point in the history
update meeting counts
  • Loading branch information
melkayalenka authored May 27, 2022
2 parents 82eeae4 + 0961024 commit d86efd9
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 17 deletions.
23 changes: 12 additions & 11 deletions meetings.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,18 @@ type Meeting struct {
}

type MeetingsGetRequest struct {
TeamUuid string `json:"team_uuid"`
DateFrom string `json:"date_from"`
DateTo string `json:"date_to"`
Members []string `json:"members,omitempty"`
Limit *int32 `json:"limit,omitempty"`
Offset *int32 `json:"offset,omitempty"`
IsArchive *bool `json:"is_archive,omitempty"`
IsFreq *bool `json:"is_freq,omitempty"`
IsPublic *bool `json:"is_public,omitempty"`
IsOutside *bool `json:"is_outside,omitempty"`
IsRequired *bool `json:"is_required,omitempty"`
TeamUuid string `json:"team_uuid"`
DateFrom string `json:"date_from"`
DateTo string `json:"date_to"`
Members []string `json:"members,omitempty"`
Limit *int32 `json:"limit,omitempty"`
Offset *int32 `json:"offset,omitempty"`
IsArchive *bool `json:"is_archive,omitempty"`
IsFreq *bool `json:"is_freq,omitempty"`
IsPublic *bool `json:"is_public,omitempty"`
IsOutside *bool `json:"is_outside,omitempty"`
IsRequired *bool `json:"is_required,omitempty"`
IsOnlyMyMeetings *bool `json:"is_only_mу_meetings,omitempty"`
}

type MeetingsResponse struct {
Expand Down
15 changes: 9 additions & 6 deletions server_meeting_updated.go
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
package tdproto

func NewServerMeetingUpdated(meeting Meeting, count int32) (r ServerMeetingUpdated) {
return NewServerMeetingsUpdated([]Meeting{meeting}, count)
func NewServerMeetingUpdated(meeting Meeting, countTeam, countUser int32) (r ServerMeetingUpdated) {
return NewServerMeetingsUpdated([]Meeting{meeting}, countTeam, countUser)
}

func NewServerMeetingsUpdated(meetings []Meeting, count int32) (r ServerMeetingUpdated) {
func NewServerMeetingsUpdated(meetings []Meeting, countTeam, countUser int32) (r ServerMeetingUpdated) {
r.Name = r.GetName()
r.Params.Meetings = meetings
r.Params.MeetingsCount = count
r.Params.TeamMeetingsCount = countTeam
r.Params.UserMeetingsCount = countUser
return r
}

Expand All @@ -23,6 +24,8 @@ func (p ServerMeetingUpdated) GetName() string { return "server.meeting.updated"
type serverMeetingUpdatedParams struct {
// Meeting info
Meetings []Meeting `json:"meetings"`
// Meetings count
MeetingsCount int32 `json:"meetings_count"`
// Team Meetings count
TeamMeetingsCount int32 `json:"team_meetings_count"`
// User Meetings count
UserMeetingsCount int32 `json:"user_meetings_count"`
}

0 comments on commit d86efd9

Please sign in to comment.