Merge pull request #88 from SaltyNote/mongo

migrate to mongo

Author: zhouhao

docker-compose.yml

@@ -1,21 +1,24 @@
 version: "3.8"
 
 services:
-  mysql:
-    image: mariadb:10.4
-    ports:
-      - "3306:3306"
-    environment:
-      MYSQL_DATABASE: saltynote
-      MYSQL_ROOT_PASSWORD: password
-    volumes:
-      - mysql_data:/var/lib/mysql/data
 
   redis:
     image: 'redis:7.0-alpine'
     command: redis-server --requirepass 88888888
     ports:
       - '6379:6379'
 
+  mongodb:
+    image: mongo:6-jammy
+    restart: always
+    environment:
+      MONGO_INITDB_ROOT_USERNAME: saltynote
+      MONGO_INITDB_ROOT_PASSWORD: password
+      MONGO_INITDB_DATABASE: saltynote
+    ports:
+      - '27017:27017'
+    volumes:
+      - mongo_data:/data/db
+
 volumes:
-  mysql_data:
+  mongo_data:

pom.xml

@@ -50,6 +50,11 @@
             <artifactId>spring-boot-starter-mail</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-mongodb</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-devtools</artifactId>
@@ -84,19 +89,6 @@
             <artifactId>freemarker</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.flywaydb</groupId>
-            <artifactId>flyway-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.flywaydb</groupId>
-            <artifactId>flyway-mysql</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.mariadb.jdbc</groupId>
-            <artifactId>mariadb-java-client</artifactId>
-            <version>3.1.3</version>
-        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>

script/mysql.sh

@@ -4,10 +4,11 @@
 import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
 
-@SpringBootApplication
+@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
 @EnableCaching
 public class ServiceApplication {
 

src/main/java/com/saltynote/service/ServiceApplication.java

@@ -1,9 +1,6 @@
 package com.saltynote.service.configure;
 
-import com.saltynote.service.generator.IdGenerator;
-import com.saltynote.service.generator.SnowflakeIdGenerator;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
@@ -15,9 +12,4 @@ public class ServiceConfig {
     @Value("${saltynote.machine.id}")
     private int machineId;
 
-    @Bean
-    public IdGenerator snowflakeIdGenerator() {
-        return new SnowflakeIdGenerator(datacenterId, machineId);
-    }
-
 }

src/main/java/com/saltynote/service/configure/ServiceConfig.java

@@ -43,14 +43,14 @@ public NoteController(NoteService noteService, NoteConverter noteConverter) {
     }
 
     @GetMapping("/note/{id}")
-    public ResponseEntity<Note> getNoteById(@PathVariable("id") Long id, Authentication auth) {
+    public ResponseEntity<Note> getNoteById(@PathVariable("id") String id, Authentication auth) {
         Optional<Note> note = noteService.getById(id);
         checkNoteOwner(note, auth);
         return note.map(ResponseEntity::ok).orElseGet(() -> ResponseEntity.notFound().build());
     }
 
     @RequestMapping(value = "/note/{id}", method = { RequestMethod.POST, RequestMethod.PUT })
-    public ResponseEntity<Note> updateNoteById(@PathVariable("id") Long id, @RequestBody NoteDto noteDto,
+    public ResponseEntity<Note> updateNoteById(@PathVariable("id") String id, @RequestBody NoteDto noteDto,
             Authentication auth) {
         Optional<Note> queryNote = noteService.getById(id);
         checkNoteOwner(queryNote, auth);
@@ -59,9 +59,7 @@ public ResponseEntity<Note> updateNoteById(@PathVariable("id") Long id, @Request
             noteTobeUpdate.setNote(noteDto.getNote());
         }
 
-        if (StringUtils.isNotBlank(noteDto.getTags())) {
-            noteTobeUpdate.setTags(noteDto.getTags());
-        }
+        noteTobeUpdate.setTags(noteDto.getTags());
 
         if (StringUtils.isNotBlank(noteDto.getHighlightColor())) {
             noteTobeUpdate.setHighlightColor(noteDto.getHighlightColor());
@@ -71,7 +69,7 @@ public ResponseEntity<Note> updateNoteById(@PathVariable("id") Long id, @Request
     }
 
     @DeleteMapping("/note/{id}")
-    public ResponseEntity<ServiceResponse> deleteNoteById(@PathVariable("id") Long id, Authentication auth) {
+    public ResponseEntity<ServiceResponse> deleteNoteById(@PathVariable("id") String id, Authentication auth) {
         Optional<Note> note = noteService.getById(id);
         checkNoteOwner(note, auth);
         noteService.delete(note.get());
@@ -82,7 +80,7 @@ public ResponseEntity<ServiceResponse> deleteNoteById(@PathVariable("id") Long i
     // requests will be
     // blocked by Chrome. Further investigation is required from me for this issue.
     @PostMapping("/note/{id}/delete")
-    public ResponseEntity<ServiceResponse> postDeleteNoteById(@PathVariable("id") Long id, Authentication auth) {
+    public ResponseEntity<ServiceResponse> postDeleteNoteById(@PathVariable("id") String id, Authentication auth) {
         return deleteNoteById(id, auth);
     }
 

src/main/java/com/saltynote/service/controller/NoteController.java

@@ -93,7 +93,7 @@ public ResponseEntity<JwtUser> signup(@Valid @RequestBody UserNewRequest userNew
         SiteUser user = userNewRequest.toSiteUser();
         user.setPassword(bCryptPasswordEncoder.encode(user.getPassword()));
         user = userService.create(user);
-        if (user.getId() != null && user.getId() > 0) {
+        if (user.getId() != null && !user.getId().isBlank()) {
             vaultService.deleteById(vaultOp.get().getId());
             return ResponseEntity.ok(new JwtUser(user.getId(), user.getUsername()));
         }
@@ -199,7 +199,7 @@ public ResponseEntity<ServiceResponse> updatePassword(@Valid @RequestBody Passwo
     }
 
     @DeleteMapping("/account/{id}")
-    public ResponseEntity<ServiceResponse> accountDeletion(@PathVariable("id") Long userId, Authentication auth) {
+    public ResponseEntity<ServiceResponse> accountDeletion(@PathVariable("id") String userId, Authentication auth) {
         JwtUser jwtUser = (JwtUser) auth.getPrincipal();
         if (!Objects.equals(userId, jwtUser.getId())) {
             throw new WebAppRuntimeException(HttpStatus.BAD_REQUEST, "User information is not confirmed");

src/main/java/com/saltynote/service/controller/UserController.java

@@ -2,6 +2,6 @@
 
 public interface Identifiable {
 
-    Long getId();
+    String getId();
 
 }

src/main/java/com/saltynote/service/domain/Identifiable.java

@@ -10,7 +10,7 @@
 public class LoginUser extends User implements IdentifiableUser {
 
     @Getter
-    private final Long id;
+    private final String id;
 
     public LoginUser(SiteUser user) {
         super(user.getUsername(), user.getPassword(), Collections.emptyList());

src/main/java/com/saltynote/service/domain/LoginUser.java

@@ -8,7 +8,7 @@
 @Accessors(chain = true)
 public class VaultEntity {
 
-    private Long userId;
+    private String userId;
 
     private String secret;