ramon
/
skillbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects 1 Releases 1 Wiki Activity

Add coupon call in frontend, add tests, fix api

This commit is contained in:
Christian Cueni 2020-02-13 10:01:45 +01:00
parent f5ddff12e3
commit 82c1135f0e
14 changed files with 17329 additions and 17021 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

320
client/cypress/fixtures/schema.json
View File

@ -1500,6 +1500,79 @@
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "myInstrumentActivity",
"description": null,
"args": [
{
"name": "before",
"description": null,
"type": {
"kind": "SCALAR",
"name": "String",
"ofType": null
},
"defaultValue": null
},
{
"name": "after",
"description": null,
"type": {
"kind": "SCALAR",
"name": "String",
"ofType": null
},
"defaultValue": null
},
{
"name": "first",
"description": null,
"type": {
"kind": "SCALAR",
"name": "Int",
"ofType": null
},
"defaultValue": null
},
{
"name": "last",
"description": null,
"type": {
"kind": "SCALAR",
"name": "Int",
"ofType": null
},
"defaultValue": null
},
{
"name": "slug",
"description": null,
"type": {
"kind": "SCALAR",
"name": "String",
"ofType": null
},
"defaultValue": null
},
{
"name": "type",
"description": null,
"type": {
"kind": "SCALAR",
"name": "String",
"ofType": null
},
"defaultValue": null
}
],
"type": {
"kind": "OBJECT",
"name": "InstrumentNodeConnection",
"ofType": null
},
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "node",
"description": "The ID of the object",
@ -8961,6 +9034,33 @@
"name": "Mutation",
"description": null,
"fields": [
{
"name": "redeemCoupon",
"description": null,
"args": [
{
"name": "input",
"description": null,
"type": {
"kind": "NON_NULL",
"name": null,
"ofType": {
"kind": "INPUT_OBJECT",
"name": "CouponInput",
"ofType": null
}
},
"defaultValue": null
}
],
"type": {
"kind": "OBJECT",
"name": "CouponPayload",
"ofType": null
},
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "spellCheck",
"description": null,
@ -9486,6 +9586,33 @@
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "coupon",
"description": null,
"args": [
{
"name": "input",
"description": null,
"type": {
"kind": "NON_NULL",
"name": null,
"ofType": {
"kind": "INPUT_OBJECT",
"name": "CouponInput",
"ofType": null
}
},
"defaultValue": null
}
],
"type": {
"kind": "OBJECT",
"name": "CouponPayload",
"ofType": null
},
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "updateObjectiveProgress",
"description": null,
@ -10017,6 +10144,111 @@
"enumValues": null,
"possibleTypes": null
},
{
"kind": "OBJECT",
"name": "CouponPayload",
"description": null,
"fields": [
{
"name": "success",
"description": null,
"args": [],
"type": {
"kind": "SCALAR",
"name": "Boolean",
"ofType": null
},
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "errors",
"description": null,
"args": [],
"type": {
"kind": "LIST",
"name": null,
"ofType": {
"kind": "OBJECT",
"name": "CouponError",
"ofType": null
}
},
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "clientMutationId",
"description": null,
"args": [],
"type": {
"kind": "SCALAR",
"name": "String",
"ofType": null
},
"isDeprecated": false,
"deprecationReason": null
}
],
"inputFields": null,
"interfaces": [],
"enumValues": null,
"possibleTypes": null
},
{
"kind": "OBJECT",
"name": "CouponError",
"description": null,
"fields": [
{
"name": "field",
"description": null,
"args": [],
"type": {
"kind": "SCALAR",
"name": "String",
"ofType": null
},
"isDeprecated": false,
"deprecationReason": null
}
],
"inputFields": null,
"interfaces": [],
"enumValues": null,
"possibleTypes": null
},
{
"kind": "INPUT_OBJECT",
"name": "CouponInput",
"description": null,
"fields": null,
"inputFields": [
{
"name": "couponCodeInput",
"description": null,
"type": {
"kind": "SCALAR",
"name": "String",
"ofType": null
},
"defaultValue": null
},
{
"name": "clientMutationId",
"description": null,
"type": {
"kind": "SCALAR",
"name": "String",
"ofType": null
},
"defaultValue": null
}
],
"interfaces": null,
"enumValues": null,
"possibleTypes": null
},
{
"kind": "OBJECT",
"name": "SpellCheckPayload",
@ -10217,6 +10449,18 @@
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "message",
"description": null,
"args": [],
"type": {
"kind": "SCALAR",
"name": "String",
"ofType": null
},
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "errors",
"description": null,
@ -10226,7 +10470,7 @@
"name": null,
"ofType": {
"kind": "OBJECT",
"name": "MutationError",
"name": "RegistrationError",
"ofType": null
}
},
@ -10253,7 +10497,7 @@
},
{
"kind": "OBJECT",
"name": "MutationError",
"name": "RegistrationError",
"description": null,
"fields": [
{
@ -10267,45 +10511,6 @@
},
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "errors",
"description": null,
"args": [],
"type": {
"kind": "LIST",
"name": null,
"ofType": {
"kind": "OBJECT",
"name": "PublicFieldError",
"ofType": null
}
},
"isDeprecated": false,
"deprecationReason": null
}
],
"inputFields": null,
"interfaces": [],
"enumValues": null,
"possibleTypes": null
},
{
"kind": "OBJECT",
"name": "PublicFieldError",
"description": null,
"fields": [
{
"name": "code",
"description": null,
"args": [],
"type": {
"kind": "SCALAR",
"name": "String",
"ofType": null
},
"isDeprecated": false,
"deprecationReason": null
}
],
"inputFields": null,
@ -10320,37 +10525,7 @@
"fields": null,
"inputFields": [
{
"name": "firstnameInput",
"description": null,
"type": {
"kind": "SCALAR",
"name": "String",
"ofType": null
},
"defaultValue": null
},
{
"name": "lastnameInput",
"description": null,
"type": {
"kind": "SCALAR",
"name": "String",
"ofType": null
},
"defaultValue": null
},
{
"name": "emailInput",
"description": null,
"type": {
"kind": "SCALAR",
"name": "String",
"ofType": null
},
"defaultValue": null
},
{
"name": "licenseKeyInput",
"name": "confirmationKeyInput",
"description": null,
"type": {
"kind": "SCALAR",
@ -15651,4 +15826,5 @@
}
]
}
}

95
client/cypress/integration/coupon.spec.js Normal file
View File

@ -0,0 +1,95 @@
const schema = require('../fixtures/schema.json');
describe('Email Verifcation', () => {
beforeEach(() => {
cy.server();
});
it('forwards to homepage if confirmation key is correct', () => {
cy.viewport('macbook-15');
cy.mockGraphql({
schema: schema,
operations: {
Coupon: variables => {
return {
coupon: {
errors: [],
success: true
}
}
},
}
});
cy.login('rahel.cueni', 'test', true)
cy.get('[data-cy="rooms-link"]').contains('Alle Räume anzeigen');
cy.visit('/license-activation');
cy.redeemCoupon('12345asfd');
cy.get('finishTest')
});
it('displays error if input is missing', () => {
cy.viewport('macbook-15');
cy.login('rahel.cueni', 'test', true)
cy.get('[data-cy="rooms-link"]').contains('Alle Räume anzeigen');
cy.visit('/license-activation');
cy.redeemCoupon('');
cy.get('[data-cy="coupon-local-errors"]').contains('Coupon ist ein Pflichtfeld.');
});
it('displays error if coupon input is wrong', () => {
cy.viewport('macbook-15');
cy.mockGraphql({
schema: schema,
operations: {
Coupon: variables => {
return {
coupon: {
errors: [{
field: 'invalid_coupon'
}],
success: false
}
}
},
}
});
cy.login('rahel.cueni', 'test', true)
cy.get('[data-cy="rooms-link"]').contains('Alle Räume anzeigen');
cy.visit('/license-activation');
cy.redeemCoupon('12345asfd');
cy.get('[data-cy="coupon-remote-errors"]').contains('Der angegebene Coupon-Code ist falsch.');
});
it('displays error if an error occures', () => {
cy.viewport('macbook-15');
cy.mockGraphql({
schema: schema,
operations: {
Coupon: variables => {
return {
coupon: {
errors: [{
field: 'unknown_error'
}],
success: false
}
}
},
}
});
cy.login('rahel.cueni', 'test', true)
cy.get('[data-cy="rooms-link"]').contains('Alle Räume anzeigen');
cy.visit('/license-activation');
cy.redeemCoupon('12345asfd');
cy.get('[data-cy="coupon-remote-errors"]').contains('Es ist ein Fehler aufgetreten. Bitte versuchen Sie es nochmals oder kontaktieren Sie den Administrator.');
});
});

2
client/cypress/integration/login.spec.js
View File

@ -20,7 +20,7 @@ describe('Login', () => {
it('displays error message if password is wrong', () => {
cy.viewport('macbook-15');
cy.route('POST', isEmailAvailableUrl, "false");
cy.route('POST', isEmailAvailableUrl, 'false');
cy.route({
method: 'POST',
status: 401,

9
client/cypress/support/commands.js
View File

@ -54,7 +54,7 @@ Cypress.Commands.add('apolloLogin', (username, password) => {
// todo: replace with apollo call
Cypress.Commands.add("login", (username, password, visitLogin = false) => {
if (visitLogin) {
cy.visit('/login');
cy.visit('/login-local');
}
if (username != '') {
@ -159,3 +159,10 @@ Cypress.Commands.add('register', (prefix, firstname, lastname, password, passwor
cy.get('[data-cy="register-button"]').click();
});
Cypress.Commands.add('redeemCoupon', coupon => {
if (coupon !== '') {
cy.get('[data-cy="coupon-input"]').type(coupon);
}
cy.get('[data-cy="coupon-button"]').click();
})

8
client/src/graphql/gql/mutations/redeemCoupon.gql Normal file
View File

@ -0,0 +1,8 @@
mutation Coupon($input: CouponInput!){
coupon(input: $input) {
success
errors {
field
}
}
}

52
client/src/pages/license-activation.vue
View File

@ -12,7 +12,7 @@
id="coupon"
name="coupon"
type="coupon"
data-vv-as="Passwort"
data-vv-as="Coupon"
v-model="coupon"
v-validate="'required'"
:class="{ 'skillboxform-input__input--error': errors.has('coupon') }"
@ -33,9 +33,6 @@
data-cy="coupon-remote-errors"
>{{ error }}</small>
</div>
<div class="skillboxform-input">
<small class="skillboxform-input__error" data-cy="coupon-error" v-if="loginError">{{couponError}}</small>
</div>
<div class="actions">
<button class="button button--primary button--big actions__submit" data-cy="coupon-button">Coupon abschicken</button>
</div>
@ -53,29 +50,44 @@
<script>
import REDEEM_COUPON from '@/graphql/gql/mutations/redeemCoupon.gql';
import ME_QUERY from '@/graphql/gql/meQuery.gql';
// import {login} from '../hep-client/index';
export default {
components: {},
methods: {
validateBeforeSubmit() {
// this.$validator.validate().then(result => {
// this.submitted = true;
// let that = this;
// if (result) {
// login(this.password)
// .then((response) => {
// console.log(response)
// })
// .catch((error) => {
// console.log(error)
// this.registrationError = 'Es ist ein Fehler aufgetreten. Bitte versuchen Sie es nochmals.';
// });
// }
// });
this.$validator.validate().then(result => {
this.submitted = true;
let that = this;
if (result) {
this.$apollo.mutate({
mutation: REDEEM_COUPON,
variables: {
input: {
couponCodeInput: this.coupon
}
},
update(
store,
{
data: {coupon}
}
) {
if (coupon.success) {
console.log('handle happy path');
} else {
if (coupon.errors[0].field === 'invalid_coupon') {
that.couponErrors = ['Der angegebene Coupon-Code ist falsch.'];
} else {
that.couponErrors = ['Es ist ein Fehler aufgetreten. Bitte versuchen Sie es nochmals oder kontaktieren Sie den Administrator.'];
}
}
}
});
}
});
},
resetForm() {
this.coupon = '';

1
client/src/pages/start.vue
View File

@ -20,6 +20,7 @@
class="start-sections__section"
title="Räume"
subtitle="Beiträge mit der Klasse teilen"
data-cy="rooms-link"
link-text="Alle Räume anzeigen"
route="/rooms"
>

3
server/api/schema.py
View File

@ -10,6 +10,7 @@ from assignments.schema.queries import AssignmentsQuery, StudentSubmissionQuery
from basicknowledge.queries import BasicKnowledgeQuery
from books.schema.mutations.main import BookMutations
from books.schema.queries import BookQuery
from core.schema.mutations.coupon import CouponMutations
from core.schema.mutations.main import CoreMutations
from notes.mutations import NoteMutations
from objectives.mutations import ObjectiveMutations
@ -36,7 +37,7 @@ class Query(UsersQuery, AllUsersQuery, ModuleRoomsQuery, RoomsQuery, ObjectivesQ
class Mutation(BookMutations, RoomMutations, AssignmentMutations, ObjectiveMutations, CoreMutations, PortfolioMutations,
ProfileMutations, SurveyMutations, NoteMutations, RegistrationMutations, SpellCheckMutations,
graphene.ObjectType):
CouponMutations, graphene.ObjectType):
if settings.DEBUG:
debug = graphene.Field(DjangoDebug, name='_debug')

7
server/core/hep_client.py
View File

@ -138,10 +138,13 @@ class HepClient:
try:
response = self._call('/rest/deutsch/V1/coupon/{}/customer/{}'.format(coupon, customer_id), method='put')
except HepClientException as e:
if e.args[0] == 201:
return None
return response
response_data = response.json()
if response_data[0] == '201':
return None
return response_data[0]
def myskillbox_product_for_customer(self, admin_token, customer_id):
orders = self._customer_orders(admin_token, customer_id)

8
server/core/schema/mutations/coupon.py
View File

@ -38,10 +38,10 @@ class Coupon(relay.ClientIDMutation):
try:
response = hep_client.coupon_redeem(coupon_code, hep_id)
except HepClientException:
return cls(success=False, errors=[{'field': 'unkown_error'}])
return cls(success=False, errors=[{'field': 'unknown_error'}])
if not response:
return cls(success=False, errors=[{'field': 'invalid_code'}])
return cls(success=False, errors=[{'field': 'invalid_coupon'}])
license, error_msg = check_and_create_licenses(hep_client, info.context.user)
@ -52,3 +52,7 @@ class Coupon(relay.ClientIDMutation):
create_role_for_user(info.context.user, license.for_role.key)
return cls(success=True, errors=[])
class CouponMutations:
redeem_coupon = Coupon.Field()

4
server/core/settings.py
View File

@ -373,8 +373,8 @@ USE_LOCAL_REGISTRATION = True
# HEP
HEP_ADMIN_USER = "adminuser"
HEP_ADMIN_PASSWORD = "password"
HEP_ADMIN_USER = "myskillbox"
HEP_ADMIN_PASSWORD = "dSgqCv7zhEMmSNrw"
HEP_URL = 'https://stage.hep-verlag.ch'

5
server/core/tests/mock_hep_data_factory.py
View File

@ -15,11 +15,12 @@ from datetime import datetime, timedelta
class MockResponse:
def __init__(self, status_code):
def __init__(self, status_code, data={}):
self.status_code = status_code
self.data = data
def json(self):
return {}
return self.data
## Setup json data

8
server/core/tests/test_coupon.py
View File

@ -56,7 +56,7 @@ class CouponTests(TestCase):
}
})
@patch.object(requests, 'put', return_value=MockResponse(200))
@patch.object(requests, 'put', return_value=MockResponse(200, data=['200', 'Coupon successfully redeemed']))
@patch.object(HepClient, '_customer_orders', return_value=VALID_TEACHERS_ORDERS)
@patch.object(HepClient, 'fetch_admin_token', return_value={'token': 'AABBCCDDEE**44566'})
def test_user_has_valid_coupon(self, admin_mock, orders_mock, response_mock):
@ -73,14 +73,14 @@ class CouponTests(TestCase):
self.assertTrue(result.get('data').get('coupon').get('success'))
self.assertTrue(self.user.is_authenticated)
@patch.object(requests, 'put', return_value=MockResponse(201))
@patch.object(requests, 'put', return_value=MockResponse(200, data=['201', 'Invalid Coupon']))
def test_user_has_invalid_coupon(self, response_mock):
result = self.make_coupon_mutation('COUPON--1234', self.client)
self.assertFalse(result.get('data').get('coupon').get('success'))
self.assertEqual(result.get('data').get('coupon').get('errors')[0].get('field'), 'invalid_code')
self.assertEqual(result.get('data').get('coupon').get('errors')[0].get('field'), 'invalid_coupon')
@patch.object(requests, 'put', return_value=MockResponse(201))
@patch.object(requests, 'put', return_value=MockResponse(200, data=['201', 'Invalid Coupon']))
def test_unauthenticated_user_cannot_redeem(self, response_mock):
request = RequestFactory().post('/')