feat: add transferredOrRegistered name sort

package.json

@@ -1,6 +1,6 @@
 {
   "name": "krist",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "The new Krist node written in TypeScript.",
   "main": "dist/src/index.js",
   "scripts": {

src/krist/names/lookup.ts

@@ -19,7 +19,7 @@
  * For more project information, see <https://github.com/tmpim/krist>.
  */
 
-import { Limit, Offset, Name, PaginatedResult } from "../../database";
+import { Limit, Offset, Name, PaginatedResult, db } from "../../database";
 import { InferAttributes, Op } from "sequelize";
 
 import { sanitiseLimit, sanitiseOffset } from "../../utils";
@@ -28,11 +28,20 @@ export async function lookupNames(
   addressList: string[] | undefined,
   limit: Limit,
   offset: Offset,
-  orderBy: keyof InferAttributes<Name> = "name",
+  orderBy: (keyof InferAttributes<Name>) | "transferredOrRegistered" = "name",
   order: "ASC" | "DESC" = "ASC"
 ): Promise<PaginatedResult<Name>> {
   return Name.findAndCountAll({
-    order: [[orderBy, order]],
+    order: [[
+      // Ordering by `transferred` can return null results and may not be the
+      // desireable ordering for the user, so `transferredOrRegistered` is an
+      // alternative option that falls back to `registered` if `transferred` is
+      // null.
+      orderBy === "transferredOrRegistered"
+        ? db.fn("COALESCE", db.col("transferred"), db.col("registered"))
+        : orderBy,
+      order
+    ]],
     limit: sanitiseLimit(limit),
     offset: sanitiseOffset(offset),
     where: addressList ? { owner: {[Op.in]: addressList} } : undefined,

src/webserver/routes/lookup/index.ts

@@ -42,9 +42,11 @@ export const TRANSACTION_FIELDS: TransactionLookupFields[] = ["id", "from",
   "to", "value", "time", "sent_name", "sent_metaname"];
 // Valid fields to order name lookups by
 export type NameLookupFields = "name" | "owner" | "original_owner" |
-  "registered" | "updated" | "transferred" | "a" | "unpaid";
+  "registered" | "updated" | "transferred" | "transferredOrRegistered" | "a" |
+  "unpaid";
 export const NAME_FIELDS: NameLookupFields[] = ["name", "owner",
-  "original_owner", "registered", "updated", "transferred", "a", "unpaid"];
+  "original_owner", "registered", "updated", "transferred",
+  "transferredOrRegistered", "a", "unpaid"];
 
 export type LookupQuery<T = unknown> = ReqQuery<{
   limit?: string;

src/webserver/routes/lookup/names.ts

@@ -55,7 +55,8 @@ export default (): Router => {
 	 * @apiUse LimitOffset
 	 * @apiQuery {String} [orderBy=name] The field to order the
    *           results by. Must be one of `name`, `owner`, `original_owner`,
-   *           `registered` `updated`, `transferred`, `a` or `unpaid`.
+   *           `registered` `updated`, `transferred`, `transferredOrRegistered`,
+   *           `a` or `unpaid`.
 	 * @apiQuery {String} [order=ASC] The direction to order
    *           the results in. Must be one of `ASC` or `DESC`.
    *