Merge pull request #166 from unisoncomputing/cp/pretty-ordering

ChrisPenner · web-flow · commit ad2ec5dbf5e8 · 2025-12-09T16:42:37.000-08:00
Better ordering of constructors, let-recs and constructors in diffs
diff --git a/share-api/src/Share/Postgres/Queries.hs b/share-api/src/Share/Postgres/Queries.hs
@@ -289,7 +289,7 @@ listProjectsByUserWithMetadata callerUserId projectOwnerUserId = do
 listProjectsFromCatalogWithMetadata ::
   Maybe UserId ->
   -- | (project, numFavs, isFavedByCaller)
-  PG.Transaction e (Map CategoryName [(Project, FavData, ProjectOwner)])
+  PG.Transaction e (Map CategoryName (NonEmpty (Project, FavData, ProjectOwner)))
 listProjectsFromCatalogWithMetadata callerUserId = do
   projects :: [(Project PG.:. PG.Only CategoryName PG.:. FavData PG.:. ProjectOwner)] <- PG.queryListRows sql
   projects
diff --git a/share-api/src/Share/Web/Share/Projects/Types.hs b/share-api/src/Share/Web/Share/Projects/Types.hs
@@ -377,7 +377,7 @@ instance Aeson.FromJSON FavProjectRequest where
 
 data CatalogCategory = CatalogCategory
   { name :: CategoryName,
-    projects :: [APIProject :++ FavData]
+    projects :: NonEmpty (APIProject :++ FavData)
   }
   deriving (Show)
 
diff --git a/unison b/unison
@@ -1 +1 @@
-Subproject commit d884da2a6bfd0f78b920cf08f583ddeadaaa5c02
+Subproject commit 83f808c39e129559e08d2f9e26e7361e48e5f047

Original file line number	Diff line number	Diff line change
`@@ -377,7 +377,7 @@ instance Aeson.FromJSON FavProjectRequest where`
`377`	`377`
`378`	`378`	`data CatalogCategory = CatalogCategory`
`379`	`379`	`{ name :: CategoryName,`
`380`		`- projects :: [APIProject :++ FavData]`
	`380`	`+ projects :: NonEmpty (APIProject :++ FavData)`
`381`	`381`	`}`
`382`	`382`	`deriving (Show)`
`383`	`383`