Disconnect FundingLink type from GH specific internal representation

SwiftPackageIndex · Nov 15, 2023 · b7bd083 · b7bd083
1 parent 15de8ce
commit b7bd083
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 14 deletions.
diff --git a/Sources/App/Commands/Ingest.swift b/Sources/App/Commands/Ingest.swift
@@ -200,7 +200,7 @@ func updateRepository(on database: Database,
 
     repository.defaultBranch = repoMetadata.defaultBranch
     repository.forks = repoMetadata.forkCount
-    repository.fundingLinks = repoMetadata.fundingLinks ?? []
+    repository.fundingLinks = repoMetadata.fundingLinks?.map(FundingLink.init(from:)) ?? []
     repository.homepageUrl = repoMetadata.homepageUrl?.trimmed
     repository.isArchived = repoMetadata.isArchived
     repository.isInOrganization = repoMetadata.isInOrganization

diff --git a/Sources/App/Core/Github.swift b/Sources/App/Core/Github.swift
@@ -342,7 +342,7 @@ extension Github {
             var defaultBranchRef: DefaultBranchRef?
             var description: String?
             var forkCount: Int
-            var fundingLinks: [FundingLink]?
+            var fundingLinks: [FundingLinkNode]?
             var homepageUrl: String?
             var isArchived: Bool
             // periphery:ignore
@@ -370,6 +370,25 @@ extension Github {
             }
         }
 
+        struct FundingLinkNode: Codable, Equatable {
+            enum Platform: String, Codable {
+                case communityBridge = "COMMUNITYBRIDGE"
+                case customUrl = "CUSTOMURL"
+                case gitHub = "GITHUB"
+                case issueHunt = "ISSUEHUNT"
+                case koFi = "KOFI"
+                case lfxCrowdfunding = "LFXCROWDFUNDING"
+                case liberaPay = "LIBERAPAY"
+                case openCollective = "OPENCOLLECTIVE"
+                case otechie = "OTECHIE"
+                case patreon = "PATREON"
+                case tideLift = "TIDELIFT"
+            }
+
+            var platform: Platform
+            var url: String
+        }
+
         struct IssueNodes: Decodable, Equatable {
             var nodes: [IssueNode]
 

diff --git a/Sources/App/Models/FundingLink.swift b/Sources/App/Models/FundingLink.swift
@@ -17,19 +17,57 @@ import Foundation
 
 struct FundingLink: Codable, Equatable {
     enum Platform: String, Codable {
-        case communityBridge = "COMMUNITYBRIDGE"
-        case customUrl = "CUSTOMURL"
-        case gitHub = "GITHUB"
-        case issueHunt = "ISSUEHUNT"
-        case koFi = "KOFI"
-        case lfxCrowdfunding = "LFXCROWDFUNDING"
-        case liberaPay = "LIBERAPAY"
-        case openCollective = "OPENCOLLECTIVE"
-        case otechie = "OTECHIE"
-        case patreon = "PATREON"
-        case tideLift = "TIDELIFT"
+        case communityBridge
+        case customUrl
+        case gitHub
+        case issueHunt
+        case koFi
+        case lfxCrowdfunding
+        case liberaPay
+        case openCollective
+        case otechie
+        case patreon
+        case tideLift
     }
 
     var platform: Platform
     var url: String
 }
+
+
+extension FundingLink {
+    init(from node: Github.Metadata.FundingLinkNode) {
+        platform = .init(from: node.platform)
+        url = node.url
+    }
+}
+
+
+extension FundingLink.Platform {
+    init(from platform: Github.Metadata.FundingLinkNode.Platform) {
+        switch platform {
+            case .communityBridge:
+                self = .communityBridge
+            case .customUrl:
+                self = .customUrl
+            case .gitHub:
+                self = .gitHub
+            case .issueHunt:
+                self = .issueHunt
+            case .koFi:
+                self = .koFi
+            case .lfxCrowdfunding:
+                self = .lfxCrowdfunding
+            case .liberaPay:
+                self = .liberaPay
+            case .openCollective:
+                self = .openCollective
+            case .otechie:
+                self = .otechie
+            case .patreon:
+                self = .patreon
+            case .tideLift:
+                self = .tideLift
+        }
+    }
+}
diff --git a/Tests/AppTests/Mocks/GithubMetadata+mock.swift b/Tests/AppTests/Mocks/GithubMetadata+mock.swift
@@ -55,7 +55,7 @@ extension Github.Metadata {
 
     init(defaultBranch: String,
          forks: Int,
-         fundingLinks: [FundingLink] = [],
+         fundingLinks: [FundingLinkNode] = [],
          homepageUrl: String?,
          isInOrganization: Bool,
          issuesClosedAtDates: [Date],