fix: delete asset service logic

Author: Muhammad Luthfi Fahlevi

core/asset/service.go

@@ -171,10 +171,10 @@ func (s *Service) DeleteAsset(ctx context.Context, id string) (err error) {
 		if err != nil {
 			return err
 		}
-	}
-
-	if err := s.assetRepository.DeleteByURN(ctx, urn); err != nil {
-		return err
+	} else {
+		if err := s.assetRepository.DeleteByURN(ctx, urn); err != nil {
+			return err
+		}
 	}
 
 	if err := s.worker.EnqueueDeleteAssetJob(ctx, urn); err != nil {
@@ -199,10 +199,10 @@ func (s *Service) SoftDeleteAsset(ctx context.Context, id, updatedBy string) (er
 		if err != nil {
 			return err
 		}
-	}
-
-	if err := s.assetRepository.SoftDeleteByURN(ctx, urn, softDeleteAsset); err != nil {
-		return err
+	} else {
+		if err := s.assetRepository.SoftDeleteByURN(ctx, urn, softDeleteAsset); err != nil {
+			return err
+		}
 	}
 
 	softDeleteAsset.URN = urn

internal/store/postgres/asset_repository.go

@@ -463,7 +463,7 @@ func (*AssetRepository) validateAsset(ast asset.Asset) error {
 	return nil
 }
 
-// DeleteByID removes asset using its ID
+// DeleteByID hard delete asset using its ID
 func (r *AssetRepository) DeleteByID(ctx context.Context, id string) (urn string, err error) {
 	err = r.client.RunWithinTx(ctx, func(tx *sqlx.Tx) error {
 		fetchedAsset, err := r.GetByIDWithTx(ctx, tx, id)
@@ -486,6 +486,7 @@ func (r *AssetRepository) DeleteByID(ctx context.Context, id string) (urn string
 	return urn, nil
 }
 
+// DeleteByURN hard delete asset using its URN
 func (r *AssetRepository) DeleteByURN(ctx context.Context, urn string) error {
 	err := r.client.RunWithinTx(ctx, func(tx *sqlx.Tx) (err error) {
 		err = r.deleteWithPredicate(ctx, tx, sq.Eq{"urn": urn})
@@ -502,7 +503,6 @@ func (r *AssetRepository) DeleteByURN(ctx context.Context, urn string) error {
 	return nil
 }
 
-// SoftDeleteByID soft delete the asset using its ID
 func (r *AssetRepository) SoftDeleteByID(ctx context.Context, id string, softDeleteAsset asset.SoftDeleteAsset) (urn string, err error) {
 	err = r.client.RunWithinTx(ctx, func(tx *sqlx.Tx) error {
 		fetchedAsset, err := r.GetByIDWithTx(ctx, tx, id)
@@ -531,7 +531,6 @@ func (r *AssetRepository) SoftDeleteByID(ctx context.Context, id string, softDel
 	return urn, nil
 }
 
-// SoftDeleteByURN soft delete the asset using its URN
 func (r *AssetRepository) SoftDeleteByURN(ctx context.Context, urn string, softDeleteAsset asset.SoftDeleteAsset) error {
 	err := r.client.RunWithinTx(ctx, func(tx *sqlx.Tx) (err error) {
 		fetchedAsset, err := r.GetByURNWithTx(ctx, tx, urn)