feat: /api/jewellery GET - add sort, count

handler/jewellery.go

@@ -5,6 +5,9 @@ import (
 	"burmese_jewellery/models"
 	"burmese_jewellery/orm"
 	"burmese_jewellery/query"
+	"burmese_jewellery/tx"
+	"database/sql"
+	"fmt"
 
 	"net/http"
 
@@ -13,27 +16,44 @@ import (
 )
 
 func (h *Handler) GetApiJewellery(c *gin.Context, params models.GetApiJewelleryParams) {
-	qList := []qm.QueryMod{
-		qm.Offset(params.Offset),
-		qm.Limit(params.Limit),
-		qm.OrderBy("created_at ASC"),
-	}
-	qList = query.EqUUID(qList, params.Id, orm.JewelleryColumns.JewelleryID)
-	qList = query.EqUUID(qList, params.CategoryId, orm.JewelleryColumns.CategoryID)
-	qList = query.EqUUID(qList, params.GemId, orm.JewelleryColumns.GemID)
-	qList = query.EqUUID(qList, params.MaterialId, orm.JewelleryColumns.MaterialID)
-	qList = query.Like(qList, params.Name, orm.JewelleryColumns.Name)
-	qList = query.Eq(qList, params.IsPublished, orm.JewelleryColumns.IsPublished)
-
-	list, err := orm.Jewelleries(qList...).AllG(c)
-	if err != nil {
-		ers.InternalServer.New(err).Abort(c)
-		return
-	}
+	var resp GetResp
 
-	resp, err := models.ConvListFromORM(list, models.ConvJewelleryFromORM)
-	if err != nil {
-		ers.InternalServer.New(err).Abort(c)
+	if err := tx.Write(c, func(tx *sql.Tx) *ers.ErrResp {
+		qList := []qm.QueryMod{}
+		qList = query.EqUUID(qList, params.Id, orm.JewelleryColumns.JewelleryID)
+		qList = query.EqUUID(qList, params.CategoryId, orm.JewelleryColumns.CategoryID)
+		qList = query.EqUUID(qList, params.GemId, orm.JewelleryColumns.GemID)
+		qList = query.EqUUID(qList, params.MaterialId, orm.JewelleryColumns.MaterialID)
+		qList = query.Like(qList, params.Name, orm.JewelleryColumns.Name)
+		qList = query.Eq(qList, params.IsPublished, orm.JewelleryColumns.IsPublished)
+		count, err := orm.Jewelleries(qList...).Count(c, tx)
+		if err != nil {
+			return ers.InternalServer.New(err)
+		}
+		resp.Count = count
+
+		sort := models.Desc
+		if v := params.Sort; v != nil {
+			sort = *v
+		}
+		qList = append(qList, []qm.QueryMod{
+			qm.Offset(params.Offset),
+			qm.Limit(params.Limit),
+			qm.OrderBy(fmt.Sprintf("%s %s", orm.AccountColumns.CreatedAt, string(sort))),
+		}...)
+		list, err := orm.Jewelleries(qList...).AllG(c)
+		if err != nil {
+			return ers.InternalServer.New(err)
+		}
+
+		data, err := models.ConvListFromORM(list, models.ConvJewelleryFromORM)
+		if err != nil {
+			return ers.InternalServer.New(err)
+		}
+		resp.Data = data
+
+		return nil
+	}); err != nil {
 		return
 	}
 

swagger/paths.yml

@@ -386,6 +386,10 @@
         name: is_published
         schema:
           type: boolean
+      - in: query
+        name: sort
+        schema:
+          $ref: "#/components/schemas/Sort"
     responses:
       200:
         description: OK

swagger/static/index.html

@@ -1849,6 +1849,8 @@ <h3 class="field-label">Query parameters</h3>
 
             <div class="param-desc"><span class="param-type">Query Parameter</span> &mdash;  </div>      <div class="param">is_published (optional)</div>
 
+            <div class="param-desc"><span class="param-type">Query Parameter</span> &mdash;  </div>      <div class="param">sort (optional)</div>
+
             <div class="param-desc"><span class="param-type">Query Parameter</span> &mdash;  </div>    </div>  <!-- field-items -->
 
 

swagger/swagger.yml

@@ -399,6 +399,10 @@ paths:
           name: is_published
           schema:
             type: boolean
+        - in: query
+          name: sort
+          schema:
+            $ref: '#/components/schemas/Sort'
       responses:
         200:
           description: OK