Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/778 users collection #790

Open
wants to merge 28 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
bd5493b
modified UserSoluTionDocument
davidcuadrado Jan 30, 2025
3647e9f
modified deprecated users collection naming
davidcuadrado Jan 30, 2025
69be78d
updated UserRepository
davidcuadrado Jan 30, 2025
d96f3b7
UserDocumentTest update + UserRepository update
davidcuadrado Jan 30, 2025
2c29705
Pending: UserDocumentTest context load
davidcuadrado Jan 30, 2025
ac78982
User related test reset
davidcuadrado Jan 30, 2025
84f3576
updated itachallenge-user Readme with users collection references
davidcuadrado Feb 3, 2025
6833fd6
UserTest, UserRepositoryTest update
davidcuadrado Feb 3, 2025
e58b0c5
formating
davidcuadrado Feb 3, 2025
6067576
added auto-index creation on application.yml to ensure username uniqu…
davidcuadrado Feb 3, 2025
bd43527
added argsConstructor tests for coverage
davidcuadrado Feb 3, 2025
972665c
added toString test for coverage
davidcuadrado Feb 3, 2025
85c5eeb
UserTest update
davidcuadrado Feb 3, 2025
a8659fb
removed update
davidcuadrado Feb 3, 2025
1661ba0
UserTest renamed to UserDocumentTest
davidcuadrado Feb 4, 2025
20d9b50
modified lombok annotations
davidcuadrado Feb 4, 2025
556c3e4
added tests for EqualsAndHashCode annotation
davidcuadrado Feb 4, 2025
05ceb89
added test for UserDocument
davidcuadrado Feb 4, 2025
d518f44
added test to UserDocumentTest, override UserDocument toString to ens…
davidcuadrado Feb 4, 2025
1debd8b
added @Builder tests for UserDocument
davidcuadrado Feb 4, 2025
7f83326
added test for lombok EqualsAndHashCode annotation
davidcuadrado Feb 4, 2025
99e78ef
deleted troubleshooting tests on sonarcloud analysis
davidcuadrado Feb 4, 2025
038e779
optimized UserDocument.toString()
davidcuadrado Feb 4, 2025
7931028
replaced specific lombok annotations with @Data
davidcuadrado Feb 10, 2025
809fba4
Merge develop into feature branch
davidcuadrado Feb 10, 2025
38335a6
modified UserRepository method for solving conflict with feature/775 …
davidcuadrado Feb 11, 2025
242cbfd
branch conflict solving
davidcuadrado Feb 11, 2025
71bcd70
Merge branch 'develop' into feature/778-UsersCollection
davidcuadrado Feb 12, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions itachallenge-user/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ mongosh --port 27017 -u admin_user --authenticationDatabase "admin" -p
```
- Crear la nueva collection
```
db.createCollection("solutions");
db.createCollection("users");
```
- Desde fuera de db, importar el/los files de test en la base de datos `users`
```
mongoimport --db=users --username admin_user --authenticationDatabase admin --password mypassword --collection=solutions --jsonArray --file=user_score.json
mongoimport --db=users --username admin_user --authenticationDatabase admin --password mypassword --collection=users --jsonArray --file=users.json
```

### Configuración local de Redis
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
package com.itachallenge.user.document;

import lombok.*;
import org.springframework.data.annotation.Id;
import org.springframework.data.mongodb.core.mapping.Document;
import org.springframework.data.mongodb.core.mapping.Field;
import org.springframework.data.mongodb.core.index.Indexed;

import java.util.StringJoiner;
import java.util.UUID;

@AllArgsConstructor
@Data
@Builder
@NoArgsConstructor
@Document(collection="users")
public class UserDocument {

@Id
@Field("_id")
private UUID uuid;

@Field("username")
@Indexed(unique = true)
private String username;


@Override
public String toString() {
StringJoiner joiner = new StringJoiner(", ", "UserDocument{", "}");

if (uuid != null) {
joiner.add("uuid=" + uuid);
}
if (username != null) {
joiner.add("username='" + username + "'");
}

return joiner.toString();
}

}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ public void serialize(UserChallengeDto challenge, JsonGenerator gen, SerializerP
gen.writeEndObject();


}*/

}
}
*/
}
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
package com.itachallenge.user.repository;

import com.itachallenge.user.document.UserSolutionDocument;
import com.itachallenge.user.document.UserDocument;
import org.springframework.data.mongodb.repository.ReactiveMongoRepository;
import org.springframework.stereotype.Repository;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;

import java.util.UUID;

@Repository
public interface UserRepository extends ReactiveMongoRepository<UserSolutionDocument, UUID> {
public interface UserRepository extends ReactiveMongoRepository<UserDocument, UUID> {

Mono<UserSolutionDocument> findByUuid(UUID uuid);
Flux<UserSolutionDocument> findByUserId(UUID userId);
Mono<UserDocument> findByUuid(UUID uuid);
Mono<UserDocument> findByUsername(String username);
Mono<Boolean> existsByUuid(UUID uuid);
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
@echo off
echo Beginning of insertion

mongoimport --db=users --collection=mentors --jsonArray --file=mentors.json
mongoimport --db=users --collection=mentors --jsonArray --file=users.json

echo "Creating unique index in users.mentors collection"
mongosh --eval "db.getSiblingDB('users').mentors.createIndex({ user_id: 1}, { unique: true })"
echo "Creating unique index in users.users collection"
mongosh --eval "db.getSiblingDB('users').users.createIndex({ user_id: 1}, { unique: true })"

echo Done
exit
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

echo "Beginning of insertion"

mongoimport --db=users --username admin_user --authenticationDatabase admin --password yxRG4sYBDjPFzbh5 --collection=mentors --jsonArray --file=mentors.json
mongoimport --db=users --username admin_user --authenticationDatabase admin --password yxRG4sYBDjPFzbh5 --collection=users --jsonArray --file=users.json

echo "Creating unique index in mentors collection"
mongosh --eval "db.getSiblingDB('users').mentors.createIndex({ user_id: 1 }, { unique: true })"
echo "Creating unique index in users collection"
mongosh --eval "db.getSiblingDB('users').users.createIndex({ user_id: 1 }, { unique: true })"

echo "Done"
exit
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ db.createUser({

//use users
//create collections
//db.createCollection("solutions");
//db.createCollection("users");
Loading