fix: move to latest meetup api

pkg/importer/meetup_repository.go

@@ -40,9 +40,9 @@ func NewGraphQLMeetupRepository(
 
 const getFutureEventsQuery = `
   query ($urlname: String!, $itemsNum: Int!, $cursor: String) {
-	events: groupByUrlname(urlname: $urlname) {
-	  unifiedEvents(input: { first: $itemsNum, after: $cursor }) {
-		count
+	groupByUrlname(urlname: $urlname) {
+	  events(first: $itemsNum, after: $cursor, filter: { status: [ACTIVE] }) {
+		totalCount
 		pageInfo {
 		  endCursor
 		  hasNextPage
@@ -66,12 +66,12 @@ const getFutureEventsQuery = `
 			  name
 			  urlname
 			}
-			host {
+			eventHosts {
 			  name
 			}
-			images {
+			featuredEventPhoto {
+			  id
 			  baseUrl
-			  preview
 			}
 		  }
 		}
@@ -82,16 +82,16 @@ const getFutureEventsQuery = `
 
 type MeetupFutureEventsResponse struct {
 	Data struct {
-		Events struct {
-			UnifiedEvents struct {
-				Count    int `json:"count"`
-				PageInfo struct {
+		GroupByUrlname struct {
+			Events struct {
+				TotalCount int `json:"totalCount"`
+				PageInfo   struct {
 					EndCursor   string `json:"endCursor"`
 					HasNextPage bool   `json:"hasNextPage"`
 				} `json:"pageInfo"`
 				Edges []MeetupEdge `json:"edges"`
-			} `json:"unifiedEvents"`
-		} `json:"events"`
+			} `json:"events"`
+		} `json:"groupByUrlname"`
 	} `json:"data"`
 }
 
@@ -128,7 +128,7 @@ func (r *GraphQLMeetupRepository) GetEventsUntilDateForGroup(
 			return nil, err
 		}
 
-		for _, edge := range response.Data.Events.UnifiedEvents.Edges {
+		for _, edge := range response.Data.GroupByUrlname.Events.Edges {
 			event := edge.Node
 			events = append(events, event)
 
@@ -141,7 +141,7 @@ func (r *GraphQLMeetupRepository) GetEventsUntilDateForGroup(
 			break
 		}
 
-		pageInfo := response.Data.Events.UnifiedEvents.PageInfo
+		pageInfo := response.Data.GroupByUrlname.Events.PageInfo
 
 		if !pageInfo.HasNextPage {
 			break

pkg/importer/meetup_repository_test.go

@@ -136,16 +136,16 @@ func generateMeetupResponse(
 	cursor string,
 ) *MeetupFutureEventsResponse {
 	response := &MeetupFutureEventsResponse{}
-	response.Data.Events.UnifiedEvents.Count = len(events)
-	response.Data.Events.UnifiedEvents.PageInfo.EndCursor = cursor
-	response.Data.Events.UnifiedEvents.PageInfo.HasNextPage = cursor != ""
+	response.Data.GroupByUrlname.Events.TotalCount = len(events)
+	response.Data.GroupByUrlname.Events.PageInfo.EndCursor = cursor
+	response.Data.GroupByUrlname.Events.PageInfo.HasNextPage = cursor != ""
 
 	edges := make([]MeetupEdge, 0, len(events))
 
 	for _, event := range events {
 		edges = append(edges, MeetupEdge{Node: event})
 	}
 
-	response.Data.Events.UnifiedEvents.Edges = edges
+	response.Data.GroupByUrlname.Events.Edges = edges
 	return response
 }

pkg/meetupproxy/meetupproxyconfig/config.go

@@ -70,7 +70,7 @@ func NewConfig(ctx context.Context, awsConfigFactory appconfig.AwsConfigManager)
 
 func setDefaults(_ context.Context, v *viper.Viper) error {
 	v.SetDefault(strings.ToLower(meetupAuthUrlKey), "https://secure.meetup.com/oauth2/access")
-	v.SetDefault(strings.ToLower(meetupApiUrlKey), "https://api.meetup.com/gql")
+	v.SetDefault(strings.ToLower(meetupApiUrlKey), "https://api.meetup.com/gql-ext")
 
 	meetupPrivateKeyBase64 := v.Get(strings.ToLower(meetupPrivateKeyBase64Key)).(string)
 	meetupPrivateKey, err := base64.StdEncoding.DecodeString(meetupPrivateKeyBase64)

pkg/meetupproxy/meetupproxyconfig/config_test.go

@@ -32,7 +32,7 @@ func TestNewConfig(t *testing.T) {
 		assert.Equal(t, "user123", cfg.MeetupUserID)
 		assert.Equal(t, []byte("private_key"), cfg.MeetupPrivateKey)
 		assert.Equal(t, "https://secure.meetup.com/oauth2/access", cfg.MeetupAuthURL)
-		assert.Equal(t, "https://api.meetup.com/gql", cfg.MeetupAPIURL)
+		assert.Equal(t, "https://api.meetup.com/gql-ext", cfg.MeetupAPIURL)
 	})
 
 	t.Run("successful load from .env file", func(t *testing.T) {

pkg/shared/models/meetup.go

@@ -41,6 +41,13 @@ func (e *MeetupEvent) UnmarshalJSON(data []byte) error {
 			Name    string `json:"name"`
 			URLName string `json:"urlname"`
 		} `json:"group"`
+		EventHosts []struct {
+			Name string `json:"name"`
+		} `json:"eventHosts"`
+		FeaturedPhoto *struct {
+			ID      string `json:"id"`
+			BaseUrl string `json:"baseUrl"`
+		} `json:"featuredEventPhoto"`
 		*Alias
 	}{
 		Alias: (*Alias)(e),
@@ -52,5 +59,19 @@ func (e *MeetupEvent) UnmarshalJSON(data []byte) error {
 
 	e.GroupName = aux.Group.Name
 	e.GroupID = aux.Group.URLName
+
+	// Extract first event host name for backward compatibility
+	if len(aux.EventHosts) > 0 && aux.EventHosts[0].Name != "" {
+		e.Host = &MeetupHost{Name: aux.EventHosts[0].Name}
+	}
+
+	// Map featuredEventPhoto to Images for backward compatibility
+	if aux.FeaturedPhoto != nil && aux.FeaturedPhoto.ID != "" {
+		imageURL := aux.FeaturedPhoto.BaseUrl + aux.FeaturedPhoto.ID + "/676x380.jpg"
+		e.Images = []MeetupImage{
+			{BaseUrl: imageURL, Preview: imageURL},
+		}
+	}
+
 	return nil
 }

pkg/shared/models/meetup_test.go

@@ -28,15 +28,15 @@ func TestMeetupEvent_UnmarshalJSON(t *testing.T) {
     "name": "Open SGF",
     "urlname": "open-sgf"
   },
-  "host": {
-    "name": "Levi Zitting"
-  },
-  "images": [
+  "eventHosts": [
     {
-      "baseUrl": "https://secure-content.meetupstatic.com/images/classic-events/",
-      "preview": null
+      "name": "Levi Zitting"
     }
-  ]
+  ],
+  "featuredEventPhoto": {
+    "id": "501234567",
+    "baseUrl": "https://secure-content.meetupstatic.com/images/classic-events/"
+  }
 }`
 
 	var event MeetupEvent
@@ -60,7 +60,7 @@ func TestMeetupEvent_UnmarshalJSON(t *testing.T) {
 	assert.Len(t, event.Images, 1)
 	assert.Equal(
 		t,
-		"https://secure-content.meetupstatic.com/images/classic-events/",
+		"https://secure-content.meetupstatic.com/images/classic-events/501234567/676x380.jpg",
 		event.Images[0].BaseUrl,
 	)
 }