Add advisories to hie.yaml

cabal.project

@@ -44,7 +44,6 @@ source-repository-package
       ./code/hsec-sync
       ./code/hsec-tools
 
-
 source-repository-package
     type: git
     location: https://github.com/scrive/tracing

hie.yaml

@@ -1,12 +1,15 @@
 cradle:
   cabal:
-    - path: "././src/core"
+    - path: "./src/core"
       component: "lib:flora"
 
-    - path: "././src/datatypes"
+    - path: "./src/datatypes"
       component: "lib:flora"
 
-    - path: "././src/web"
+    - path: "./src/advisories"
+      component: "lib:flora"
+
+    - path: "./src/web"
       component: "flora:lib:flora-web"
 
     - path: "./src/jobs-worker"

src/advisories/Advisories/Import.hs

@@ -113,7 +113,7 @@ processAffectedPackage advisoryId affected = do
         case affected.affectedComponentIdentifier of
           Hackage affectedPackageName -> PackageName affectedPackageName
           GHC _ -> PackageName "ghc"
-  let namespace = chooseNamespace packageName "hackage" Set.empty
+  let namespace = chooseNamespace packageName ("hackage", Set.empty)
   package <- guardThatPackageExists namespace packageName $ \_ _ ->
     throwError (NonEmpty.singleton $ AffectedPackageNotFound namespace packageName)
   let declarations =
@@ -154,8 +154,8 @@ processAffectedVersionRanges affectedPackageId packageId affectedVersions = do
         mFixedReleaseId <- case affectedVersion.affectedVersionRangeFixed of
           Nothing -> pure Nothing
           Just version -> do
-            release <- guardThatReleaseExists packageId version $ \version ->
-              throwError (NonEmpty.singleton $ AffectedVersionNotFound packageId version)
+            release <- guardThatReleaseExists packageId version $ \releaseVersion ->
+              throwError (NonEmpty.singleton $ AffectedVersionNotFound packageId releaseVersion)
             pure $ Just release.releaseId
         let versionRangeDAO =
               AffectedVersionRangeDAO

test/Flora/PackageSpec.hs

@@ -203,7 +203,7 @@ testGetNonDeprecatedPackages = do
 testReleaseDeprecation :: TestEff ()
 testReleaseDeprecation = do
   result <- Query.getHackagePackagesWithoutReleaseDeprecationInformation
-  assertEqual 78 (length result)
+  assertEqual 79 (length result)
 
   binary <- fromJust <$> Query.getPackageByNamespaceAndName (Namespace "haskell") (PackageName "binary")
   deprecatedBinaryVersion' <- assertJust =<< Query.getReleaseByVersion binary.packageId (mkVersion [0, 10, 0, 0])