Compare commits
	
		
			2 Commits
		
	
	
		
			25009ba149
			...
			c6198b7220
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| c6198b7220 | |||
| 13fd048cd2 | 
@ -43,7 +43,8 @@ public class MockController {
 | 
				
			|||||||
        User joe = new User("Mama","Joe","student@student.com","roundabout","DaWarudo",new Date(0), null,Role.Student,passwordEncoder.encode("student"));
 | 
					        User joe = new User("Mama","Joe","student@student.com","roundabout","DaWarudo",new Date(0), null,Role.Student,passwordEncoder.encode("student"));
 | 
				
			||||||
        User meh = new User("Inspiration","lackOf","secretary@secretary.com","a Box","the street",new Date(0), null,Role.Teacher,passwordEncoder.encode("secretary"));
 | 
					        User meh = new User("Inspiration","lackOf","secretary@secretary.com","a Box","the street",new Date(0), null,Role.Teacher,passwordEncoder.encode("secretary"));
 | 
				
			||||||
        User joke = new User("CthemBalls","Lemme","teacher@teacher.com","lab","faculty",new Date(0), null,Role.Teacher,passwordEncoder.encode("teacher"));
 | 
					        User joke = new User("CthemBalls","Lemme","teacher@teacher.com","lab","faculty",new Date(0), null,Role.Teacher,passwordEncoder.encode("teacher"));
 | 
				
			||||||
        mockUsers = new ArrayList<User>(Arrays.asList(herobrine,joe,meh,joke));
 | 
					        User lena = new User("Louille","Lena","inscriptionService@InscriptionService.com","no","yes",new Date(0), null,Role.Teacher,passwordEncoder.encode("inscriptionService"));
 | 
				
			||||||
 | 
					        mockUsers = new ArrayList<>(Arrays.asList(herobrine,joe,meh,joke));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        userRepo.saveAll(mockUsers);
 | 
					        userRepo.saveAll(mockUsers);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
				
			|||||||
@ -1,8 +1,6 @@
 | 
				
			|||||||
package ovh.herisson.Clyde.Services;
 | 
					package ovh.herisson.Clyde.Services;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import org.springframework.stereotype.Service;
 | 
					import org.springframework.stereotype.Service;
 | 
				
			||||||
import ovh.herisson.Clyde.EndPoints.LoginController;
 | 
					 | 
				
			||||||
import ovh.herisson.Clyde.Repositories.InscriptionRepository;
 | 
					 | 
				
			||||||
import ovh.herisson.Clyde.Tables.InscriptionRequest;
 | 
					import ovh.herisson.Clyde.Tables.InscriptionRequest;
 | 
				
			||||||
import ovh.herisson.Clyde.Tables.Role;
 | 
					import ovh.herisson.Clyde.Tables.Role;
 | 
				
			||||||
import ovh.herisson.Clyde.Tables.Token;
 | 
					import ovh.herisson.Clyde.Tables.Token;
 | 
				
			||||||
 | 
				
			|||||||
@ -4,23 +4,20 @@ import org.springframework.stereotype.Service;
 | 
				
			|||||||
import ovh.herisson.Clyde.Repositories.InscriptionRepository;
 | 
					import ovh.herisson.Clyde.Repositories.InscriptionRepository;
 | 
				
			||||||
import ovh.herisson.Clyde.Tables.InscriptionRequest;
 | 
					import ovh.herisson.Clyde.Tables.InscriptionRequest;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import java.util.HashMap;
 | 
					 | 
				
			||||||
import java.util.Map;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
@Service
 | 
					@Service
 | 
				
			||||||
public class InscriptionService {
 | 
					public class InscriptionService {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    InscriptionRepository incriptionRepo;
 | 
					    private final InscriptionRepository inscriptionRepo;
 | 
				
			||||||
    public void save(InscriptionRequest inscriptionRequest){
 | 
					    public void save(InscriptionRequest inscriptionRequest){
 | 
				
			||||||
        incriptionRepo.save(inscriptionRequest);
 | 
					        inscriptionRepo.save(inscriptionRequest);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public InscriptionService(InscriptionRepository inscriptionRepo){
 | 
					    public InscriptionService(InscriptionRepository inscriptionRepo){
 | 
				
			||||||
        this.incriptionRepo = inscriptionRepo;
 | 
					        this.inscriptionRepo = inscriptionRepo;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public InscriptionRequest getById(long id){
 | 
					    public InscriptionRequest getById(long id){
 | 
				
			||||||
        InscriptionRequest inscriptionRequest = incriptionRepo.findById(id);
 | 
					        InscriptionRequest inscriptionRequest = inscriptionRepo.findById(id);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if (inscriptionRequest == null){
 | 
					        if (inscriptionRequest == null){
 | 
				
			||||||
            return null;
 | 
					            return null;
 | 
				
			||||||
@ -29,6 +26,6 @@ public class InscriptionService {
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public Iterable<InscriptionRequest> getAll(){
 | 
					    public Iterable<InscriptionRequest> getAll(){
 | 
				
			||||||
        return incriptionRepo.findAll();
 | 
					        return inscriptionRepo.findAll();
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
@ -4,10 +4,8 @@ import org.springframework.stereotype.Service;
 | 
				
			|||||||
import org.springframework.web.multipart.MultipartFile;
 | 
					import org.springframework.web.multipart.MultipartFile;
 | 
				
			||||||
import ovh.herisson.Clyde.Repositories.FileRepository;
 | 
					import ovh.herisson.Clyde.Repositories.FileRepository;
 | 
				
			||||||
import ovh.herisson.Clyde.Tables.*;
 | 
					import ovh.herisson.Clyde.Tables.*;
 | 
				
			||||||
 | 
					 | 
				
			||||||
import java.io.File;
 | 
					import java.io.File;
 | 
				
			||||||
import java.io.IOException;
 | 
					import java.io.IOException;
 | 
				
			||||||
 | 
					 | 
				
			||||||
import java.nio.file.Files;
 | 
					import java.nio.file.Files;
 | 
				
			||||||
import java.nio.file.Path;
 | 
					import java.nio.file.Path;
 | 
				
			||||||
import java.nio.file.Paths;
 | 
					import java.nio.file.Paths;
 | 
				
			||||||
 | 
				
			|||||||
@ -5,16 +5,14 @@ import org.springframework.stereotype.Service;
 | 
				
			|||||||
import ovh.herisson.Clyde.Repositories.TokenRepository;
 | 
					import ovh.herisson.Clyde.Repositories.TokenRepository;
 | 
				
			||||||
import ovh.herisson.Clyde.Tables.Token;
 | 
					import ovh.herisson.Clyde.Tables.Token;
 | 
				
			||||||
import ovh.herisson.Clyde.Tables.User;
 | 
					import ovh.herisson.Clyde.Tables.User;
 | 
				
			||||||
 | 
					 | 
				
			||||||
import java.io.UnsupportedEncodingException;
 | 
					import java.io.UnsupportedEncodingException;
 | 
				
			||||||
import java.security.SecureRandom;
 | 
					import java.security.SecureRandom;
 | 
				
			||||||
import java.util.ArrayList;
 | 
					import java.util.ArrayList;
 | 
				
			||||||
import java.util.Calendar;
 | 
					import java.util.Calendar;
 | 
				
			||||||
import java.util.Date;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
@Service
 | 
					@Service
 | 
				
			||||||
public class TokenService {
 | 
					public class TokenService {
 | 
				
			||||||
    TokenRepository tokenRepo;
 | 
					    private final TokenRepository tokenRepo;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public TokenService(TokenRepository tokenRepo){
 | 
					    public TokenService(TokenRepository tokenRepo){
 | 
				
			||||||
        this.tokenRepo = tokenRepo;
 | 
					        this.tokenRepo = tokenRepo;
 | 
				
			||||||
 | 
				
			|||||||
@ -1,6 +1,6 @@
 | 
				
			|||||||
package ovh.herisson.Clyde.Tables;
 | 
					package ovh.herisson.Clyde.Tables;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import jakarta.persistence.Entity;
 | 
					import ja   karta.persistence.Entity;
 | 
				
			||||||
import jakarta.persistence.GeneratedValue;
 | 
					import jakarta.persistence.GeneratedValue;
 | 
				
			||||||
import jakarta.persistence.GenerationType;
 | 
					import jakarta.persistence.GenerationType;
 | 
				
			||||||
import jakarta.persistence.Id;
 | 
					import jakarta.persistence.Id;
 | 
				
			||||||
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user