DigitaleAgentur___ALT
/
da_agency
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

AgencyUser angebunden

This commit is contained in:
holger.trampe 2021-05-24 14:06:20 +02:00
parent b2e61c67fb
commit 69cd61db9e
14 changed files with 274 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
appinfo/routes.php
View File

@ -5,5 +5,6 @@ return [
],
'routes' => [
['name' => 'page#index', 'url' => '/', 'verb' => 'GET'],
['name' => 'agency#getagencyidbyuser', 'url' => '/getagencyidbyuser', 'verb' => 'GET'],
]
];

24
lib/Controller/AgencyController.php
View File

@ -4,22 +4,31 @@ declare(strict_types=1);
namespace OCA\Agency\Controller;
use OCP\IRequest;
use OCP\IUserSession;
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\Http\JSONResponse;
use OCP\AppFramework\Controller;
use OCA\Agency\Service\AgencyService;
use OCA\Agency\Service\AgencyUserService;
class AgencyController extends Controller {
protected $userManager;
private $service;
private $agencyuserservice;
private $Id;
protected $userSession;
protected $request;
use Errors;
public function __construct(string $AppName, IRequest $request,
AgencyService $service){
public function __construct(string $AppName, IRequest $request, IUserSession $userSession, AgencyService $service, AgencyUserService $agencyuserservice){
parent::__construct($AppName, $request);
$this->service = $service;
$this->agencyuserservice = $agencyuserservice;
$this->userSession = $userSession;
$this->request = $request;
}
/**
@ -29,6 +38,16 @@ class AgencyController extends Controller {
return new DataResponse($this->service->findAll($this->Id));
}
/**
* @NoAdminRequired
* @NoCSRFRequired
*/
public function getagencyidbyuser() {
$user = $this->userSession->getUser()->getUid();
$params = $this->agencyuserservice->getAgencyIdByUserUid($user);
return new JSONResponse($params);
}
/**
* @NoAdminRequired
* @NoCSRFRequired
@ -43,7 +62,6 @@ class AgencyController extends Controller {
/**
* @NoAdminRequired
* @NoCSRFRequired
*
* @param string $title
* @param string $content

57
lib/Controller/GroupController.php Normal file
View File

@ -0,0 +1,57 @@
<?php
declare(strict_types=1);
namespace OCA\Agency\Controller;
use OCP\IRequest;
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\Controller;
use OCA\Agency\Service\GroupService;
class GroupControllerController extends Controller {
private $service;
private $Id;
use Errors;
public function __construct(string $AppName, IRequest $request,
GroupService $service){
parent::__construct($AppName, $request);
$this->service = $service;
}
/**
* @NoAdminRequired
*/
public function index() {
return new DataResponse($this->service->findAll($this->Id));
}
/**
* @NoAdminRequired
* @NoCSRFRequired
*
* @param int $id
*/
public function show(int $id) {
return $this->handleNotFound(function () use ($id) {
return $this->service->find($id);
});
}
/**
* @NoAdminRequired
*
* @param int $id
*/
public function destroy(int $id) {
return $this->handleNotFound(function () use ($id) {
return $this->service->delete($id);
});
}
}

1
lib/Db/AgencyMapper.php
View File

@ -21,5 +21,4 @@ class AgencyMapper extends QBMapper {
return $this->findEntity($qb);
}
}

24
lib/Db/AgencyUser.php Normal file
View File

@ -0,0 +1,24 @@
<?php
namespace OCA\Agency\Db;
use JsonSerializable;
use OCP\AppFramework\Db\Entity;
class AgencyUser extends Entity implements JsonSerializable {
protected $agency;
protected $user;
public function __construct() {
$this->addType('id','integer');
}
public function jsonSerialize() {
return [
'id' => $this->id,
'agency' => $this->agency,
'user' => $this->user,
];
}
}

34
lib/Db/AgencyUserMapper.php Normal file
View File

@ -0,0 +1,34 @@
<?php
namespace OCA\Agency\Db;
use OCP\IDBConnection;
use OCP\AppFramework\Db\QBMapper;
use OCP\DB\QueryBuilder\IQueryBuilder;
class AgencyUserMapper extends QBMapper {
public function __construct(IDBConnection $db) {
parent::__construct($db, 'agency_user', AgencyUser::class);
}
public function find(int $id) {
$qb = $this->db->getQueryBuilder();
$qb->select('*')
->from($this->getTableName())
->where(
$qb->expr()->eq('id', $qb->createNamedParameter($id))
);
return $this->findEntity($qb);
}
public function getAgencyIdByUserUid(string $useruid) {
$qb = $this->db->getQueryBuilder();
$qb->select('*')
->from($this->getTableName())
->where(
$qb->expr()->eq('user', $qb->createNamedParameter($useruid))
);
return $this->findEntity($qb);
}
}

4
lib/Migration/Version000001Date20210521125400.php
View File

@ -77,9 +77,9 @@
'length' => 64
]);
$table->addColumn('user', 'integer', [
$table->addColumn('user', 'string', [
'notnull' => true,
'length' => 64
'length' => 200
]);
$table->setPrimaryKey(['id']);

48
lib/Service/AgencyUserService.php Normal file
View File

@ -0,0 +1,48 @@
<?php
namespace OCA\Agency\Service;
use Exception;
use OCP\AppFramework\Db\DoesNotExistException;
use OCP\AppFramework\Db\MultipleObjectsReturnedException;
use OCA\Agency\Db\AgencyUser;
use OCA\Agency\Db\AgencyUserMapper;
class AgencyUserService {
private $mapper;
public function __construct(AgencyUserMapper $mapper){
$this->mapper = $mapper;
}
private function handleException ($e) {
if ($e instanceof DoesNotExistException ||
$e instanceof MultipleObjectsReturnedException) {
throw new NotFoundException($e->getMessage());
} else {
throw $e;
}
}
//Find an Agency
public function find(int $id) {
try {
return $this->mapper->find($id);
} catch(Exception $e) {
$this->handleException($e);
}
}
//Find an Agency
public function getAgencyIdByUserUid(string $useruid) {
return $this->mapper->getAgencyIdByUserUid($useruid);
//try {
// return $this->mapper->getAgencyIdByUserUid($useruid);
//} catch(Exception $e) {
// $this->handleException($e);
//}
}
}

34
lib/Service/GroupService.php Normal file
View File

@ -0,0 +1,34 @@
<?php
namespace OCA\Agency\Service;
use Exception;
use OCP\AppFramework\Db\DoesNotExistException;
use OCP\AppFramework\Db\MultipleObjectsReturnedException;
use OCA\Agency\Db\Agency;
use OCA\Agency\Db\AgencyMapper;
class GroupService {
private function handleException ($e) {
if ($e instanceof DoesNotExistException ||
$e instanceof MultipleObjectsReturnedException) {
throw new NotFoundException($e->getMessage());
} else {
throw $e;
}
}
//Find an Agency
public function find(int $id) {
try {
return $this->mapper->find($id);
} catch(Exception $e) {
$this->handleException($e);
}
}
}

0
lib/Service/ServiceExcpetion.php → lib/Service/ServiceException.php
View File

3
src/components/Navigation.vue
View File

@ -4,6 +4,9 @@
<AppNavigationItem to="/"
title="Agenturdaten"
icon="icon-category-customization" />
<AppNavigationItem to="/groupmanagement"
title="Gruppenverwaltung"
icon="icon-category-customization" />
</template>
</AppNavigation>
</template>

6
src/router/routes.js
View File

@ -1,4 +1,5 @@
import AgencyData from '../views/AgencyData'
import GroupManagement from '../views/GroupManagement'
export default [
{
@ -6,4 +7,9 @@ export default [
name: 'agencydata',
component: AgencyData,
},
{
path: '/groupmanagement',
name: 'groupmanagemenet',
component: GroupManagement,
},
]

15
src/views/AgencyData.vue
View File

@ -1,6 +1,6 @@
<template>
<Content app-name="AgencyData">
<b-container class="bv-example-row">
<b-container v-if="isLoading" class="">
<h3>Agenturdaten</h3>
<FormulateForm
v-model="agency"
@ -42,7 +42,6 @@
<b-col>
<FormulateInput name="plz"
label="PLZ"
validation="required|max:5|min:5"
type="text" />
</b-col>
<b-col>
@ -70,6 +69,9 @@
</b-row>
</FormulateForm>
</b-container>
<b-container v-if="!isLoading" class="mx-auto">
<b-spinner type="grow" />
</b-container>
</Content>
</template>
<script>
@ -86,6 +88,8 @@ export default ({
data() {
return {
agency: null,
agencyid: null,
isLoading: false,
}
},
created() {
@ -93,11 +97,14 @@ export default ({
},
methods: {
async fetchData() {
const agencydata = await axios.get(generateUrl('/apps/agency/agencys/4'))
const agencyidresp = await axios.get(generateUrl('/apps/agency/getagencyidbyuser'))
this.agencyid = agencyidresp.data.agency
const agencydata = await axios.get(generateUrl('/apps/agency/agencys/' + this.agencyid))
this.agency = agencydata.data
this.isLoading = true
},
async submitHandler(data) {
const response = await axios.put(generateUrl('/apps/agency/agencys/4'), data)
const response = await axios.put(generateUrl('/apps/agency/agencys/' + this.agencyid), data)
console.log(response)
},
},

33
src/views/GroupManagement.vue Normal file
View File

@ -0,0 +1,33 @@
<template>
<Content app-name="GroupManagement">
<b-container class="bv-example-row">
<h3>Gruppenverwaltung</h3>
</b-container>
</Content>
</template>
<script>
import Content from '@nextcloud/vue/dist/Components/Content'
import '@braid/vue-formulate/themes/snow/snow.scss'
// import { generateUrl } from '@nextcloud/router'
// const axios = require('axios').default
export default ({
name: 'GroupManagement',
components: {
Content,
},
data() {
return {
}
},
created() {
this.loadUserData()
},
methods: {
async loadUserData() {
// const userdata = await axios.get(generateUrl('/apps/agency/getagencyidbyuser'))
// console.log(userdata)
},
},
})
</script>