Skip to content

2026-08-10 hotfix upsert package uploaders #1288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tchoutri merged 1 commit into from
Oct 8, 2026
Merged

2026-08-10 hotfix upsert package uploaders #1288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/core/Flora/Domain/Import/Types.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ data ImportError
| CouldNotSelectNamespace Text PackageName
| CouldNotFindPackageIndexForRelease ReleaseId
| CouldNotFindPackageIndex Text
| CouldNotFindPackageUploader Text Namespace
| CouldNotFindPackage Namespace PackageName
| MarkdownRenderingError PandocError
| NoImportableComponents Namespace PackageName Version
Expand All @@ -46,7 +45,6 @@ importErrorReason = \case
CouldNotSelectNamespace{} -> "namespace-not-found"
CouldNotFindPackageIndexForRelease{} -> "package-index-not-found"
CouldNotFindPackageIndex{} -> "package-index-not-found"
CouldNotFindPackageUploader{} -> "package-uploader-not-found"
CouldNotFindPackage{} -> "package-not-found"
MarkdownRenderingError{} -> "markdown-rendering-error"
NoImportableComponents{} -> "no-importable-components"
Expand Down
18 changes: 6 additions & 12 deletions src/jobs-worker/FloraJobs/Runner.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ import Flora.Model.PackageIndex.Query qualified as Query
import Flora.Model.PackageIndex.Types
import Flora.Model.PackageMaintainer.Types
import Flora.Model.PackageMaintainer.Update qualified as Update
import Flora.Model.PackageUploader.Guard
import Flora.Model.PackageUploader.Types
import Flora.Model.PackageUploader.Update qualified as Update
import Flora.Model.Release.Query qualified as Query
Expand Down Expand Up @@ -395,17 +394,12 @@ fetchPackageMaintainers packageName = do
package <-
guardThatPackageExists pool namespace packageName
>>= maybe (Error.throwError (CouldNotFindPackage namespace packageName)) pure
packageUploaders <-
forM (Vector.toList maintainers) $ \(HackagePackageMaintainer username) ->
guardThatPackageUploaderExists
pool
username
packageIndex.packageIndexId
(Error.throwError (CouldNotFindPackageUploader username namespace))
packageMaintainerDAOs <- forM packageUploaders $ \packageUploader ->
mkPackageMaintainer
packageUploader.packageUploaderId
package.packageId
packageUploaderIds <-
withReadWritePool pool $
forM (Vector.toList maintainers) $ \(HackagePackageMaintainer username) ->
Update.getOrInsertPackageUploader username packageIndex.packageIndexId
packageMaintainerDAOs <- forM packageUploaderIds $ \packageUploaderId ->
mkPackageMaintainer packageUploaderId package.packageId
withReadWritePool pool $ Update.insertPackageMaintainers packageMaintainerDAOs
where
handleClientError :: ClientError -> JobsRunner a
Expand Down
Loading