Skip to content

Tm p1 #11

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.

Sign up for GitHub

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

Open
MelroseDigital wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Tm p1 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f177310
Merge pull request #6 from SyntaxError-JARS/main
MelroseDigital Jun 2, 2022
01a702b
Hibernate Testing
MelroseDigital Jun 3, 2022
7a27008
update
MelroseDigital Jun 3, 2022
130b623
Testing Update
MelroseDigital Jun 3, 2022
14d6d2c
Post-Hibernate Migration
MelroseDigital Jun 4, 2022
8f23cf8
"Post-Azure Updates"
MelroseDigital Jun 5, 2022
dc7fa5f
"Minor Troubleshooting"
MelroseDigital Jun 6, 2022
4c8be12
"Minor Troubleshooting"
MelroseDigital Jul 4, 2022
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
Binary file added .DS_Store
View file
Open in desktop
Binary file not shown.
286 changes: 121 additions & 165 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>

<groupId>com.revature</groupId>
<artifactId>Pi2a1000Places</artifactId>
<artifactId>Pi1000Places</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>war</packaging>

Expand All @@ -14,101 +14,77 @@
<maven.compiler.target>8</maven.compiler.target>
</properties>


<build>
<pluginManagement>
<plugins>
<!-- <build>-->
<!-- <pluginManagement>-->
<!-- <plugins>-->
<!-- <plugin>-->
<!-- <groupId>org.apache.tomcat.maven</groupId>-->
<!-- <artifactId>tomcat7-maven-plugin</artifactId>-->
<!-- <version>2.2</version>-->
<!-- <configuration>-->
<!-- <url>http://localhost:8080/manager/text</url>-->
<!-- <server>LocalTomcat</server>-->
<!-- <path>/Pi1000Places/</path>-->
<!-- <update>true</update>-->
<!-- </configuration>-->
<!-- </plugin>-->
<!-- </plugins>-->
<!-- </pluginManagement>-->
<!-- </build>-->

<!-- https://docs.microsoft.com/en-us/azure/app-service/app-service-web-get-started-java -->
<plugins>
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
<version>2.2</version>
<configuration>
<url>http://localhost:8080/manager/text</url>
<server>LocalTomcat</server>
<path>/PitoA1000Places</path>
<update>true</update>
</configuration>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>

<!-- <build>-->
<!-- <pluginManagement>-->
<!-- <plugins>-->
<!-- <plugin>-->
<!-- <groupId>org.apache.tomcat.maven</groupId>-->
<!-- <artifactId>tomcat7-maven-plugin</artifactId>-->
<!-- <version>2.2</version>-->
<!-- <configuration>-->
<!-- <url>http://localhost:3000/manager/text</url>-->
<!-- <server>LocalTomcat</server>-->
<!-- <path>/PitoA1000Places</path>-->
<!-- <update>true</update>-->
<!-- </configuration>-->
<!-- </plugin>-->
<!-- </plugins>-->
<!-- </pluginManagement>-->
<!-- </build>-->




<!-- <build>-->
<!-- &lt;!&ndash; https://docs.microsoft.com/en-us/azure/app-service/app-service-web-get-started-java &ndash;&gt;-->
<!-- <plugins>-->
<!-- <plugin>-->
<!-- <artifactId>maven-compiler-plugin</artifactId>-->
<!-- <version>3.8.1</version>-->
<!-- <configuration>-->
<!-- <source>1.8</source>-->
<!-- <target>1.8</target>-->
<!-- </configuration>-->
<!-- </plugin>-->
<!-- &lt;!&ndash;************************************************* &ndash;&gt;-->
<!-- &lt;!&ndash; Deploy to Tomcat in App Service Windows &ndash;&gt;-->
<!-- &lt;!&ndash;************************************************* &ndash;&gt;-->
<!-- <plugin>-->
<!-- <groupId>com.microsoft.azure</groupId>-->
<!-- <artifactId>azure-webapp-maven-plugin</artifactId>-->
<!-- <version>2.2.0</version>-->
<!-- <configuration>-->
<!-- &lt;!&ndash; Specify v2 schema &ndash;&gt;-->
<!-- <schemaVersion>v2</schemaVersion>-->
<!-- &lt;!&ndash; App information &ndash;&gt;-->
<!-- &lt;!&ndash; SUBSCRIPTION_ID Unique ID for the subscription that deploys the app&ndash;&gt;-->
<!-- <subscriptionId>9cc4b7e1-da29-4fd8-8ac8-1e56252688f4</subscriptionId>-->
<!-- &lt;!&ndash; RESOURCEGROUP_NAME &ndash;&gt;-->
<!-- <resourceGroup>sqldatabase</resourceGroup>-->
<!-- &lt;!&ndash; WEBAPP_NAME &ndash;&gt;-->
<!-- <appName>zahfosha</appName>-->
<!-- &lt;!&ndash; REGION &ndash;&gt;-->
<!-- <region>East US</region>-->
<!-- &lt;!&ndash; Java Runtime Stack for App Service on Windows &ndash;&gt;-->
<!-- <runtime>-->
<!-- <os>windows</os>-->
<!-- <javaVersion>1.8</javaVersion>-->
<!-- <webContainer>tomcat 9.0</webContainer>-->
<!-- </runtime>-->
<!-- <deployment>-->
<!-- <resources>-->
<!-- <resource>-->
<!-- <directory>${project.basedir}/target</directory>-->
<!-- <includes>-->
<!-- <include>*.war</include>-->
<!-- </includes>-->
<!-- </resource>-->
<!-- </resources>-->
<!-- </deployment>-->
<!-- &lt;!&ndash; DO NOT REMOVE THE PRICING TIER ITS THE CHEAPEST&ndash;&gt;-->
<!-- <pricingTier>B1</pricingTier>-->
<!-- </configuration>-->
<!-- </plugin>-->
<!-- </plugins>-->
<!-- </build>-->
<!--************************************************* -->
<!-- Deploy to Tomcat in App Service Windows -->
<!--************************************************* -->
<plugin>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-webapp-maven-plugin</artifactId>
<version>2.2.0</version>
<configuration>
<!-- Specify v2 schema -->
<schemaVersion>v2</schemaVersion>
<!-- App information -->
<!-- SUBSCRIPTION_ID Unique ID for the subscription that deploys the app-->
<subscriptionId>9cc4b7e1-da29-4fd8-8ac8-1e56252688f4</subscriptionId>
<!-- RESOURCEGROUP_NAME -->
<resourceGroup>sqldatabase</resourceGroup>
<!-- WEBAPP_NAME -->
<appName>PitoA1000Places</appName>
<!-- REGION -->
<region>East US</region>
<!-- Java Runtime Stack for App Service on Windows -->
<runtime>
<os>windows</os>
<javaVersion>1.8</javaVersion>
<webContainer>tomcat 9.0</webContainer>
</runtime>
<deployment>
<resources>
<resource>
<directory>${project.basedir}/target</directory>
<includes>
<include>*.war</include>
</includes>
</resource>
</resources>
</deployment>
<!-- DO NOT REMOVE THE PRICING TIER ITS THE CHEAPEST-->
<pricingTier>B1</pricingTier>
</configuration>
</plugin>
</plugins>


<!-- <build>-->
<!-- <build>-->
<!-- <pluginManagement>-->
<!-- <plugins>-->
<!-- <plugin>-->
Expand All @@ -128,58 +104,58 @@



<!-- <build>-->
<!-- &lt;!&ndash; https://docs.microsoft.com/en-us/azure/app-service/app-service-web-get-started-java &ndash;&gt;-->
<!-- <plugins>-->
<!-- <plugin>-->
<!-- <artifactId>maven-compiler-plugin</artifactId>-->
<!-- <version>3.8.1</version>-->
<!-- <configuration>-->
<!-- <source>1.8</source>-->
<!-- <target>1.8</target>-->
<!-- </configuration>-->
<!-- </plugin>-->
<!-- &lt;!&ndash;************************************************* &ndash;&gt;-->
<!-- &lt;!&ndash; Deploy to Tomcat in App Service Windows &ndash;&gt;-->
<!-- &lt;!&ndash;************************************************* &ndash;&gt;-->
<!-- <plugin>-->
<!-- <groupId>com.microsoft.azure</groupId>-->
<!-- <artifactId>azure-webapp-maven-plugin</artifactId>-->
<!-- <version>2.2.0</version>-->
<!-- <configuration>-->
<!-- &lt;!&ndash; Specify v2 schema &ndash;&gt;-->
<!-- <schemaVersion>v2</schemaVersion>-->
<!-- &lt;!&ndash; App information &ndash;&gt;-->
<!-- &lt;!&ndash; SUBSCRIPTION_ID Unique ID for the subscription that deploys the app&ndash;&gt;-->
<!-- <subscriptionId>9cc4b7e1-da29-4fd8-8ac8-1e56252688f4</subscriptionId>-->
<!-- &lt;!&ndash; RESOURCEGROUP_NAME &ndash;&gt;-->
<!-- <resourceGroup>sqldatabase</resourceGroup>-->
<!-- &lt;!&ndash; WEBAPP_NAME &ndash;&gt;-->
<!-- <appName>PitoA1000Places</appName>-->
<!-- &lt;!&ndash; REGION &ndash;&gt;-->
<!-- <region>East US</region>-->
<!-- &lt;!&ndash; Java Runtime Stack for App Service on Windows &ndash;&gt;-->
<!-- <runtime>-->
<!-- <os>windows</os>-->
<!-- <javaVersion>1.8</javaVersion>-->
<!-- <webContainer>tomcat 9.0</webContainer>-->
<!-- </runtime>-->
<!-- <deployment>-->
<!-- <resources>-->
<!-- <resource>-->
<!-- <directory>${project.basedir}/target</directory>-->
<!-- <includes>-->
<!-- <include>*.war</include>-->
<!-- </includes>-->
<!-- </resource>-->
<!-- </resources>-->
<!-- </deployment>-->
<!-- &lt;!&ndash; DO NOT REMOVE THE PRICING TIER ITS THE CHEAPEST&ndash;&gt;-->
<!-- <pricingTier>B1</pricingTier>-->
<!-- </configuration>-->
<!-- </plugin>-->
<!-- </plugins>-->
<!-- </build>-->
<build>
<!-- https://docs.microsoft.com/en-us/azure/app-service/app-service-web-get-started-java -->
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<!--************************************************* -->
<!-- Deploy to Tomcat in App Service Windows -->
<!--************************************************* -->
<plugin>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-webapp-maven-plugin</artifactId>
<version>2.2.0</version>
<configuration>
<!-- Specify v2 schema -->
<schemaVersion>v2</schemaVersion>
<!-- App information -->
<!-- SUBSCRIPTION_ID Unique ID for the subscription that deploys the app-->
<subscriptionId>005be574-60e2-49d1-8b2c-172a8a71c4a6</subscriptionId>
<!-- RESOURCEGROUP_NAME -->
<resourceGroup>project</resourceGroup>
<!-- WEBAPP_NAME -->
<appName>Pi1000</appName>
<!-- REGION -->
<region>West US</region>
<!-- Java Runtime Stack for App Service on Windows -->
<runtime>
<os>windows</os>
<javaVersion>1.8</javaVersion>
<webContainer>tomcat 9.0</webContainer>
</runtime>
<deployment>
<resources>
<resource>
<directory>${project.basedir}/target</directory>
<includes>
<include>*.war</include>
</includes>
</resource>
</resources>
</deployment>
<!-- DO NOT REMOVE THE PRICING TIER ITS THE CHEAPEST-->
<pricingTier>B1</pricingTier>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
<!-- this is a comment -->
Expand Down Expand Up @@ -213,13 +189,6 @@
<scope>provided</scope>
</dependency>

<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.13.2.2</version>
</dependency>

<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand All @@ -240,20 +209,7 @@
<artifactId>mssql-jdbc</artifactId>
<version>10.2.1.jre8</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.8.2</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.8.2</version>
<scope>test</scope>
</dependency>

</dependencies>
</dependencies>

</project>
1 change: 1 addition & 0 deletions src/main/java/com/revature/Pi2a1000Places/auth/AuthServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.revature.Pi2a1000Places.util.exceptions.AuthenticationException;
import com.revature.Pi2a1000Places.util.exceptions.InvalidRequestException;


import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Expand Down
20 changes: 17 additions & 3 deletions src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,34 @@
package com.revature.Pi2a1000Places.creditcard;

import javax.persistence.*;

@Entity
@Table (name = "credit_card")
public class CreditCard {
//CC value setup - initializing

@Id
@Column(name="cc_number")
@GeneratedValue(strategy= GenerationType.AUTO)
private String ccNumber;
//CC value setup - initializing
@Column (name= "cc_Name")
private String ccName;
@Column (name= "cvv")
private int cvv;
@Column (name="exp_Date")
private String expDate;
@Column (name ="zip")
private int zip;
@Column (name ="limit")
private int limit;
@Column (name ="user_Name")
private String userName;

//Creating Constructors for the CC Class
//CC Class Constructors


public CreditCard(String ccNumber, String ccName, int cvv, String expDate, int zip, int limit, String userName) {
this.ccNumber = ccNumber;

this.ccName = ccName;
this.cvv = cvv;
this.expDate = expDate;
Expand Down
Loading