Merge branch 'dev_neo3' into 'dev'

[dev] when not fund celltemplate get and insert datasource

See merge request root/atms!96

atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/BBParasBo.java

@@ -95,4 +95,16 @@ public class BBParasBo {
         this.year = curYear;
         this.formulaExpression=otherBo.formulaExpression;
     }
+
+    @Override
+    public String toString() {
+        return "BBParasBo{" +
+                "reportCode='" + reportCode + '\'' +
+                ", columnIndex=" + columnIndex +
+                ", rowIndex=" + rowIndex +
+                ", period=" + period +
+                ", year=" + year +
+                ", formulaExpression='" + formulaExpression + '\'' +
+                '}';
+    }
 }

atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/CurrentPeriodBo.java

@@ -35,4 +35,12 @@ public class CurrentPeriodBo {
             return new CurrentPeriodBo(parameterPeriod);
         }
     }
+
+    @Override
+    public String toString() {
+        return "CurrentPeriodBo{" +
+                "curYear=" + curYear +
+                ", curPeriod=" + curPeriod +
+                '}';
+    }
 }

atms-api/src/main/java/pwc/taxtech/atms/exception/Exceptions.java

 package pwc.taxtech.atms.exception;
 
 public class Exceptions {
-   public static final FormulaException BB_CELL_TEMP_NULL = new FormulaException("cell template data is null");
+   public static final FormulaException BB_CELL_TEMP_NULL = new FormulaException("cell template group is null or empty");
    public static final FormulaException BB_REPORT_NULL = new FormulaException("cell report is null");
    public static final FormulaException BB_CELL_DATA_NULL = new FormulaException("cell data is null");
    public static final FormulaException BB_CELL_DATA_EMPTY = new FormulaException("cell data is empty");

atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/BB.java

@@ -57,11 +57,14 @@ public class BB extends FunctionBase implements FreeRefFunction {
         ReportCellDataSourceDto nullCellDto = ReportCellDataSourceDto.nullDataSource(bo, curPeriod);
         ds.add(nullCellDto);
 
-        CellTemplatePerGroupDto cellTemplateData = agent.getCellTemplateGroupDto(formulaContext.getReportTemplateGroupID(),
-                formulaContext.getProjectID()).stream().filter(dto -> dto.getRowIndex() == bo.getColumnIndex() - 1
-                && dto.getColumnIndex() == bo.getColumnIndex() - 1).findFirst().get();
         BigDecimal cellValue = BigDecimal.ZERO;
         try {
+            CellTemplatePerGroupDto cellTemplateData = agent.getCellTemplateGroupDto(formulaContext.getReportTemplateGroupID(),
+                    formulaContext.getProjectID()).stream().filter(dto -> dto.getRowIndex() == bo.getColumnIndex() - 1
+                    && dto.getColumnIndex() == bo.getColumnIndex() - 1).findFirst().orElseThrow(() -> {
+                throw Exceptions.BB_CELL_TEMP_NULL;
+            });
+
             MyAsserts.assertNotNull(cellTemplateData, Exceptions.BB_CELL_TEMP_NULL);
             nullCellDto.fixedWithGroup(cellTemplateData);
 
@@ -129,6 +132,7 @@ public class BB extends FunctionBase implements FreeRefFunction {
             LOGGER.debug("cell static value ");
             return cellValue;
         } finally {
+            LOGGER.warn("error for bb cacls for {} and current for {}", bo.toString(), curPeriod.toString());
             Long dataSourceID = saveDataSource(ec, ds, FormulaDataSourceDetailType.ReportCellDataSourceDto,
                     cellValue, formulaContext.getPeriod(), formulaContext.getReportTemplateGroupID());
             saveFormulaBlock(formulaContext.getPeriod(), ec, bo.expression(curPeriod.getCurPeriod(), curPeriod.getCurYear()), cellValue, dataSourceID);