Kris user service

.gitignore

@@ -38,4 +38,16 @@ typings
 .node_repl_history
 
 #Ignore .class files
-*.class
+*.class
+/target/
+/.idea/
+/.settings/
+ffq-user-service.iml
+/bin/
+/vpproject/
+*.iml
+.classpath
+.project
+/.vs/ffq-user-service/v16/.suo
+/.vs/ProjectSettings.json
+/.vs/slnx.sqlite

README.md

@@ -11,7 +11,7 @@ This service will serve as a backing store for the users and clinics that will b
 >Load database on startup
 - Start the application with the following args: 
 - -Dmongo.users.load="true"
-- ie) ``mvn spring-boot:run -Dmongo.users.load="true"``
+- ie) ``mvn spring-boot:run -Dspring.boot.run.arguments="--mongo.users.load=true"``
 
 >Database Information
 - Database name: **ffq_database**

azure-pipelines.yml

@@ -0,0 +1,33 @@
+# Maven
+# Build your Java project and run tests with Apache Maven.
+# Add steps that analyze code, save build artifacts, deploy, and more:
+# https://docs.microsoft.com/azure/devops/pipelines/languages/java
+
+trigger:
+- master
+
+pool:
+  vmImage: 'ubuntu-latest'
+
+steps:
+- task: Maven@3
+  inputs:
+    mavenPomFile: 'pom.xml'
+    mavenOptions: '-Xmx3072m'
+    javaHomeOption: 'JDKVersion'
+    jdkVersionOption: '1.11'
+    jdkArchitectureOption: 'x64'
+    publishJUnitResults: true
+    testResultsFiles: '**/surefire-reports/TEST-*.xml'
+    options: '-Pprod'
+    goals: 'package'
+
+- task: CopyFiles@2
+  inputs:
+    SourceFolder: 'target'
+    Contents: '*.jar'
+    TargetFolder: '$(Build.ArtifactStagingDirectory)'
+- task: PublishBuildArtifacts@1
+  inputs:
+    pathtoPublish: '$(Build.ArtifactStagingDirectory)'
+    artifactName: ffq-fooduserservice

pom.xml

@@ -2,12 +2,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-<!--	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.0.BUILD-SNAPSHOT</version>
-		<relativePath/> 
-	</parent> -->
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
@@ -20,14 +14,6 @@
 	<name>FFQ User Service</name>
 	<description>Service for handling users and security.</description>
 
-	<!--
-	<groupId>com.example</groupId>
-	<artifactId>demo</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
-	<name>demo</name>
-	<description>Demo project for Spring Boot</description>
-	-->
-
 	<properties>
 		<java.version>1.8</java.version>
 		<jackson.databind.version>2.9.10.4</jackson.databind.version>
@@ -45,13 +31,6 @@
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
 
-		<!---->
-		<!--
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-security</artifactId>
-		</dependency>
-		-->
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
@@ -78,11 +57,6 @@
     		<artifactId>json-simple</artifactId>
     		<version>1.1</version>
 		</dependency>
-
-
-
-
-		<!---->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-devtools</artifactId>
@@ -100,9 +74,16 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<!-- https://mvnrepository.com/artifact/org.springframework.security/spring-security-crypto -->
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-crypto</artifactId>
+			<version>5.4.0</version>
+		</dependency>
 	</dependencies>
 
 	<build>
+		<finalName>app</finalName>
 		<plugins>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>

src/main/java/edu/fiu/ffqr/FFQUserApplication.java

@@ -19,34 +19,42 @@ public class FFQUserApplication {
 
 	public static void main(String[] args) throws JsonMappingException, IOException, InterruptedException {
 		ApplicationContext ctx = SpringApplication.run(FFQUserApplication.class, args);
-
-				//******************************WARNING***********************//
-		// This should never be run on production/staging environment or all data will be lost
-		//=======================================================================================
-		// Only uncomment this below if you want to test locally using the predefined users below.
+
+		// ******************************WARNING***********************//
+		// This should never be run on production/staging environment or all data will
+		// be lost
+		// =======================================================================================
+		// Only uncomment this below if you want to test locally using the predefined
+		// users below.
 		// This will remove ALL User Data.
 
 		String loadDataArg = (String) ctx.getBean("loadUsersEnvVar");
 		if (loadDataArg.equalsIgnoreCase("true")) {
-			DataLoader loader = (DataLoader)ctx.getBean(DataLoader.class);
+			DataLoader loader = (DataLoader) ctx.getBean(DataLoader.class);
+			/*
+			 * Uncomment methods below if you need to seedthe database. Imporant: uncomment
+			 * only what's needed
+			 * 
+			 * 
+			 * 
+			 */
 			loader.loadAdmin();
 			loader.loadClinicians();
 			loader.loadParents();
 			loader.loadClinics();
+			loader.loadResearcherParticipants();
+			loader.loadResearch();
+			loader.loadResearchInstitution();
+
 		}
-		//======================================================================================
-
+		// ======================================================================================
 
-		// DataLoader loader = (DataLoader)ctx.getBean(DataLoader.class);
-		// loader.loadAdmin();
-		// 	loader.loadClinicians();
-		// 	loader.loadParents();
-		// 	loader.loadClinics();
 
+
 	}
-	
+
 	@Bean
-	public String loadUsersEnvVar(@Value("${mongo.users.load}")String value) {
+	public String loadUsersEnvVar(@Value("${mongo.users.load}") String value) {
 		return value;
 	}
 }

src/main/java/edu/fiu/ffqr/controller/AdminController.java

@@ -31,7 +31,7 @@
 
 
 @RestController
-@CrossOrigin(origins = "http://localhost:4200")
+@CrossOrigin(origins = "*")
 @RequestMapping("/admins")
 public class AdminController {