Skip to content

Commit

Permalink
refactor: deprecate old schema (#305)
Browse files Browse the repository at this point in the history
  • Loading branch information
andreichirila0712 authored Jan 20, 2025
1 parent 5723cb9 commit af71abc
Show file tree
Hide file tree
Showing 5 changed files with 51 additions and 39 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package com.crowdin.client.reports.model;

import lombok.Data;
import lombok.EqualsAndHashCode;

import java.util.Date;
import java.util.List;

@Data
@EqualsAndHashCode(callSuper = true)
public class PreTranslateAccuracyGenerateReportRequest extends GenerateReportRequest {
private String name = "pre-translate-accuracy";
private Schema schema;

@Data
public static class Schema {
private Unit unit = Unit.WORDS;
private ReportsFormat format = ReportsFormat.XLSX;
private List<String> postEditingCategories;
}

@Data
@EqualsAndHashCode(callSuper = true)
public static class GeneralSchema extends Schema {
private String languageId;
private Date dateFrom;
private Date dateTo;
}

@Data
@EqualsAndHashCode(callSuper = true)
public static class ByTaskSchema extends Schema {
private Long taskId;
}

}
Original file line number Diff line number Diff line change
@@ -1,36 +1,12 @@
package com.crowdin.client.reports.model;

import lombok.Data;
import lombok.EqualsAndHashCode;

import java.util.Date;
import java.util.List;

@Data
@EqualsAndHashCode(callSuper = true)
public class PreTranslateEfficiencyGenerateReportRequest extends GenerateReportRequest {
private String name = "pre-translate-efficiency";
private Schema schema;

@Data
public static class Schema {
private Unit unit = Unit.WORDS;
private ReportsFormat format = ReportsFormat.XLSX;
private List<String> postEditingCategories;
}

@Data
@EqualsAndHashCode(callSuper = true)
public static class GeneralSchema extends Schema {
private String languageId;
private Date dateFrom;
private Date dateTo;
}

@Data
@EqualsAndHashCode(callSuper = true)
public static class ByTaskSchema extends Schema {
private Long taskId;
}

/**
* @deprecated Use {@link PreTranslateAccuracyGenerateReportRequest} instead
*/
@Deprecated
public class PreTranslateEfficiencyGenerateReportRequest extends PreTranslateAccuracyGenerateReportRequest {
public PreTranslateEfficiencyGenerateReportRequest() {
super();
this.setName("pre-translate-efficiency");
}
}
8 changes: 4 additions & 4 deletions src/test/java/com/crowdin/client/reports/ReportsApiTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public class ReportsApiTest extends TestClient {
public List<RequestMock> getMocks() {
return Arrays.asList(
RequestMock.build(this.url + "/projects/" + projectId + "/reports", HttpPost.METHOD_NAME, "api/reports/generateReport.json", "api/reports/reportGenerationStatus.json"),
RequestMock.build(this.url + "/projects/" + projectId + "/reports", HttpPost.METHOD_NAME, "api/reports/generatePreTranslateEfficiencyReport.json", "api/reports/preTranslateEfficiencyReportStatus.json"),
RequestMock.build(this.url + "/projects/" + projectId + "/reports", HttpPost.METHOD_NAME, "api/reports/generatePreTranslateAccuracyReport.json", "api/reports/preTranslateAccuracyReportStatus.json"),
RequestMock.build(this.url + "/projects/" + projectId + "/reports/" + id, HttpGet.METHOD_NAME, "api/reports/reportGenerationStatus.json"),
RequestMock.build(this.url + "/projects/" + projectId + "/reports/" + id + "/download", HttpGet.METHOD_NAME, "api/reports/downloadLink.json"),
RequestMock.build(this.url + "/projects/" + projectId + "/reports/settings-templates", HttpGet.METHOD_NAME, "api/reports/listReportSettingsTemplate.json"),
Expand Down Expand Up @@ -151,12 +151,12 @@ public void generateReportTest() {
}

@Test
public void testGeneratePreTranslateEfficiencyReport() {
public void testGeneratePreTranslateAccuracyReport() {
TimeZone.setDefault(tz);
Date reportCreatedAt = getDate(2019, Calendar.SEPTEMBER, 23, 11, 26, 54);

PreTranslateEfficiencyGenerateReportRequest request = new PreTranslateEfficiencyGenerateReportRequest();
PreTranslateEfficiencyGenerateReportRequest.GeneralSchema schema = new PreTranslateEfficiencyGenerateReportRequest.GeneralSchema();
PreTranslateAccuracyGenerateReportRequest request = new PreTranslateAccuracyGenerateReportRequest();
PreTranslateAccuracyGenerateReportRequest.GeneralSchema schema = new PreTranslateAccuracyGenerateReportRequest.GeneralSchema();
schema.setUnit(Unit.STRINGS);
schema.setPostEditingCategories(singletonList(postEditingCategory));
schema.setLanguageId(languageId);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "pre-translate-efficiency",
"name": "pre-translate-accuracy",
"schema": {
"unit": "strings",
"format": "xlsx",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"progress": 100,
"attributes": {
"format": "xlsx",
"reportName": "pre-translate-efficiency",
"reportName": "pre-translate-accuracy",
"schema": {}
},
"createdAt": "2019-09-23T11:26:54+00:00",
Expand Down

0 comments on commit af71abc

Please sign in to comment.