Mailing list pages

.github/workflows/linter.yml

@@ -16,7 +16,7 @@ name: Lint Code Base
 #############################
 on:
   push:
-    branches-ignore: [master, main]
+    branches-ignore: [master, main, back_development]
     # Remove the line above to run when pushing to master
   pull_request:
     branches: [master, main]
@@ -35,6 +35,22 @@ jobs:
     # Load all steps #
     ##################
     steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'adopt'
+      - name: Build with Maven
+        run: |
+          cd src/backend/TimetableLinkAPI 
+          mvn --batch-mode --update-snapshots package
+      - name: Run the Maven verify phase
+        run: |
+          #cd src/backend/TimetableLinkAPI 
+          mvn --batch-mode --update-snapshots verify
+
+
       ##########################
       # Checkout the code base #
       ##########################

.github/workflows/mvn.yml

@@ -0,0 +1,28 @@
+name: Java CI
+
+on: 
+  push:
+    branches-ignore: [master, main, back_development]
+    # Remove the line above to run when pushing to master
+  pull_request:
+    branches: [master, main]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'adopt'
+      - name: Build with Maven
+        run: | 
+          cd src/backend/TimetableLinkAPI 
+          mvn --batch-mode --update-snapshots package
+      - name: Run the Maven verify phase
+        run: |
+          cd src/backend/TimetableLinkAPI 
+          mvn --batch-mode --update-snapshots verify

.gitignore

@@ -127,3 +127,6 @@ dmypy.json
 
 # Pyre type checker
 .pyre/
+
+#IntelliJ IDEA
+.idea

License.txt

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) [2022] [fullname]
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,29 +1,46 @@
-# Brief Intro
+[![License: MIT](https://img.shields.io/badge/License-MIT-brightgreen.svg)](https://opensource.org/licenses/MIT)
 
-Project repo to link Moodle, MS Exchange, DoE updates and University Events in one centralized system.
+# Cross Link for University Innopolis schedules
+
+---
+
+This application is a combination of all `Innopolis University` timetables. With it, DoE will create events that will be sent to the calendars of students and teachers of the university. Moreover, this application combines all the events created on `Moodle and MS Exchange` and also sends them to the `Outlook calendars` of students and teachers.
+
+![Create Mailing list](images/CreateList.png)
+
+## Why this important?
+
+In `University Innopolis` there a lot of links that have some events on them(e.g. `Moodle, Outlook, MS Exchange`). So, our application unite all these timetables and send them to `Outlook Calendar`, because every participant of University Innopolis has Outlook account.
+
+## How to use?
+
+our application is based on the site, so just open the site and log in. 
+[Event adder](https://degrassi-minister-88544.herokuapp.com/index.html)
+
+![Edit events](images/EditEvent.png)
+
+![Edit events Outlook](images/EditEvent2.png)
+
+## Features
+
+There's some features in our application : 
+1. `Adding events` to students' and teachers' calendars.
+2. `Edit and Delete` already created `events`
+3. `Import list of emails` from Outlook.
+4. `Create list of emails` on our site.
+5. `Edit and Delete` already created `mailing lists`.
+
+## Tools
+
+For frontend developing we used html, css and js. For backend developing of our site we used spring, docker, maven.
+
+![Edit mailing list](images/EditList.png)
+
+![Edit mailing list](images/EditList2.png)
 
 ## Important Links
 
 - [Usecase Diagram](https://drive.google.com/file/d/1nr23I5055SIXLq0PMvGGDPZAzz01xiW4/view?usp=sharing)
 - [User Story](https://docs.google.com/spreadsheets/d/12BQN_QRp9IU6oKfjrk3xJsV7YisZib4y3s285RwqUo4/edit?usp=sharing)
 - [Product Backlog](https://docs.google.com/document/d/1eF4ok6R33ai33qpmHXXPxxG4ZWCH8k8phtmZDnNVtxg/edit?usp=sharing)
-- [API Design](https://app.swaggerhub.com/apis/Timetable2/timetable/1.0.0)
 - [Mock Server](https://www.postman.com/orange-astronaut-888988/workspace/timetable-api/collection/21222264-0d7b6da3-1e13-4bd9-af09-11720e694a00?ctx=documentation)
-
-## Developer Guide
-
-### Branching Rules
-- Keep branch names relevant to the sprint task (i.e. LoginFeature, EventFrontend)
-- Maintain separate branch for separate tasks
-
-### Commits
-- Commit message format - `[Commit Type] - [Brief]`
-    Commit types
-    - Patch
-    - Feature
-    - Minor Change
-- Keep commit to their respective branch (i.e. `Patch - Fixed frontend taskbar responsiveness` should not be commited to `LoginFeature` branch)
-
-## Pushing
-- Pushing to master is forbidden, branches would be merged later
-- To be accepted for a merge, code should either pass unittest (if applicable) or be checked for bugs by at least one other developer

src/backend/TimetableLinkAPI/Dockerfile

@@ -0,0 +1,11 @@
+FROM maven as builder
+WORKDIR /usr/src/app
+COPY pom.xml .
+RUN mvn -B -e -C -T 1C org.apache.maven.plugins:maven-dependency-plugin:3.1.2:go-offline
+COPY . .
+RUN mvn package
+
+FROM openjdk:17
+EXPOSE 8080
+COPY --from=builder /usr/src/app/target/*.jar ./
+ENTRYPOINT ["java", "-jar", "/spring-boot-docker.jar"]

src/backend/TimetableLinkAPI/Procfile

@@ -0,0 +1 @@
+web: java $JAVA_OPTS -Dserver.port=$PORT -jar target/*.jar

src/backend/TimetableLinkAPI/docker-compose.yml

@@ -1,16 +1,32 @@
 version: '3'
-
 services:
+  server:
+    container_name: timetable_server
+    build: .
+    environment:
+      SPRING_APPLICATION_JSON: '{
+           "spring.datasource.url"  : "jdbc:mysql://db:3306/timetable"
+         }'
+    ports:
+      - "8080:8080"
+    depends_on:
+      - db
+    restart: on-failure
+
+
   db:
+    container_name: timetable_db
     image: mysql:8.0
     platform: linux/x86_64
     restart: always
-    command: --init-file /data/application/init.sql
-    volumes:
-      - ./init.sql:/data/application/init.sql
+#    command: --init-file /data/application/schema.sql
+#    volumes:
+#      - ./schema.sql:/data/application/schema.sql
     environment:
       - MYSQL_DATABASE=timetable
       - MYSQL_ROOT_PASSWORD=pass
     ports:
-      - '3306:3306'
+      - "3306:3306"
+
+
 

src/backend/TimetableLinkAPI/pom.xml

@@ -53,24 +53,62 @@
             <version>5.3.20</version>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/junit/junit -->
+        <!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api -->
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.13.2</version>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>5.9.0-M1</version>
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>test</scope>
+        </dependency>
 
-    </dependencies>
+        <!-- https://mvnrepository.com/artifact/org.assertj/assertj-core -->
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>3.23.1</version>
+            <scope>test</scope>
+        </dependency>
 
+        <!-- https://mvnrepository.com/artifact/org.mockito/mockito-core -->
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>4.6.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jdbc</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <scope>runtime</scope>
+            <optional>true</optional>
+        </dependency>
+
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-security</artifactId>-->
+<!--            <version>2.3.3.RELEASE</version>-->
+<!--        </dependency>-->
+    </dependencies>
     <build>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${project.parent.version}</version>
             </plugin>
         </plugins>
+        <finalName>spring-boot-docker</finalName>
     </build>
-
 </project>

src/backend/TimetableLinkAPI/src/main/java/com/timetable/App.java

@@ -1,6 +1,9 @@
 package com.timetable;
 
 //import com.timetable.jdbc.SpringJdbcConfig;
+import com.timetable.authentication.AuthenticationConfig;
+import com.timetable.authentication.AuthenticationRepository;
+import com.timetable.authentication.RequestAuthenticationCheck;
 import com.timetable.jdbc.SpringJdbcConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -11,31 +14,25 @@
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.DriverManagerDataSource;
-import org.springframework.web.servlet.config.annotation.*;
-
-import javax.sql.DataSource;
+import org.springframework.web.context.request.WebRequestInterceptor;
+import org.springframework.web.servlet.HandlerInterceptor;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
 @SpringBootApplication
-@Import({SpringJdbcConfig.class})
-//@EnableWebMvc
-public class App  {
+@Import({SpringJdbcConfig.class, AuthenticationConfig.class})
+public class App extends WebMvcConfigurerAdapter {
     public static void main(String[] args) {
         SpringApplication.run(App.class, args);
     }
 
-//    @Override
-//    public void addViewControllers(ViewControllerRegistry registry) {
-//        registry.addViewController("/").setViewName("forward:/index.html");
-//    }
-//
-//    @Bean
-//    public WebMvcConfigurer corsConfigurer() {
-//        return new WebMvcConfigurerAdapter() {
-//            @Override
-//            public void addCorsMappings(CorsRegistry registry) {
-//                registry.addMapping("/**")
-//                        .allowedMethods("HEAD", "GET", "PUT", "POST", "DELETE", "PATCH");
-//            }
-//        };
-//    }
+    @Autowired
+    private RequestAuthenticationCheck authenticationInterceptor;
+
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(authenticationInterceptor);
+    }
 }

src/backend/TimetableLinkAPI/src/main/java/com/timetable/authentication/AuthenticationConfig.java

@@ -0,0 +1,29 @@
+package com.timetable.authentication;
+
+import com.timetable.jdbc.SpringJdbcConfig;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.SpringApplication;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+
+@Configuration
+@ComponentScan
+public class AuthenticationConfig extends WebMvcConfigurerAdapter {
+
+    private final RequestAuthenticationCheck authenticationInterceptor;
+
+    @Autowired
+    public AuthenticationConfig(RequestAuthenticationCheck authenticationInterceptor) {
+        this.authenticationInterceptor = authenticationInterceptor;
+    }
+
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(authenticationInterceptor);
+    }
+}