Fix to use gojq to run on mac (#77)

- Remove duplicated code for `if else softDelete` cases Fixes #64

Author: krishnamiriyala

build/install_tools.sh

@@ -14,6 +14,7 @@ GOMRK_VERSION=${GOMRK_VERSION:=1.1.0}
 SHFMT_VERSION=${SHFMT_VERSION:=3.6.0}
 GOIMP_VERSION=${GOIMP_VERSION:=0.5.0}
 GOIMPORTS_REVISER_VERSION=${GOIMPORTS_REVISER_VERSION:=3.4.2}
+GOJQ_VERSION=${GOJQ_VERSION:=0.12.13}
 TYPOS_VERSION=${TYPOS_VERSION:=1.13.6}
 ADDLICENSE_VERSION=${ADDLICENSE_VERSION:=1.1.1}
 CODEOWNERS_VALIDATOR_VERSION=${CODEOWNERS_VALIDATOR_VERSION:=0.7.4}
@@ -34,6 +35,7 @@ go version | grep '1.19\|1.20\|1.21' || (
   exit 1
 )
 go_install "dlv version" ${GODLV_VERSION} github.com/go-delve/delve/cmd/dlv
+go_install "gojq --version" ${GOJQ_VERSION} github.com/itchyny/gojq/cmd/gojq
 go_install "golangci-lint version" ${GOLNT_VERSION} github.com/golangci/golangci-lint/cmd/golangci-lint
 go_install "gomarkdoc --version" ${GOMRK_VERSION} github.com/princjef/gomarkdoc/cmd/gomarkdoc
 go_install "shfmt -version" ${SHFMT_VERSION} mvdan.cc/sh/v3/cmd/shfmt

build/setup_local_postgres.sh

@@ -33,7 +33,7 @@ elif [[ $(uname -s) == "Darwin" ]]; then
     brew install postgresql@14
     brew services restart postgresql@14
     sleep 5
-    brew services info postgresql@14 --json | jq '.[0].running' | grep true
+    brew services info postgresql@14 --json | gojq '.[0].running' | grep true
     echo "postgresql: Installation successful"
   fi
   dropdb tmp_db --if-exists

pkg/datastore/database.go

@@ -255,21 +255,14 @@ func (db *relationalDb) FindInTable(ctx context.Context, tableName string, recor
 	}()
 
 	if softDelete {
-		if err = tx.Unscoped().Table(tableName).Where(record).First(record).Error; err != nil {
-			if errors.Is(err, gorm.ErrRecordNotFound) {
-				return ErrRecordNotFound.Wrap(err).WithValue("record", fmt.Sprintf("%+v", record)).WithValue(DB_NAME, db.dbName)
-			}
-			db.logger.Debug(err)
-			return ErrExecutingSqlStmt.Wrap(err).WithValue(DB_NAME, db.dbName)
-		}
-	} else {
-		if err = tx.Table(tableName).Where(record).First(record).Error; err != nil {
-			if errors.Is(err, gorm.ErrRecordNotFound) {
-				return ErrRecordNotFound.Wrap(err).WithValue("record", fmt.Sprintf("%+v", record)).WithValue(DB_NAME, db.dbName)
-			}
-			db.logger.Debug(err)
-			return ErrExecutingSqlStmt.Wrap(err).WithValue(DB_NAME, db.dbName)
+		tx = tx.Unscoped()
+	}
+	if err = tx.Table(tableName).Where(record).First(record).Error; err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return ErrRecordNotFound.Wrap(err).WithValue("record", fmt.Sprintf("%+v", record)).WithValue(DB_NAME, db.dbName)
 		}
+		db.logger.Debug(err)
+		return ErrExecutingSqlStmt.Wrap(err).WithValue(DB_NAME, db.dbName)
 	}
 	return db.commitWhenTxNotInsideCtx(ctx, tx)
 }
@@ -320,15 +313,11 @@ func (db *relationalDb) FindWithFilterInTable(ctx context.Context, tableName str
 	}
 
 	if softDelete {
-		if err = tx.Unscoped().Table(tableName).Where(record).Error; err != nil {
-			db.logger.Debug(err)
-			return ErrExecutingSqlStmt.Wrap(err).WithValue(DB_NAME, db.dbName)
-		}
-	} else {
-		if err = tx.Table(tableName).Where(record).Error; err != nil {
-			db.logger.Debug(err)
-			return ErrExecutingSqlStmt.Wrap(err).WithValue(DB_NAME, db.dbName)
-		}
+		tx = tx.Unscoped()
+	}
+	if err = tx.Table(tableName).Where(record).Error; err != nil {
+		db.logger.Debug(err)
+		return ErrExecutingSqlStmt.Wrap(err).WithValue(DB_NAME, db.dbName)
 	}
 
 	if pagination != nil {
@@ -338,16 +327,9 @@ func (db *relationalDb) FindWithFilterInTable(ctx context.Context, tableName str
 		}
 	}
 
-	if softDelete {
-		if err = tx.Unscoped().Find(records).Error; err != nil {
-			db.logger.Debug(err)
-			return ErrExecutingSqlStmt.Wrap(err).WithValue(DB_NAME, db.dbName)
-		}
-	} else {
-		if err = tx.Find(records).Error; err != nil {
-			db.logger.Debug(err)
-			return ErrExecutingSqlStmt.Wrap(err).WithValue(DB_NAME, db.dbName)
-		}
+	if err = tx.Find(records).Error; err != nil {
+		db.logger.Debug(err)
+		return ErrExecutingSqlStmt.Wrap(err).WithValue(DB_NAME, db.dbName)
 	}
 
 	return db.commitWhenTxNotInsideCtx(ctx, tx)
@@ -426,16 +408,12 @@ func (db *relationalDb) delete(ctx context.Context, tableName string, record Rec
 		}
 	}()
 
-	if softDelete {
-		if err = tx.Delete(record).Error; err != nil {
-			db.logger.Debug(err)
-			return 0, ErrExecutingSqlStmt.Wrap(err).WithValue(DB_NAME, db.dbName)
-		}
-	} else {
-		if err = tx.Unscoped().Delete(record).Error; err != nil {
-			db.logger.Debug(err)
-			return 0, ErrExecutingSqlStmt.Wrap(err).WithValue(DB_NAME, db.dbName)
-		}
+	if !softDelete {
+		tx = tx.Unscoped()
+	}
+	if err = tx.Delete(record).Error; err != nil {
+		db.logger.Debug(err)
+		return 0, ErrExecutingSqlStmt.Wrap(err).WithValue(DB_NAME, db.dbName)
 	}
 	err = db.commitWhenTxNotInsideCtx(ctx, tx)
 	if err != nil {