add and use a projectId function

fossas · Sep 3, 2024 · c386165 · c386165
1 parent 2b07903
commit c386165
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/src/App/Fossa/API/BuildLink.hs b/src/App/Fossa/API/BuildLink.hs
@@ -18,7 +18,7 @@ import Data.Maybe (fromMaybe)
 import Data.Text (Text)
 import Data.Text.Extra (showT)
 import Fossa.API.Types (ApiOpts (..), Organization (..))
-import Srclib.Types (Locator (..))
+import Srclib.Types (Locator (..), projectId)
 import Text.URI qualified as URI
 import Text.URI.Builder (
  PathComponent (PathComponent),
@@ -31,10 +31,10 @@ import Text.URI.Builder (
 import Text.URI.QQ (uri)
 
 fossaProjectUrlPath :: Locator -> ProjectRevision -> [PathComponent]
-fossaProjectUrlPath Locator{..} ProjectRevision{..} = map PathComponent components
+fossaProjectUrlPath loc@Locator{..} ProjectRevision{..} = map PathComponent components
  where
  components = ["projects", project, "refs", "branch", branch, revision]
- project = locatorFetcher <> "+" <> locatorProject
+ project = projectId loc
  revision = fromMaybe projectRevision locatorRevision
  -- We default to master because core does, and we need a branch to allow us to
  -- create links directly to builds. If this changes, then a core change should

diff --git a/src/App/Fossa/Analyze/Upload.hs b/src/App/Fossa/Analyze/Upload.hs
@@ -70,6 +70,7 @@ import Srclib.Types (
  Locator (..),
  SourceUnit,
  licenseUnitToFullSourceUnit,
+ projectId,
  renderLocator,
  sourceUnitToFullSourceUnit,
  )
@@ -210,7 +211,7 @@ buildProjectSummary project locator projectUrl = do
  pure $
  Aeson.object
  [ "project" .= locatorProject locator
- , "projectId" .= (locatorFetcher locator <> "+" <> locatorProject locator)
+ , "projectId" .= projectId locator
  , "revision" .= revision
  , "branch" .= projectBranch project
  , "url" .= projectUrl

diff --git a/src/Srclib/Types.hs b/src/Srclib/Types.hs
@@ -20,6 +20,7 @@ module Srclib.Types (
  renderLocator,
  parseLocator,
  pathToOriginPath,
+ projectId,
  someBaseToOriginPath,
  somePathToOriginPath,
  emptyLicenseUnit,
@@ -410,6 +411,10 @@ renderLocator :: Locator -> Text
 renderLocator Locator{..} =
  locatorFetcher <> "+" <> locatorProject <> "$" <> fromMaybe "" locatorRevision
 
+projectId :: Locator -> Text
+projectId Locator{..} =
+ locatorFetcher <> "+" <> locatorProject
+
 parseLocator :: Text -> Locator
 parseLocator raw = Locator fetcher project (if Text.null revision then Nothing else Just revision)
  where