merge sprint 7 and resolve conflict

internal/utils/constant.go

@@ -177,17 +177,33 @@ var ProjectFlockApprovalSteps = map[approvalutils.ApprovalStep]string{
 }
 
 // -------------------------------------------------------------------
-// Project Flock Kandang Approval
+// Chickin Approval
+// -------------------------------------------------------------------
+const (
+	ApprovalWorkflowChickin approvalutils.ApprovalWorkflowKey = approvalutils.ApprovalWorkflowKey("CHICKINS")
+	ChickinStepPengajuan    approvalutils.ApprovalStep        = 1
+	ChickinStepDisetujui    approvalutils.ApprovalStep        = 2
+)
+
+var ChickinApprovalSteps = map[approvalutils.ApprovalStep]string{
+	ChickinStepPengajuan: "Pengajuan",
+	ChickinStepDisetujui: "Disetujui",
+}
+
+// -------------------------------------------------------------------
+// Project-Flock kandang Approval
 // -------------------------------------------------------------------
 const (
 	ApprovalWorkflowProjectFlockKandang approvalutils.ApprovalWorkflowKey = approvalutils.ApprovalWorkflowKey("PROJECT_FLOCK_KANDANGS")
 	ProjectFlockKandangStepPengajuan    approvalutils.ApprovalStep        = 1
 	ProjectFlockKandangStepDisetujui    approvalutils.ApprovalStep        = 2
+	ProjectFlockKandangStepClosed       approvalutils.ApprovalStep        = 3
 )
 
 var ProjectFlockKandangApprovalSteps = map[approvalutils.ApprovalStep]string{
 	ProjectFlockKandangStepPengajuan: "Pengajuan",
 	ProjectFlockKandangStepDisetujui: "Disetujui",
+	ProjectFlockKandangStepClosed:    "Selesai",
 }
 
 // -------------------------------------------------------------------

internal/utils/error.go

@@ -25,3 +25,16 @@ func ErrorHandler(c *fiber.Ctx, err error) error {
 func NotFoundHandler(c *fiber.Ctx) error {
 	return response.Error(c, fiber.StatusNotFound, "Endpoint Not Found", nil)
 }
+
+
+func BadRequest(msg string) error {
+	return fiber.NewError(fiber.StatusBadRequest, msg)
+}
+
+func NotFound(msg string) error {
+	return fiber.NewError(fiber.StatusNotFound, msg)
+}
+
+func Internal(msg string) error {
+	return fiber.NewError(fiber.StatusInternalServerError, msg)
+}