Merge pull request #45 from appirio-tech/dev

sachin-maheshwari · web-flow · commit 6cf23e92866c · 2021-06-28T11:51:15.000+05:30
Shapeup3 - "inactive" logic change
diff --git a/src/main/java/com/appirio/tech/core/service/identity/resource/UserResource.java b/src/main/java/com/appirio/tech/core/service/identity/resource/UserResource.java
@@ -894,7 +894,7 @@ public ApiResponse resendEmail(
         }
 
         // return 400 if user has been activated
-        if(user.isActive())
+        if(user.getStatus()!=null && !user.getStatus().equals("U"))
             throw new APIRuntimeException(SC_BAD_REQUEST, MSG_TEMPLATE_USER_ALREADY_ACTIVATED);
 
         EventMessage msg = EventMessage.getDefault();

Original file line number	Diff line number	Diff line change
`@@ -894,7 +894,7 @@ public ApiResponse resendEmail(`
`894`	`894`	`}`
`895`	`895`
`896`	`896`	`// return 400 if user has been activated`
`897`		`- if(user.isActive())`
	`897`	`+ if(user.getStatus()!=null && !user.getStatus().equals("U"))`
`898`	`898`	`throw new APIRuntimeException(SC_BAD_REQUEST, MSG_TEMPLATE_USER_ALREADY_ACTIVATED);`
`899`	`899`
`900`	`900`	`EventMessage msg = EventMessage.getDefault();`