ajustes na api de relatorio

muttley-report/pom.xml

@@ -29,6 +29,12 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>br.com.muttley</groupId>
+            <artifactId>muttley-headers</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>br.com.muttley</groupId>
             <artifactId>muttley-exception</artifactId>

muttley-report/src/main/java/br/com/muttley/report/AbstractMuttleyReport.java

@@ -24,11 +24,25 @@ protected AbstractMuttleyReport(final AbstractMuttleyReportBuilder builder) {
         this.builder = builder;
     }
 
+    @Override
+    public String getFileForSubReport() {
+        return null;
+    }
+
     @Override
     public InputStream getSourceReport() {
         return this.getClass().getResourceAsStream(this.getFileReport());
     }
 
+    @Override
+    public JasperReport loadReport() {
+        try {
+            return (JasperReport) loadObject(getSourceReport());
+        } catch (final JRException ex) {
+            throw new MuttleyException(ex);
+        }
+    }
+
     @Override
     public Map<String, Object> getParams() {
         return builder.getParams();
@@ -39,7 +53,7 @@ public void print(final OutputStream outputStream) {
         try {
             exportReportToPdfStream(
                     fillReport(
-                            (JasperReport) loadObject(getSourceReport()),
+                            this.loadReport(),
                             this.getParams(),
                             this.getDataSource()
                     ),

muttley-report/src/main/java/br/com/muttley/report/AbstractMuttleyReportBuilder.java

@@ -1,5 +1,7 @@
 package br.com.muttley.report;
 
+import br.com.muttley.headers.components.MuttleyCurrentTimezone;
+import br.com.muttley.headers.components.MuttleyCurrentVersion;
 import br.com.muttley.model.security.User;
 import org.springframework.data.mongodb.core.MongoTemplate;
 
@@ -11,35 +13,53 @@
  * <a href="mailto:[email protected]">[email protected]</a>
  * @project muttley-cloud
  */
-public abstract class AbstractMuttleyReportBuilder implements MuttleyReportBuilder {
-    private Map<String, Object> params = new HashMap<>();
-    private MongoTemplate template;
-    private User user;
+public abstract class AbstractMuttleyReportBuilder<T extends MuttleyReportBuilder> implements MuttleyReportBuilder<T> {
+    protected Map<String, Object> params = new HashMap<>();
+    protected MongoTemplate template;
+    protected User user;
+    protected MuttleyCurrentVersion version;
+    protected MuttleyCurrentTimezone timezone;
+    private final T INSTANCE = (T) this;
 
-    public AbstractMuttleyReportBuilder addParam(final String key, final Object value) {
+    public T addParam(final String key, final Object value) {
         this.params.put(key, value);
-        return this;
+        return this.INSTANCE;
     }
 
     public Map<String, Object> getParams() {
         return this.params;
     }
 
-    public AbstractMuttleyReportBuilder setTemplate(final MongoTemplate template) {
+    public T setTemplate(final MongoTemplate template) {
         this.template = template;
-        return this;
+        return this.INSTANCE;
     }
 
     public MongoTemplate getTemplate() {
         return this.template;
     }
 
-    public AbstractMuttleyReportBuilder setUser(final User user) {
+    public T setUser(final User user) {
         this.user = user;
-        return this;
+        if (user != null) {
+            this.addParam("CURRENT_USER", user.getName());
+        }
+        return this.INSTANCE;
     }
 
     public User getUser() {
         return user;
     }
+
+    public T setCurrentVersion(final MuttleyCurrentVersion version) {
+        this.version = version;
+        this.addParam("CURRENT_VERSION", version.getCurrenteFromServer());
+        return this.INSTANCE;
+    }
+
+    public T setCurrentTimezone(final MuttleyCurrentTimezone timezone) {
+        this.timezone = timezone;
+        this.addParam("CURRENT_TIMEZONE", timezone.getCurrentTimezoneFromRequestOrServer());
+        return this.INSTANCE;
+    }
 }

muttley-report/src/main/java/br/com/muttley/report/JRMuttleyMongoDataSource.java

@@ -36,6 +36,7 @@ public class JRMuttleyMongoDataSource implements JRDataSource {
     protected Document currentValue;
     protected long currentSkip = 0l;
     protected final Long currentLimit;
+    protected boolean throwsExceptionsIsEmpty = true;
 
     public JRMuttleyMongoDataSource(final MongoTemplate mongoTemplate, final List<AggregationOperation> operations, Class<?> collection) {
         this(mongoTemplate, operations, 100l, collection);
@@ -67,8 +68,8 @@ public boolean next() throws JRException {
         if (this.currentResult == null) {
             //se é null quer dizer que estamos na primeira pagina
             result = this.fetchQuery();
-            if(this.currentPageSize == 0 ){
-                throw new MuttleyNoContentException(this.COLLECTION,null, "Nenhum registro encontrado para o relatório!");
+            if (this.currentPageSize == 0 && this.throwsExceptionsIsEmpty) {
+                throw new MuttleyNoContentException(this.COLLECTION, null, "Nenhum registro encontrado para o relatório!");
             }
         } else {
             result = this.currentResult.hasNext() ? true : this.fetchQuery();
@@ -108,6 +109,11 @@ public Object getFieldValue(final JRField jrField) throws JRException {
         return this.currentValue.get(jrField.getName());
     }
 
+    public JRMuttleyMongoDataSource throwsExceptionsIsEmpty(final boolean throwsExceptionsIsEmpty) {
+        this.throwsExceptionsIsEmpty = throwsExceptionsIsEmpty;
+        return this;
+    }
+
     protected boolean fetchQuery() {
         //Se a ultima consulta  resultou em uma quantidade menor
         //do que o limit máximo trabalhado

muttley-report/src/main/java/br/com/muttley/report/MuttleyReport.java

@@ -1,6 +1,7 @@
 package br.com.muttley.report;
 
 import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.JasperReport;
 
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -12,10 +13,14 @@
  * @project muttley-cloud
  */
 public interface MuttleyReport {
+    String getFileForSubReport();
+
     String getFileReport();
 
     InputStream getSourceReport();
 
+    JasperReport loadReport();
+
     Map<String, Object> getParams();
 
     void print(final OutputStream outputStream);

muttley-report/src/main/java/br/com/muttley/report/MuttleyReportBuilder.java

@@ -5,7 +5,7 @@
  * <a href="mailto:[email protected]">[email protected]</a>
  * @project muttley-cloud
  */
-public interface MuttleyReportBuilder {
+public interface MuttleyReportBuilder<T extends MuttleyReportBuilder> {
 
     MuttleyReportBuilder addParam(final String key, final Object value);