Merge pull request #2719 from SwiftPackageIndex/revert-2712-fetch-fun…

…ding

Sources/App/Commands/Ingest.swift

@@ -200,7 +200,6 @@ func updateRepository(on database: Database,
 
     repository.defaultBranch = repoMetadata.defaultBranch
     repository.forks = repoMetadata.forkCount
-    repository.fundingLinks = repoMetadata.fundingLinks?.map(FundingLink.init(from:)) ?? []
     repository.homepageUrl = repoMetadata.homepageUrl?.trimmed
     repository.isArchived = repoMetadata.isArchived
     repository.isInOrganization = repoMetadata.isInOrganization
@@ -217,7 +216,8 @@ func updateRepository(on database: Database,
     repository.ownerAvatarUrl = repoMetadata.owner.avatarUrl
     repository.s3Readme = s3Readme
     repository.readmeHtmlUrl = readmeInfo?.htmlUrl
-    repository.releases = repoMetadata.releases.nodes.map(Release.init(from:))
+    repository.releases = metadata.repository?.releases.nodes
+        .map(Release.init(from:)) ?? []
     repository.stars = repoMetadata.stargazerCount
     repository.summary = repoMetadata.description
 

Sources/App/Core/Github.swift

@@ -276,10 +276,6 @@ extension Github {
                     }
                     description
                     forkCount
-                    fundingLinks {
-                      platform
-                      url
-                    }
                     homepageUrl
                     isArchived
                     isFork
@@ -342,7 +338,6 @@ extension Github {
             var defaultBranchRef: DefaultBranchRef?
             var description: String?
             var forkCount: Int
-            var fundingLinks: [FundingLinkNode]?
             var homepageUrl: String?
             var isArchived: Bool
             // periphery:ignore
@@ -370,25 +365,6 @@ extension Github {
             }
         }
 
-        struct FundingLinkNode: Codable, Equatable {
-            enum Platform: String, Codable {
-                case communityBridge = "COMMUNITY_BRIDGE"
-                case customUrl = "CUSTOM"
-                case gitHub = "GITHUB"
-                case issueHunt = "ISSUEHUNT"
-                case koFi = "KO_FI"
-                case lfxCrowdfunding = "LFX_CROWDFUNDING"
-                case liberaPay = "LIBERAPAY"
-                case openCollective = "OPEN_COLLECTIVE"
-                case otechie = "OTECHIE"
-                case patreon = "PATREON"
-                case tideLift = "TIDELIFT"
-            }
-
-            var platform: Platform
-            var url: String
-        }
-
         struct IssueNodes: Decodable, Equatable {
             var nodes: [IssueNode]
 

Sources/App/Models/Repository.swift

@@ -57,9 +57,6 @@ final class Repository: Model, Content {
     @Field(key: "forks")
     var forks: Int
 
-    @Field(key: "funding_links")
-    var fundingLinks: [FundingLink]
-
     @Field(key: "homepage_url")
     var homepageUrl: String?
 
@@ -134,7 +131,6 @@ final class Repository: Model, Content {
          defaultBranch: String? = nil,
          firstCommitDate: Date? = nil,
          forks: Int = 0,
-         fundingLinks: [FundingLink] = [],
          forkedFrom: Repository? = nil,
          homepageUrl: String? = nil,
          isArchived: Bool = false,
@@ -167,7 +163,6 @@ final class Repository: Model, Content {
         if let forkId = forkedFrom?.id {
             self.$forkedFrom.id = forkId
         }
-        self.fundingLinks = fundingLinks
         self.homepageUrl = homepageUrl
         self.isArchived = isArchived
         self.isInOrganization = isInOrganization
@@ -197,7 +192,6 @@ final class Repository: Model, Content {
         self.defaultBranch = nil
         self.firstCommitDate = nil
         self.forks = 0
-        self.fundingLinks = []
         self.homepageUrl = nil
         self.isArchived = false
         self.isInOrganization = false

Sources/App/configure.swift

@@ -306,9 +306,6 @@ public func configure(_ app: Application) throws -> String {
     do { // Migration 069 - add builder_version to builds
         app.migrations.add(UpdateBuildAddBuilderVersion())
     }
-    do { // Migration 070 - Add `funding` JSON field to `repositories`
-        app.migrations.add(AddFundingToRepositories())
-    }
 
     app.commands.use(Analyze.Command(), as: "analyze")
     app.commands.use(CreateRestfileCommand(), as: "create-restfile")

Tests/AppTests/Fixtures/github-graphql-resource.json

@@ -614,16 +614,6 @@
       },
       "description": "Elegant HTTP Networking in Swift",
       "forkCount": 6727,
-      "fundingLinks": [
-        {
-          "platform": "GITHUB",
-          "url": "https://github.com/Alamofire"
-        },
-        {
-          "platform": "LFX_CROWDFUNDING",
-          "url": "https://crowdfunding.lfx.linuxfoundation.org/projects/alamofire"
-        }
-      ],
       "isArchived": false,
       "isFork": false,
       "licenseInfo": {

Tests/AppTests/GithubTests.swift

@@ -136,10 +136,6 @@ class GithubTests: AppTestCase {
         XCTAssertEqual(res.repository?.closedPullRequests.nodes.first!.closedAt,
                        iso8601.date(from: "2021-05-28T15:50:17Z"))
         XCTAssertEqual(res.repository?.forkCount, 6727)
-        XCTAssertEqual(res.repository?.fundingLinks, [
-            .init(platform: .gitHub, url: "https://github.com/Alamofire"),
-            .init(platform: .lfxCrowdfunding, url: "https://crowdfunding.lfx.linuxfoundation.org/projects/alamofire"),
-        ])
         XCTAssertEqual(res.repository?.mergedPullRequests.nodes.first!.closedAt,
                        iso8601.date(from: "2021-06-07T22:47:01Z"))
         XCTAssertEqual(res.repository?.name, "Alamofire")

Tests/AppTests/IngestorTests.swift

@@ -110,11 +110,6 @@ class IngestorTests: AppTestCase {
         let repo = Repository(packageId: try pkg.requireID())
         let md: Github.Metadata = .init(defaultBranch: "main",
                                         forks: 1,
-                                        fundingLinks: [
-                                            .init(platform: .gitHub, url: "https://github.com/username"),
-                                            .init(platform: .customUrl, url: "https://example.com/username1"),
-                                            .init(platform: .customUrl, url: "https://example.com/username2")
-                                        ],
                                         homepageUrl: "https://swiftpackageindex.com/Alamofire/Alamofire",
                                         isInOrganization: true,
                                         issuesClosedAtDates: [
@@ -158,11 +153,6 @@ class IngestorTests: AppTestCase {
             let repo = try await Repository.query(on: app.db).first().unwrap()
             XCTAssertEqual(repo.defaultBranch, "main")
             XCTAssertEqual(repo.forks, 1)
-            XCTAssertEqual(repo.fundingLinks, [
-                .init(platform: .gitHub, url: "https://github.com/username"),
-                .init(platform: .customUrl, url: "https://example.com/username1"),
-                .init(platform: .customUrl, url: "https://example.com/username2")
-            ])
             XCTAssertEqual(repo.homepageUrl, "https://swiftpackageindex.com/Alamofire/Alamofire")
             XCTAssertEqual(repo.isInOrganization, true)
             XCTAssertEqual(repo.keywords, ["bar", "baz", "foo"])

Tests/AppTests/Mocks/GithubMetadata+mock.swift

@@ -55,7 +55,6 @@ extension Github.Metadata {
 
     init(defaultBranch: String,
          forks: Int,
-         fundingLinks: [FundingLinkNode] = [],
          homepageUrl: String?,
          isInOrganization: Bool,
          issuesClosedAtDates: [Date],
@@ -82,7 +81,6 @@ extension Github.Metadata {
                               defaultBranchRef: .init(name: defaultBranch),
                               description: summary,
                               forkCount: forks,
-                              fundingLinks: fundingLinks,
                               homepageUrl: homepageUrl,
                               isArchived: false,
                               isFork: false,