Feature/delete and update

.github/workflows/CI.yml

@@ -167,3 +167,21 @@ jobs:
         with:
           name: docker-compose-e2e-logs
           path: app.log
+
+  sonarcloud:
+    name: SonarCloud
+    needs: [check-style, integration-tests]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Download line coverage reports
+        uses: actions/download-artifact@v3
+        with:
+          name: coverage
+      - name: SonarCloud Scan
+        uses: sonarsource/sonarcloud-github-action@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

cli/cmd/gen/conditions/condition.go

@@ -10,20 +10,16 @@ import (
 )
 
 const (
-	// badaas/orm
-	badaasORMFieldIs       = "FieldIs"
-	badaasORMBoolFieldIs   = "BoolFieldIs"
-	badaasORMStringFieldIs = "StringFieldIs"
-	// badaas/orm/condition
-	conditionPath                 = badaasORMPath + "/condition"
+	// badaas/orm/cql
+	cqlPath                       = badaasORMPath + "/cql"
 	badaasORMCondition            = "Condition"
 	badaasORMJoinCondition        = "JoinCondition"
 	badaasORMNewJoinCondition     = "NewJoinCondition"
 	badaasORMNewCollectionPreload = "NewCollectionPreloadCondition"
 	badaasORMNewPreloadCondition  = "NewPreloadCondition"
-	// badaas/orm/query
-	queryPath                = badaasORMPath + "/query"
-	badaasORMFieldIdentifier = "FieldIdentifier"
+	badaasORMField                = "Field"
+	badaasORMBoolField            = "BoolField"
+	badaasORMStringField          = "StringField"
 	// badaas/orm/model
 	modelPath = badaasORMPath + "/model"
 	uIntID    = "UIntID"
@@ -65,7 +61,7 @@ func (condition *Condition) generate(objectType Type, field Field) {
 		// the field is a basic type (string, int, etc)
 		// adapt param to that type and generate a WhereCondition
 		condition.param.ToBasicKind(fieldType)
-		condition.generateWhere(
+		condition.createField(
 			objectType,
 			field,
 		)
@@ -135,7 +131,7 @@ func (condition *Condition) generateForNamedType(objectType Type, field Field) {
 	case field.Type.IsSQLNullableType():
 		// field is a sql nullable type (sql.NullBool, sql.NullInt, etc.)
 		condition.param.SQLToBasicType(field.Type)
-		condition.generateWhere(
+		condition.createField(
 			objectType,
 			field,
 		)
@@ -144,7 +140,7 @@ func (condition *Condition) generateForNamedType(objectType Type, field Field) {
 		// or a named type supported by gorm (time.Time)
 		// or a badaas-orm id (uuid or uintid)
 		condition.param.ToCustomType(condition.destPkg, field.Type)
-		condition.generateWhere(
+		condition.createField(
 			objectType,
 			field,
 		)
@@ -171,54 +167,6 @@ func (condition *Condition) generateForBadaasModel(objectType Type, field Field)
 	}
 }
 
-// Generate a WhereCondition between object and field
-func (condition *Condition) generateWhere(objectType Type, field Field) {
-	objectTypeQual := jen.Qual(
-		getRelativePackagePath(condition.destPkg, objectType),
-		objectType.Name(),
-	)
-
-	conditionName := getConditionName(field) + "Is"
-	log.Logger.Debugf("Generated %q", conditionName)
-
-	condition.createFieldIdentifier(
-		objectType.Name(), field,
-	)
-
-	fieldIs := jen.Qual(
-		badaasORMPath, badaasORMFieldIs,
-	).Types(
-		objectTypeQual,
-		condition.param.GenericType(),
-	)
-
-	fieldIsCreationValues := jen.Dict{
-		jen.Id("FieldID"): jen.Id(condition.modelType).Dot(field.CompleteName()),
-	}
-
-	if condition.param.isString {
-		fieldIsCreationValues = jen.Dict{
-			jen.Id("FieldIs"): fieldIs.Clone().Values(fieldIsCreationValues),
-		}
-		fieldIs = jen.Qual(
-			badaasORMPath, badaasORMStringFieldIs,
-		).Types(objectTypeQual)
-	} else if condition.param.isBool {
-		fieldIsCreationValues = jen.Dict{
-			jen.Id("FieldIs"): fieldIs.Clone().Values(fieldIsCreationValues),
-		}
-		fieldIs = jen.Qual(
-			badaasORMPath, badaasORMBoolFieldIs,
-		).Types(objectTypeQual)
-	}
-
-	condition.ConditionMethod = createMethod(condition.modelType, conditionName).Params().Add(
-		fieldIs,
-	).Block(
-		jen.Return(fieldIs.Clone().Values(fieldIsCreationValues)),
-	)
-}
-
 func createMethod(typeName, methodName string) *jen.Statement {
 	return jen.Func().Params(
 		jen.Id(typeName).Id(typeName),
@@ -227,34 +175,54 @@ func createMethod(typeName, methodName string) *jen.Statement {
 
 // create a variable containing the definition of the field identifier
 // to use it in the where condition and in the preload condition
-func (condition *Condition) createFieldIdentifier(objectName string, field Field) {
-	fieldIdentifierValues := jen.Dict{
-		jen.Id("ModelType"): jen.Id(getObjectTypeName(objectName)),
-		jen.Id("Field"):     jen.Lit(field.Name),
+func (condition *Condition) createField(objectType Type, field Field) {
+	fieldValues := jen.Dict{
+		jen.Id("Name"): jen.Lit(field.Name),
 	}
 
 	columnName := field.getColumnName()
 
 	if columnName != "" {
-		fieldIdentifierValues[jen.Id("Column")] = jen.Lit(columnName)
+		fieldValues[jen.Id("Column")] = jen.Lit(columnName)
 	}
 
 	columnPrefix := field.ColumnPrefix
 	if columnPrefix != "" {
-		fieldIdentifierValues[jen.Id("ColumnPrefix")] = jen.Lit(columnPrefix)
+		fieldValues[jen.Id("ColumnPrefix")] = jen.Lit(columnPrefix)
 	}
 
-	condition.FieldType = jen.Id(condition.FieldName).Qual(
-		queryPath, badaasORMFieldIdentifier,
-	).Types(
-		condition.param.GenericType(),
+	objectTypeQual := jen.Qual(
+		getRelativePackagePath(condition.destPkg, objectType),
+		objectType.Name(),
 	)
 
-	condition.FieldDefinition = jen.Qual(
-		queryPath, badaasORMFieldIdentifier,
+	fieldQual := jen.Qual(
+		cqlPath, badaasORMField,
 	).Types(
+		objectTypeQual,
 		condition.param.GenericType(),
-	).Values(fieldIdentifierValues)
+	)
+	if condition.param.isString {
+		fieldValues = jen.Dict{
+			jen.Id("Field"): fieldQual.Clone().Values(fieldValues),
+		}
+		fieldQual = jen.Qual(
+			cqlPath, badaasORMStringField,
+		).Types(objectTypeQual)
+	} else if condition.param.isBool {
+		fieldValues = jen.Dict{
+			jen.Id("Field"): fieldQual.Clone().Values(fieldValues),
+		}
+		fieldQual = jen.Qual(
+			cqlPath, badaasORMBoolField,
+		).Types(objectTypeQual)
+	}
+
+	condition.FieldType = jen.Id(condition.FieldName).Add(
+		fieldQual,
+	)
+
+	condition.FieldDefinition = fieldQual.Clone().Values(fieldValues)
 }
 
 // Generate a JoinCondition between the object and field's object
@@ -296,13 +264,13 @@ func (condition *Condition) generateJoin(objectType Type, field Field, t1Field,
 	log.Logger.Debugf("Generated %q", conditionName)
 
 	ormT1IJoinCondition := jen.Qual(
-		conditionPath, badaasORMJoinCondition,
+		cqlPath, badaasORMJoinCondition,
 	).Types(t1)
 	ormT2Condition := jen.Qual(
-		conditionPath, badaasORMCondition,
+		cqlPath, badaasORMCondition,
 	).Types(t2)
 	ormJoinCondition := jen.Qual(
-		conditionPath, badaasORMNewJoinCondition,
+		cqlPath, badaasORMNewJoinCondition,
 	).Types(
 		t1, t2,
 	)
@@ -351,13 +319,13 @@ func (condition *Condition) generateCollectionPreload(objectType Type, field Fie
 	)
 
 	ormT1Condition := jen.Qual(
-		conditionPath, badaasORMCondition,
+		cqlPath, badaasORMCondition,
 	).Types(t1)
 	ormT2IJoinCondition := jen.Qual(
-		conditionPath, badaasORMJoinCondition,
+		cqlPath, badaasORMJoinCondition,
 	).Types(t2)
 	ormNewCollectionPreload := jen.Qual(
-		conditionPath, badaasORMNewCollectionPreload,
+		cqlPath, badaasORMNewCollectionPreload,
 	).Types(
 		t1, t2,
 	)

cli/cmd/gen/conditions/conditionsGenerator.go

@@ -44,14 +44,14 @@ func (cg ConditionsGenerator) Into(file *File) error {
 	fieldIdentifiers := []jen.Code{}
 	relationPreloads := []jen.Code{}
 
-	addReflectTypeDefinition(file, objectName, objectQual)
-
 	conditionsModelType := getConditionsModelType(objectName)
 	conditionsModelAttributesDef := []jen.Code{}
 	conditionsModelAttributesIns := jen.Dict{}
 
 	for _, condition := range conditions {
-		file.Add(condition.ConditionMethod)
+		if condition.ConditionMethod != nil {
+			file.Add(condition.ConditionMethod)
+		}
 
 		// add all field names to the list of fields of the preload condition
 		if condition.FieldDefinition != nil {
@@ -84,7 +84,7 @@ func (cg ConditionsGenerator) Into(file *File) error {
 func addPreloadRelationsMethod(file *File, objectName string, objectQual *jen.Statement, conditionsModelType string, relationPreloads []jen.Code) {
 	if len(relationPreloads) > 0 {
 		condition := jen.Index().Add(jen.Qual(
-			conditionPath, badaasORMCondition,
+			cqlPath, badaasORMCondition,
 		)).Types(
 			objectQual,
 		)
@@ -105,14 +105,14 @@ func addPreloadMethod(file *File, objectName string, objectQual *jen.Statement,
 		jen.Comment(fmt.Sprintf("Preload allows preloading the %s when doing a query", objectName)),
 		createMethod(conditionsModelType, preloadMethod).Params().Add(
 			jen.Qual(
-				conditionPath, badaasORMCondition,
+				cqlPath, badaasORMCondition,
 			).Types(
 				objectQual,
 			),
 		).Block(
 			jen.Return(
 				jen.Qual(
-					conditionPath, badaasORMNewPreloadCondition,
+					cqlPath, badaasORMNewPreloadCondition,
 				).Types(
 					objectQual,
 				).Call(fieldIdentifiers...),
@@ -143,27 +143,10 @@ func addConditionsModelDefinition(file *File, conditionsModelType string, condit
 	)
 }
 
-func addReflectTypeDefinition(file *File, objectName string, objectQual *jen.Statement) {
-	file.Add(
-		jen.Var().Id(
-			getObjectTypeName(objectName),
-		).Op("=").Add(
-			jen.Qual(
-				"reflect",
-				"TypeOf",
-			).Call(jen.Op("*").New(objectQual)),
-		),
-	)
-}
-
 func getConditionsModelType(objectName string) string {
 	return strcase.ToCamel(objectName) + "Conditions"
 }
 
-func getObjectTypeName(objectType string) string {
-	return strcase.ToCamel(objectType) + "Type"
-}
-
 // Generate the conditions for each of the object's fields
 func (cg ConditionsGenerator) ForEachField(file *File, fields []Field) []Condition {
 	conditions := []Condition{}

controllers/basicAuth.go

@@ -10,7 +10,7 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/ditrit/badaas/httperrors"
-	badaasORMErrors "github.com/ditrit/badaas/orm/errors"
+	"github.com/ditrit/badaas/orm/cql"
 	"github.com/ditrit/badaas/persistence/models/dto"
 	"github.com/ditrit/badaas/services/sessionservice"
 	"github.com/ditrit/badaas/services/userservice"
@@ -65,7 +65,7 @@ func (basicAuthController *basicAuthenticationController) BasicLoginHandler(w ht
 
 	user, err := basicAuthController.userService.GetUser(loginJSONStruct)
 	if err != nil {
-		if errors.Is(err, badaasORMErrors.ErrObjectNotFound) {
+		if errors.Is(err, cql.ErrObjectNotFound) {
 			return nil, httperrors.NewErrorNotFound(
 				"user",
 				fmt.Sprintf("no user found with email %q", loginJSONStruct.Email),

docs/badaas-orm/query.rst

@@ -225,8 +225,4 @@ These operators can be found in <https://pkg.go.dev/github.com/ditrit/badaas/orm
 <https://pkg.go.dev/github.com/ditrit/badaas/orm/sqlserver>, 
 <https://pkg.go.dev/github.com/ditrit/badaas/orm/psql> 
 and <https://pkg.go.dev/github.com/ditrit/badaas/orm/sqlite>. 
-<<<<<<< HEAD
 To use them, use the Custom method of FieldIs type.
-=======
-To use them, use the Custom method of FieldIs type.
->>>>>>> main

go.mod

@@ -22,7 +22,7 @@ require (
 	gorm.io/driver/postgres v1.5.2
 	gorm.io/driver/sqlite v1.5.2
 	gorm.io/driver/sqlserver v1.5.1
-	gorm.io/gorm v1.25.2-0.20230530020048-26663ab9bf55
+	gorm.io/gorm v1.25.2-0.20230610234218-206613868439
 	gotest.tools v2.2.0+incompatible
 )
 
@@ -66,3 +66,13 @@ require (
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
+
+// TODO agregar comentario de que los de los dialectors se pueden sacar cuando se mergeen los prs
+// gorm por el contrario no porque el de los joins no se va a hacer pr porque es muy dificil hacer que ande en todos los casos
+replace gorm.io/driver/postgres v1.5.2 => github.com/ditrit/postgres v0.0.0-20230906140800-b3d5f9d4b6ad
+
+replace gorm.io/driver/sqlite v1.5.2 => github.com/ditrit/sqlite v0.0.0-20230906140046-2f37a3f972de
+
+replace gorm.io/driver/sqlserver v1.5.1 => github.com/ditrit/sqlserver v0.0.0-20230908120642-af1820b994f4
+
+replace gorm.io/gorm => github.com/ditrit/gorm v0.0.0-20230912092052-cfff75e01a3a

go.sum

@@ -64,6 +64,14 @@ github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/ditrit/gorm v0.0.0-20230907173046-bd1cee726740 h1:1pBsfGp4JYiw6PkYFV8h1Mf074Vvc9nc7mGx9zQ+lrk=
+github.com/ditrit/gorm v0.0.0-20230907173046-bd1cee726740/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
+github.com/ditrit/postgres v0.0.0-20230906140800-b3d5f9d4b6ad h1:EMZ4BcMgh+yvTIZfFQh7A7LCmLVHmaCwUtavqLBWDlM=
+github.com/ditrit/postgres v0.0.0-20230906140800-b3d5f9d4b6ad/go.mod h1:U1aH6CNEknanYTb+ViFuAA7SsPay4jBbaOpuwkyoh1k=
+github.com/ditrit/sqlite v0.0.0-20230906140046-2f37a3f972de h1:s9G66wUSTOPtl3hSLOSWi6Y/THLwWXyJWk8XjhLDkDU=
+github.com/ditrit/sqlite v0.0.0-20230906140046-2f37a3f972de/go.mod h1:qxAuCol+2r6PannQDpOP1FP6ag3mKi4esLnB/jHed+4=
+github.com/ditrit/sqlserver v0.0.0-20230906142139-ffc300569d6d h1:BfOv/eDzJKsrcclEUdEF+bUg16EVnzMd8ahMrJcbYl8=
+github.com/ditrit/sqlserver v0.0.0-20230906142139-ffc300569d6d/go.mod h1:nt+jwGhgDPKgeanqDCFeZHirOJhJsyK3ULeQUnJTuio=
 github.com/ditrit/verdeter v0.4.0 h1:DzEOFauuXEGNQYP6OgYtHwEyb3w9riem99u0xE/l7+o=
 github.com/ditrit/verdeter v0.4.0/go.mod h1:sKpWuOvYqNabLN4aNXqeBhcWpt7nf0frwqk0B5M6ax0=
 github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/yU9ko=
@@ -636,15 +644,6 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gorm.io/driver/mysql v1.5.1 h1:WUEH5VF9obL/lTtzjmML/5e6VfFR/788coz2uaVCAZw=
 gorm.io/driver/mysql v1.5.1/go.mod h1:Jo3Xu7mMhCyj8dlrb3WoCaRd1FhsVh+yMXb1jUInf5o=
-gorm.io/driver/postgres v1.5.2 h1:ytTDxxEv+MplXOfFe3Lzm7SjG09fcdb3Z/c056DTBx0=
-gorm.io/driver/postgres v1.5.2/go.mod h1:fmpX0m2I1PKuR7mKZiEluwrP3hbs+ps7JIGMUBpCgl8=
-gorm.io/driver/sqlite v1.5.2 h1:TpQ+/dqCY4uCigCFyrfnrJnrW9zjpelWVoEVNy5qJkc=
-gorm.io/driver/sqlite v1.5.2/go.mod h1:qxAuCol+2r6PannQDpOP1FP6ag3mKi4esLnB/jHed+4=
-gorm.io/driver/sqlserver v1.5.1 h1:wpyW/pR26U94uaujltiFGXY7fd2Jw5hC9PB1ZF/Y5s4=
-gorm.io/driver/sqlserver v1.5.1/go.mod h1:AYHzzte2msKTmYBYsSIq8ZUsznLJwBdkB2wpI+kt0nM=
-gorm.io/gorm v1.25.1/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
-gorm.io/gorm v1.25.2-0.20230530020048-26663ab9bf55 h1:sC1Xj4TYrLqg1n3AN10w871An7wJM0gzgcm8jkIkECQ=
-gorm.io/gorm v1.25.2-0.20230530020048-26663ab9bf55/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
 gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=