Development (#21)

* hot fix UI on user modification, add reff example from schema component, enhance path mock

* enhance crud and add security configuration and enhance ui fixing some ui

README.md

@@ -1,5 +1,7 @@
 <h2 align="left">MOCKYUP</h2>
 MockyUp is a mockup server that release with java version that following OASOPENAPI version 3.xx. You can easyly to integration your swagger documentation with this mockup server with injecting some vendor extension for generating some example.
+**We only supported for json request and response**.
+
 For  <a href="https://github.com/dekaulitz/mockup-frontend">Mockup UI Repository </a>
 <h2 align="left">Stack</h2>
 This project build under spring boot framework with spring data mongodb and <a href="https://github.com/swagger-api">swagger library version 3 </a>.

src/main/java/com/github/dekaulitz/mockyup/configuration/security/SecurityConfiguration.java

@@ -50,7 +50,8 @@ public SecurityAuthenticationFilter authenticationTokenFilter() {
                 new AntPathRequestMatcher("/mocks/users"),
                 new AntPathRequestMatcher("/mocks/users/list"),
                 new AntPathRequestMatcher("/mocks/user/**/update"),
-                new AntPathRequestMatcher("/mocks/user/**/detail")
+                new AntPathRequestMatcher("/mocks/user/**/detail"),
+                new AntPathRequestMatcher("/mocks/user/**/delete")
         )));
         filter.setAuthenticationSuccessHandler(new SecurityAuthenticationSuccess());
         filter.setAuthenticationFailureHandler(new SecurityAuthenticationFail());

src/main/java/com/github/dekaulitz/mockyup/controllers/UserControllers.java

@@ -38,6 +38,17 @@ public ResponseEntity<Object> adduser(@Valid @RequestBody RegistrationVmodel vmo
         } catch (Exception e) {
             return this.handlingErrorResponse(e, request);
         }
+    }
+
+    @PreAuthorize("hasAnyAuthority('USERS_READ_WRITE')")
+    @DeleteMapping(value = "/mocks/user/{id}/delete", produces = MediaType.APPLICATION_JSON_VALUE)
+    public ResponseEntity<Object> deleteUser(@PathVariable String id, HttpServletRequest request) {
+        try {
+            this.userModel.deleteUser(id, this.getAuthenticationProfileModel());
+            return ResponseEntity.ok().build();
+        } catch (Exception e) {
+            return this.handlingErrorResponse(e, request);
+        }
 
     }
 

src/main/java/com/github/dekaulitz/mockyup/db/repositories/MockHistoryRepository.java

@@ -10,4 +10,6 @@
 public interface MockHistoryRepository extends MongoRepository<MockHistoryEntities, String> {
 
     public List<MockHistoryEntities> findByMockId(String id);
+
+    public void deleteAllByMockId(String mockId);
 }

src/main/java/com/github/dekaulitz/mockyup/models/BaseMockModel.java

@@ -14,10 +14,7 @@
 import com.github.dekaulitz.mockyup.utils.Role;
 import com.github.dekaulitz.mockyup.vmodels.MockVmodel;
 import io.swagger.parser.OpenAPIParser;
-import io.swagger.v3.oas.models.OpenAPI;
-import io.swagger.v3.oas.models.Operation;
-import io.swagger.v3.oas.models.PathItem;
-import io.swagger.v3.oas.models.Paths;
+import io.swagger.v3.oas.models.*;
 import io.swagger.v3.parser.core.models.SwaggerParseResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,7 +32,6 @@ abstract class BaseMockModel<M, M1> implements BaseMock<M, M1> {
     protected Logger log = LoggerFactory.getLogger(this.getClass());
 
     public void setSaveMockEntity(MockVmodel body, MockEntities mockEntities, AuthenticationProfileModel authenticationProfileModel) throws InvalidMockException {
-//        Assert.notNull(body.getTitle());
         SwaggerParseResult result = null;
         try {
             mockEntities.setSwagger(JsonMapper.mapper().writeValueAsString(body.getSpec()));
@@ -68,7 +64,7 @@ private void parsingSpecToOpenApi(MockVmodel body, MockEntities mockEntities) th
         OpenAPI openAPI = result.getOpenAPI();
         Paths newPath = new Paths();
         openAPI.getPaths().forEach((s, pathItem) -> {
-            newPath.put(s.replace(".", "_").replace("{", "*{"), pathItem);
+            newPath.put(s.replace("{", "*{"), pathItem);
         });
         openAPI.setPaths(newPath);
         mockEntities.setSpec(JsonMapper.mapper().writeValueAsString(openAPI));
@@ -85,34 +81,34 @@ public void setUpdateMockEntity(MockVmodel body, MockEntities mockEntities, Auth
 
     }
 
-    public MockHelper getMockResponse(PathItem pathItem, HttpServletRequest request, String body, String[] openAPIPaths, String[] paths)
+    public MockHelper getMockResponse(PathItem pathItem, HttpServletRequest request, String body, String[] openAPIPaths, String[] paths, Components components)
             throws NotFoundException, JsonProcessingException, InvalidMockException, UnsupportedEncodingException {
         MockHelper mock = null;
         JsonNode jsonNode = JsonMapper.mapper().valueToTree(pathItem);
         Operation ops = JsonMapper.mapper().treeToValue(jsonNode.get(request.getMethod().toLowerCase()), Operation.class);
-        if (ops.getExtensions() == null) throw new NotFoundException("no extension found");
+        if (ops.getExtensions() == null) throw new NotFoundException(ResponseCode.MOCKUP_NOT_FOUND);
         Map<String, Object> examples = (Map<String, Object>) ops.getExtensions().get(MockHelper.X_EXAMPLES);
-        if (examples == null) throw new NotFoundException("no mock example found");
+        if (examples == null) throw new NotFoundException(ResponseCode.MOCKUP_NOT_FOUND);
         for (Map.Entry<String, Object> extension : examples.entrySet()) {
             switch (extension.getKey()) {
                 case MockHelper.X_PATH:
-                    mock = MockHelper.generateResponnsePath(request, (List<Map<String, Object>>) extension.getValue(), openAPIPaths, paths);
+                    mock = MockHelper.generateResponnsePath(request, (List<Map<String, Object>>) extension.getValue(), openAPIPaths, paths, components);
                     if (mock != null) return mock;
                     break;
                 case MockHelper.X_HEADERS:
-                    mock = MockHelper.generateResponseHeader(request, (List<Map<String, Object>>) extension.getValue());
+                    mock = MockHelper.generateResponseHeader(request, (List<Map<String, Object>>) extension.getValue(), components);
                     if (mock != null) return mock;
                     break;
                 case MockHelper.X_QUERY:
-                    mock = MockHelper.generateResponnseQuery(request, (List<Map<String, Object>>) extension.getValue());
+                    mock = MockHelper.generateResponnseQuery(request, (List<Map<String, Object>>) extension.getValue(), components);
                     if (mock != null) return mock;
                     break;
                 case MockHelper.X_BODY:
-                    mock = MockHelper.generateResponseBody(request, (List<Map<String, Object>>) extension.getValue(), body);
+                    mock = MockHelper.generateResponseBody(request, (List<Map<String, Object>>) extension.getValue(), body, components);
                     if (mock != null) return mock;
                     break;
                 case MockHelper.X_DEFAULT:
-                    mock = MockHelper.generateResponseDefault((LinkedHashMap<String, Object>) extension.getValue());
+                    mock = MockHelper.generateResponseDefault((LinkedHashMap<String, Object>) extension.getValue(), components);
                     if (mock != null) return mock;
                     break;
                 default:

src/main/java/com/github/dekaulitz/mockyup/models/MockModel.java

@@ -115,6 +115,7 @@ public void deleteById(String id, AuthenticationProfileModel authenticationProfi
         }
         this.checkAccessModificationMocks(mockEntities.get(), authenticationProfileModel);
         mockRepository.deleteById(mockEntities.get().getId());
+        mockHistoryRepository.deleteAllByMockId(mockEntities.get().getId());
     }
 
     @Override
@@ -231,16 +232,14 @@ public MockHelper getMockMocking(HttpServletRequest request, String path, String
         //pathitem is exist or without path parameter clean url
         PathItem item = openAPI.getPaths().get(path);
         if (item != null) {
-            String openApiPath = path.replace("_", ".");
-            String[] openAPIPaths = openApiPath.split("/");
-            return getMockResponse(item, request, body, openAPIPaths, paths);
+            String[] openAPIPaths = path.split("/");
+            return getMockResponse(item, request, body, openAPIPaths, paths, openAPI.getComponents());
         }
         //path item with path parameter we should check every endpoint that related with data
         for (Map.Entry<String, PathItem> entry : openAPI.getPaths().entrySet()) {
             String s = entry.getKey();
             PathItem pathItem = entry.getValue();
-            String openApiPath = s.replace("_", ".");
-            String[] openAPIPaths = openApiPath.split("/");
+            String[] openAPIPaths = s.split("/");
             String[] regexPath = new String[paths.length];
             // every targeting mocks uri should has same length
             if (openAPIPaths.length == paths.length) {
@@ -259,8 +258,8 @@ public MockHelper getMockMocking(HttpServletRequest request, String path, String
                     }
                 }
                 //check if current openapi path equal with regexpath (path)
-                if (openApiPath.equals(String.join("/", regexPath)))
-                    return getMockResponse(pathItem, request, body, openAPIPaths, paths);
+                if (s.equals(String.join("/", regexPath)))
+                    return getMockResponse(pathItem, request, body, openAPIPaths, paths, openAPI.getComponents());
             }
         }
         return null;

src/main/java/com/github/dekaulitz/mockyup/models/MockResponseModel.java

@@ -5,7 +5,7 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import java.util.HashMap;
+import java.util.Map;
 
 @AllArgsConstructor
 @NoArgsConstructor
@@ -14,5 +14,16 @@
 public class MockResponseModel {
     private int httpCode;
     private Object response;
-    private HashMap<String, Object> headers;
+    private Map<String, Object> headers;
+
+    public Object get$ref() {
+        return $ref;
+    }
+
+    public void set$ref(Object $ref) {
+        this.$ref = $ref;
+    }
+
+    private Object $ref;
+
 }

src/main/java/com/github/dekaulitz/mockyup/models/UserModel.java

@@ -51,6 +51,15 @@ public UserEntities addUser(RegistrationVmodel vmodel, AuthenticationProfileMode
         return this.userRepository.save(userEntities);
     }
 
+    public void deleteUser(String userId, AuthenticationProfileModel authenticationProfileModel) throws DuplicateDataEntry {
+        Optional<UserEntities> userEntities = this.userRepository.findById(userId);
+        if (!userEntities.isPresent()) {
+            throw new DuplicateDataEntry(ResponseCode.USER_NOT_FOUND);
+        }
+
+        this.userRepository.delete(userEntities.get());
+    }
+
     public AccessVmodel doLogin(UserLoginVmodel vmodel) throws UnathorizedAccess, UnsupportedEncodingException {
         UserEntities userExist = this.userRepository.findFirstByUsername(vmodel.getUsername());
         if (userExist == null) {