diff --git a/src/Database/Queries.hs b/src/Database/Queries.hs index e5f52ad..8243d87 100644 --- a/src/Database/Queries.hs +++ b/src/Database/Queries.hs @@ -19,7 +19,7 @@ import Model ( Metric (Metric), PkgDependency (..), PkgRecord (PkgRecord), - VersionRecord (VersionRecord), VersionPlatform (VersionPlatform), EntityField (VersionPlatformPkgId, VersionPlatformVersionNumber, VersionPlatformArch), + VersionRecord (VersionRecord), VersionPlatform (VersionPlatform), EntityField (VersionPlatformPkgId, VersionPlatformVersionNumber, VersionPlatformArch), PkgRecordId, ) import Orphans.Emver () import Startlude ( @@ -286,14 +286,14 @@ fetchAppVersion :: MonadIO m => PkgId -> Version -> ReaderT SqlBackend m (Maybe fetchAppVersion pkgId version = get (VersionRecordKey (PkgRecordKey pkgId) version) -fetchLatestApp :: MonadIO m => PkgId -> ReaderT SqlBackend m (Maybe (P.Entity PkgRecord, P.Entity VersionRecord)) +fetchLatestApp :: MonadIO m => PkgRecordId -> ReaderT SqlBackend m (Maybe (P.Entity PkgRecord, P.Entity VersionRecord)) fetchLatestApp appId = fmap headMay . sortResults . select $ do (service :& version) <- from $ table @PkgRecord `innerJoin` table @VersionRecord `on` (\(service :& version) -> service ^. PkgRecordId ==. version ^. VersionRecordPkgId) - where_ (service ^. PkgRecordId ==. val (PkgRecordKey appId)) + where_ (service ^. PkgRecordId ==. val appId) pure (service, version) where sortResults = fmap $ sortOn (Down . versionRecordNumber . entityVal . snd) diff --git a/src/Settings.hs b/src/Settings.hs index 02bf7e7..decf434 100644 --- a/src/Settings.hs +++ b/src/Settings.hs @@ -111,8 +111,8 @@ instance FromJSON AppSettings where appShouldLogAll <- o .:? "should-log-all" .!= False errorLogRoot <- o .: "error-log-root" marketplaceName <- o .: "marketplace-name" - maxOsVersion <- o .: "max-eos-version" - minOsVersion <- o .: "min-eos-version" + maxOsVersion <- o .: "max-eos-version" + minOsVersion <- o .: "min-eos-version" registryHostname <- o .: "registry-hostname" resourcesDir <- o .: "resources-path" needsMigration <- o .: "run-migration"