Skip to content

Commit f5138a2

Browse files
author
jianggang
committed
fix: toggle mapper error
1 parent 19f842c commit f5138a2

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

src/main/java/com/featureprobe/api/mapper/ToggleMapper.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import org.mapstruct.NullValuePropertyMappingStrategy;
1717
import org.mapstruct.factory.Mappers;
1818
import java.util.Collections;
19-
import java.util.Date;
2019
import java.util.List;
2120
import java.util.Set;
2221
import java.util.stream.Collectors;
@@ -38,9 +37,9 @@ public interface ToggleMapper extends BaseMapper {
3837
ToggleResponse entityToResponse(Toggle toggle, Long deadline);
3938

4039
default Long getUseDays(Toggle toggle, Long deadline) {
41-
long useDays = Math.floorDiv(System.currentTimeMillis() - toggle.getCreatedTime().getTime(),
42-
1000 * 60 * 60 * 24);
43-
return !toggle.isPermanent() && useDays > deadline ? useDays : null;
40+
long days = (long) Math.floor((System.currentTimeMillis() - toggle.getCreatedTime().getTime()) /
41+
(1000 * 60 * 60 * 24));
42+
return !toggle.isPermanent() && days > deadline ? days : null;
4443
}
4544
default Set<String> toTagNames(Set<Tag> tags) {
4645
if (CollectionUtils.isEmpty(tags)) {
@@ -55,7 +54,7 @@ default List<Variation> toVariation(String variation) {
5554

5655
@Mapping(target = "variations", expression = "java(toVariationJson(toggleRequest.getVariations()))")
5756
@Mapping(target = "tags", ignore = true)
58-
Toggle requestToEntify(ToggleCreateRequest toggleRequest);
57+
Toggle requestToEntity(ToggleCreateRequest toggleRequest);
5958

6059
default String toVariationJson(List<Variation> variations) {
6160
return JsonMapper.toJSONString(variations);

src/main/java/com/featureprobe/api/service/ToggleService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ private void validateLimit(String projectKey) {
116116
}
117117

118118
protected Toggle createToggle(String projectKey, ToggleCreateRequest createRequest) {
119-
Toggle toggle = ToggleMapper.INSTANCE.requestToEntify(createRequest);
119+
Toggle toggle = ToggleMapper.INSTANCE.requestToEntity(createRequest);
120120
toggle.setProjectKey(projectKey);
121121
setToggleTagRefs(toggle, createRequest.getTags());
122122
return toggleRepository.save(toggle);

0 commit comments

Comments
 (0)