mongodb integrated

pom.xml

@@ -45,16 +45,21 @@
 			<artifactId>guava</artifactId>
 			<version>28.2-android</version>
 		</dependency>
-		<dependency>
-			<groupId>com.h2database</groupId>
-			<artifactId>h2</artifactId>
-			<scope>runtime</scope>
-		</dependency>
+
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
 			<version>3.12.0</version>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-mongodb</artifactId>
+			<version>3.1.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.mongodb</groupId>
+			<artifactId>mongodb-driver-core</artifactId>
+		</dependency>
 
 	</dependencies>
 

src/main/java/com/kasina/makeitshort/controller/MakeItShortController.java

@@ -15,11 +15,13 @@
 
 import java.io.IOException;
 import java.time.LocalDateTime;
+import java.util.Optional;
 
 @RestController
+@RequestMapping("/makeitshort/")
 @RequiredArgsConstructor
 public class MakeItShortController {
-    @Autowired
+
     private final MakeItShortServiceImpl makeItShortService;
 
     @PostMapping("/generate")
@@ -30,12 +32,12 @@ public ResponseEntity<?> generateShortLink(@RequestBody MakeItShortDto makeItSho
             makeItShortResponse.setOriginalUrl(makeItShort.getOriginalUrl());
             makeItShortResponse.setExpirationDate(makeItShort.getExpirationDate());
             makeItShortResponse.setShortLink(makeItShort.getShortLink());
-            return new ResponseEntity<MakeItShortResponse>(makeItShortResponse, HttpStatus.OK);
+            return new ResponseEntity<>(makeItShortResponse, HttpStatus.OK);
         }
         UrlErrorResponseDto urlErrorResponseDto = new UrlErrorResponseDto();
         urlErrorResponseDto.setStatus("404");
         urlErrorResponseDto.setError("There was an error processing your request. please try again");
-        return new ResponseEntity<UrlErrorResponseDto>(urlErrorResponseDto, HttpStatus.OK);
+        return new ResponseEntity<>(urlErrorResponseDto, HttpStatus.OK);
     }
 
     @GetMapping("/{shortLink}")

src/main/java/com/kasina/makeitshort/mode/MakeItShort.java

@@ -8,6 +8,7 @@
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.data.mongodb.core.mapping.Document;
 
 import java.time.LocalDateTime;
 
@@ -16,6 +17,7 @@
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
+@Document(collection = "urls")
 public class MakeItShort {
     @Id
     @GeneratedValue

src/main/java/com/kasina/makeitshort/repository/MakeItShortRepo.java

@@ -0,0 +1,15 @@
+package com.kasina.makeitshort.repository;
+
+import com.kasina.makeitshort.mode.MakeItShort;
+import org.springframework.data.mongodb.repository.MongoRepository;
+import org.springframework.data.mongodb.repository.Query;
+
+import java.util.Optional;
+
+public interface MakeItShortRepo extends MongoRepository<MakeItShort, Long> {
+    @Query("{ 'shortLink' : ?0 }")
+    MakeItShort findByShortLink(String shortLink);
+
+    /*@Query("{ 'shortLink' : ?0 }")
+    Optional<MakeItShort> findByShortLink(String shortLink);*/
+}

src/main/java/com/kasina/makeitshort/service/MakeItShortServiceImpl.java

@@ -3,7 +3,7 @@
 import com.google.common.hash.Hashing;
 import com.kasina.makeitshort.mode.MakeItShort;
 import com.kasina.makeitshort.mode.MakeItShortDto;
-import com.kasina.makeitshort.repository.MakeItShortRepository;
+import com.kasina.makeitshort.repository.MakeItShortRepo;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,11 +15,13 @@
 @Component
 @RequiredArgsConstructor
 public class MakeItShortServiceImpl implements MakeItShortService {
-    @Autowired
-    private final MakeItShortRepository makeItShortRepository;
+
+    private final MakeItShortRepo makeItShortRepository;
 
     @Override
     public MakeItShort generateShortLink(MakeItShortDto makeItShortDto) {
+        // TODO: check if url already exist in the database then return it rather than saving the same url multiple time
+
         if (StringUtils.isNotEmpty(makeItShortDto.getUrl())){
             String encodedUrl = encodeUrl(makeItShortDto.getUrl());
 
@@ -36,7 +38,7 @@ public MakeItShort generateShortLink(MakeItShortDto makeItShortDto) {
 
     private LocalDateTime getExpirationDate(String expirationDate, LocalDateTime creationDate) {
         if(StringUtils.isBlank(expirationDate)){
-            return creationDate.plusSeconds(60);
+            return creationDate.plusSeconds(120);
         }
         return LocalDateTime.parse(expirationDate);
     }

src/main/resources/.env.example

@@ -0,0 +1,4 @@
+MONGO_DATABASE=makeitshort
+MONGO_USER=casy
+MONGO_PASSWORD=OerXjCNw703xMjzF
+MONGO_CLUSTER=cluster0

src/main/resources/application.properties

@@ -1 +1,8 @@
+#spring.data.mongodb.database=${env.MONGO_DATABASE}
+#spring.data.mongodb.uri=mongodb+srv://${env.MONGO_USER}:${env.MONGO_PASSWORD}@${env.MONGO_CLUSTER}
 
+
+spring.data.mongodb.uri=mongodb+srv://casy:OerXjCNw703xMjzF@cluster0.jfge0em.mongodb.net/
+spring.data.mongodb.database=makeitshort
+
+spring.main.allow-bean-definition-overriding=true