<commit_before>﻿using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Web.Http;
using System.Web.Http.Cors;
using FineBot.API.LdapApi;
using FineBot.API.UsersApi;

namespace FineBot.WepApi.Controllers
{
    [EnableCors("*", "*", "*")]
    public class UserController : ApiController
    {
        private readonly IUserApi userApi;
        private readonly ILdapApi ldapApi;

        public UserController(
            IUserApi userApi,
            ILdapApi ldapApi)
        {
            this.userApi = userApi;
            this.ldapApi = ldapApi;
        }

        [HttpGet]
        public UserModel GetUserByEmail(string email)
        {
            return userApi.GetUserByEmail(email);
        }

        [HttpGet]
        public List<UserModel> GetAllDomainUsers(string domainName, string password)
        {
            return ldapApi.GetAllDomainUsers(domainName, password);
        }

        [HttpGet]
        public UserModel AuthenticateUser(string domainName, string password)
        {
            var ldapUser = ldapApi.AuthenticateAgainstDomain(domainName, password);
            var slackUser = userApi.GetUserByEmail(ldapUser.EmailAddress);
            return ldapApi.MapSlackModelToLdapModel(ldapUser, slackUser);
        }

        [HttpGet]
        public string[] GetUserNameAndSurname(string email)
        {
            return userApi.GetUserNameAndSurnameFromEmail(email);
        }

        [HttpPost]
        public UserModel UpdateUser([FromBody]UserModel userModel)
        {
            return userApi.UpdateUser(userModel);
        }

        [HttpGet]
        public List<UserModel> GetAllUsers() {
            return userApi.GetAllUsers();

        [HttpPost]
        public UserModel UpdateUserImage([FromBody]UserModel userModel)
        {
            userApi.UpdateUserImage(userModel.Id, userModel.Image);
            return userModel;
        }
    }
}
<commit_msg>Remoed extra bracket from conflict resolution<commit_after>﻿using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Web.Http;
using System.Web.Http.Cors;
using FineBot.API.LdapApi;
using FineBot.API.UsersApi;

namespace FineBot.WepApi.Controllers
{
    [EnableCors("*", "*", "*")]
    public class UserController : ApiController
    {
        private readonly IUserApi userApi;
        private readonly ILdapApi ldapApi;

        public UserController(
            IUserApi userApi,
            ILdapApi ldapApi)
        {
            this.userApi = userApi;
            this.ldapApi = ldapApi;
        }

        [HttpGet]
        public UserModel GetUserByEmail(string email)
        {
            return userApi.GetUserByEmail(email);
        }

        [HttpGet]
        public List<UserModel> GetAllDomainUsers(string domainName, string password)
        {
            return ldapApi.GetAllDomainUsers(domainName, password);
        }

        [HttpGet]
        public UserModel AuthenticateUser(string domainName, string password)
        {
            var ldapUser = ldapApi.AuthenticateAgainstDomain(domainName, password);
            var slackUser = userApi.GetUserByEmail(ldapUser.EmailAddress);
            return ldapApi.MapSlackModelToLdapModel(ldapUser, slackUser);
        }

        [HttpGet]
        public string[] GetUserNameAndSurname(string email)
        {
            return userApi.GetUserNameAndSurnameFromEmail(email);
        }

        [HttpPost]
        public UserModel UpdateUser([FromBody]UserModel userModel)
        {
            return userApi.UpdateUser(userModel);
        }

        [HttpGet]
        public List<UserModel> GetAllUsers() {
            return userApi.GetAllUsers();

        }

        [HttpPost]
        public UserModel UpdateUserImage([FromBody]UserModel userModel)
        {
            userApi.UpdateUserImage(userModel.Id, userModel.Image);
            return userModel;
        }
    }
}

{'fraction_non_alphanumeric': 0.08155583437892096, 'fraction_numerical': 0.0, 'mean_word_length': 2.2565359477124183, 'pattern_counts': {'":': 0, '<': 7, '<?xml version=': 0, '>': 7, 'https://': 0, 'lorem ipsum': 0, 'www.': 0, 'xml': 0}, 'pii_count': 0, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '5649716', 'n_tokens_mistral': 1133, 'n_tokens_neox': 1118, 'n_words': 217}